added kerning to fonts

diff --git a/lib/gfxdevice.h b/lib/gfxdevice.h
index 2e508bf..181d0b9 100644 (file)
--- a/lib/gfxdevice.h
+++ b/lib/gfxdevice.h
@@ -30,6 +30,11 @@ typedef struct _gfxglyph
     const char*name;
 } gfxglyph_t;
 
+typedef struct _gfxkerning
+{
+    int c1,c2,advance;
+} gfxkerning_t;
+
 typedef struct _gfxfont
 {
     const char*id;
@@ -40,6 +45,9 @@ typedef struct _gfxfont
 
     gfxglyph_t*glyphs;
     int* unicode2glyph;
+
+    gfxkerning_t*kerning;
+    int kerning_size;
 } gfxfont_t;
 
 typedef struct _gfxcolor

diff --git a/lib/pdf/InfoOutputDev.cc b/lib/pdf/InfoOutputDev.cc
index 6e20426..3c65bd8 100644 (file)
--- a/lib/pdf/InfoOutputDev.cc
+++ b/lib/pdf/InfoOutputDev.cc
@@ -15,6 +15,7 @@
 #endif
 #include "GfxState.h"
 #include "../log.h"
+#include "../types.h"
 #include "../q.h"
 #include <math.h>
 #include <assert.h>
@@ -52,11 +53,14 @@ InfoOutputDev::~InfoOutputDev()
     delete id2font;id2font=0;
     delete splash;splash=0;
 }
+
 void FontInfo::grow(int size)
 {
     if(size >= this->num_glyphs) {
        this->glyphs = (GlyphInfo**)realloc(this->glyphs, sizeof(GlyphInfo*)*(size));
+       this->kerning = (dict_t**)realloc(this->kerning, sizeof(dict_t*)*(size));
        memset(&this->glyphs[this->num_glyphs], 0, sizeof(SplashPath*)*((size)-this->num_glyphs));
+       memset(&this->kerning[this->num_glyphs], 0, sizeof(dict_t*)*((size)-this->num_glyphs));
        this->num_glyphs = size;
     }
 }
@@ -67,6 +71,7 @@ FontInfo::FontInfo(char*id)
     this->seen = 0;
     this->num_glyphs = 0;
     this->glyphs = 0;
+    this->kerning = 0;
     this->splash_font = 0;
     this->lastchar = -1;
     this->lastx = 0;
@@ -93,6 +98,17 @@ FontInfo::~FontInfo()
     free(glyphs);glyphs=0;
     if(this->gfxfont)
         gfxfont_free(this->gfxfont);
+   
+    if(kerning) {
+       for(t=0;t<num_glyphs;t++) {
+           dict_t* d = kerning[t];
+           if(!d) continue;
+           DICT_ITERATE_ITEMS(d,void*,key,mtf_t*,m) {
+               mtf_destroy(m);
+           }
+           dict_destroy(d);
+       }
+    }
 }
 
 static int findSpace(gfxfont_t*font)
@@ -214,6 +230,34 @@ static gfxfont_t* createGfxFont(FontInfo*src)
        }
 
     }
+
+    int kerning_size = 0;
+    for(t=0;t<font->num_glyphs;t++) {
+       dict_t* d = src->kerning[t];
+       if(!d) continue;
+       DICT_ITERATE_ITEMS(d,void*,key,mtf_t*,m) {
+           if(m) {
+               kerning_size++;
+           }
+       }
+    }
+    font->kerning_size = kerning_size;
+    font->kerning = (gfxkerning_t*)malloc(sizeof(gfxkerning_t)*kerning_size);
+    int pos = 0;
+    for(t=0;t<font->num_glyphs;t++) {
+       dict_t* d = src->kerning[t];
+       if(!d) continue;
+       DICT_ITERATE_ITEMS(d,void*,key,mtf_t*,m) {
+           if(m) {
+               font->kerning[pos].c1 = t;
+               font->kerning[pos].c2 = (int)(ptroff_t)key;
+               font->kerning[pos].advance = (int)(ptroff_t)m->first->key;
+               pos++;
+           }
+       }
+    }
+    //int advance = (int)(ptroff_t)m->first->key;
+
     return font;
 }
 
@@ -407,15 +451,31 @@ void InfoOutputDev::drawChar(GfxState *state, double x, double y,
        g->unicode = u[0];
     }
     if(currentfont->lastchar>=0 && currentfont->lasty == y) {
-       double xshift = x - currentfont->lastx;
+       double xshift = (x - currentfont->lastx);
        if(xshift>=0 && xshift > g->advance_max) {
            g->advance_max = xshift;
        }
+       int advance = (int)xshift;
+       if(advance>=0 && advance<g->advance*4 && advance!=currentfont->lastadvance) {
+           int c1 = currentfont->lastchar;
+           int c2 = code;
+           dict_t*d = currentfont->kerning[c1];
+           if(!d) {
+               d = currentfont->kerning[c1] = dict_new2(&int_type);
+           }
+           mtf_t*k = (mtf_t*)dict_lookup(d, (void*)(ptroff_t)c2);
+           if(!k) {
+               k = mtf_new(&int_type);
+               dict_put(d, (void*)(ptroff_t)c2, k);
+           }
+           mtf_increase(k, (void*)(ptroff_t)advance);
+       }
     }
 
     currentfont->lastx = x;
     currentfont->lasty = y;
     currentfont->lastchar = code;
+    currentfont->lastadvance = (int)(g->advance+0.5);
 }
 
 GBool InfoOutputDev::beginType3Char(GfxState *state, double x, double y, double dx, double dy, CharCode code, Unicode *u, int uLen)

diff --git a/lib/pdf/InfoOutputDev.h b/lib/pdf/InfoOutputDev.h
index 0934add..e5ea3c6 100644 (file)
--- a/lib/pdf/InfoOutputDev.h
+++ b/lib/pdf/InfoOutputDev.h
@@ -44,6 +44,7 @@
 #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)
@@ -72,6 +73,7 @@ public:
 
     double lastx,lasty;
     int lastchar;
+    int lastadvance;
 
     double ascender,descender;
 
@@ -81,6 +83,8 @@ public:
     double max_size;
     int num_glyphs;
     GlyphInfo**glyphs;
+    dict_t**kerning;
+
     int*charid2glyph;
     SplashFont*splash_font;
     char seen;

diff --git a/lib/q.c b/lib/q.c
index a2d7a63..8971616 100644 (file)
--- a/lib/q.c
+++ b/lib/q.c
@@ -887,6 +887,23 @@ void ptr_free(void*o)
     return;
 }
 
+char int_equals(const void*o1, const void*o2) 
+{
+    return o1==o2;
+}
+unsigned int int_hash(const void*o) 
+{
+    return string_hash3((const char*)&o, sizeof(o));
+}
+void* int_dup(const void*o) 
+{
+    return (void*)o;
+}
+void int_free(void*o) 
+{
+    return;
+}
+
 char charptr_equals(const void*o1, const void*o2) 
 {
     if(!o1 || !o2)
@@ -952,6 +969,13 @@ void stringstruct_free(void*o)
         string_free(o);
 }
 
+type_t int_type = {
+    equals: int_equals,
+    hash: int_hash,
+    dup: int_dup,
+    free: int_free,
+};
+
 type_t ptr_type = {
     equals: ptr_equals,
     hash: ptr_hash,
@@ -1302,6 +1326,49 @@ void dict_destroy(dict_t*dict)
     rfx_free(dict);
 }
 
+// ------------------------------- mtf_t --------------------------------------
+mtf_t* mtf_new(type_t*type)
+{
+    NEW(mtf_t, mtf);
+    mtf->type = type;
+    return mtf;
+}
+void mtf_increase(mtf_t*m, const void*key)
+{
+    mtf_item_t*item = m->first;
+    mtf_item_t*last = 0;
+    while(item) {
+       if(m->type->equals(item->key, key)) {
+           item->num++;
+           if(last) last->next = item->next;
+           else m->first = item->next;
+            item->next = m->first;
+            m->first = item;
+            return;
+       }
+       last = item;
+       item = item->next;
+    }
+    NEW(mtf_item_t,n);
+    if(last) last->next = n;
+    else m->first = n;
+    n->key = key;
+    n->num = 1;
+}
+void mtf_destroy(mtf_t*m)
+{
+    if(!m) return;
+    mtf_item_t*item = m->first;
+    m->first = 0;
+    while(item) {
+       mtf_item_t*next = item->next;
+       item->next = 0;
+       free(item);
+       item = next;
+    }
+    free(m);
+}
+
 // ------------------------------- map_t --------------------------------------
 
 typedef struct _map_internal_t

diff --git a/lib/q.h b/lib/q.h
index f6d597d..2ea7fe1 100644 (file)
--- a/lib/q.h
+++ b/lib/q.h
@@ -73,6 +73,7 @@ typedef struct _type_t {
 extern type_t charptr_type;
 extern type_t stringstruct_type;
 extern type_t ptr_type;
+extern type_t int_type;
 
 typedef struct _dictentry {
     void*key;
@@ -132,6 +133,18 @@ typedef struct _trie {
     void*rollback;
 } trie_t;
 
+/* move to front list structure */
+typedef struct _mtf_item {
+    const void*key;
+    int num;
+    struct _mtf_item*next;
+} mtf_item_t;
+
+typedef struct _mtf {
+    mtf_item_t*first;
+    type_t*type;
+} mtf_t;
+
 char* strdup_n(const char*str, int size);
 char* allocprintf(const char*str, ...);
 
@@ -242,6 +255,10 @@ void trie_remember(trie_t*t);
 void trie_rollback(trie_t*t);
 void trie_dump(trie_t*t);
 
+mtf_t* mtf_new(type_t*type);
+void mtf_increase(mtf_t*m, const void*key);
+void mtf_destroy(mtf_t*m);
+
 array_t* array_new();
 array_t* array_new2(type_t*type);
 void array_free(array_t*array);

diff --git a/lib/ruby/gfx.c b/lib/ruby/gfx.c
index 958ce40..9384d19 100644 (file)
--- a/lib/ruby/gfx.c
+++ b/lib/ruby/gfx.c
@@ -347,6 +347,23 @@ static VALUE font_glyphs(VALUE cls)
     return font->glyph_array;
 }
 
+static VALUE font_kerning(VALUE cls)
+{
+    Get_Font(font,cls);
+    gfxkerning_t*kerning = font->font->kerning;
+    int kerning_size = font->font->kerning_size;
+    volatile VALUE a = rb_ary_new2(kerning_size);
+    int t;
+    for(t=0;t<kerning_size;t++) {
+       volatile VALUE tuple = rb_ary_new2(3);
+       rb_ary_store(tuple, 0, INT2FIX(kerning[t].c1));
+       rb_ary_store(tuple, 1, INT2FIX(kerning[t].c2));
+       rb_ary_store(tuple, 2, INT2FIX(kerning[t].advance));
+       rb_ary_store(a, t, tuple);
+    }
+    return a;
+}
+
 // ------------------------ gfx device --------------------------------------
 
 typedef struct device_internal {
@@ -666,6 +683,8 @@ void Init_gfx()
     rb_define_method(Font, "ascent", font_ascent, 0);
     rb_define_method(Font, "descent", font_descent, 0);
     rb_define_method(Font, "glyphs", font_glyphs, 0);
+    rb_define_method(Font, "kerning", font_kerning, 0);
+    rb_define_method(Font, "get_kerning_table", font_kerning, 0);
     
     Device = rb_define_class_under(GFX, "Device", rb_cObject);
     rb_define_method(Device, "startpage", noop, -1);

diff --git a/lib/xml.c b/lib/xml.c
index 25a83c2..ef26388 100644 (file)
--- a/lib/xml.c
+++ b/lib/xml.c
@@ -26,20 +26,20 @@
 #include "xml.h"
 
 /*
-group: 0=data 1=whitespace 2='"' 3='<' 4='>' 5='&' 6=';' 7='?' 8='/' 9='=' 10=EOF
+group: 0=data 1=whitespace 2='"' 3='<' 4='>' 5='&' 6=';' 7='?' 8='/' 9='=' 10='!' 11=EOF
 */
 
 static int group[256] =
 {
 // 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f
 //                            \t \n       \r
-   10, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0,
+   13, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0,
 // 10 11 12 13 14 15 16 17 18 19 1a 1b 1c 1d 1e 1f
 //
    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 // 20 21 22 23 24 25 26 27 28 29 2a 2b 2c 2d 2e 2f
 //    !  "  #  $  %  &  '  (  )  *  +  ,  -  .  /
-   1, 0, 2, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 8,
+   1,10, 2, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 8,
 // 30 31 32 33 34 35 36 37 38 39 3a 3b 3c 3d 3e 3f
 // 0  1  2  3  4  5  6  7  8  9  :  ;  <  =  >  ?
    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, 3, 9, 4, 7,
@@ -48,7 +48,7 @@ static int group[256] =
    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 // 50 51 52 53 54 55 56 57 58 59 5a 5b 5c 5d 5e 5f
 // P  Q  R  S  T  U  V  W  X  Y  Z  [  \  ]  ^  _
-   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+   0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,11, 0,12, 0, 0,
 // 60 61 62 63 64 65 66 67 68 69 6a 6b 6c 6d 6e 6f
 // `  a  b  c  d  e  f  g  h  i  j  k  l  m  n  o
    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -97,32 +97,32 @@ static const char*errors[]=
 };
 
 static int new_state[][16]=
-{        /*  dt ws  "  <  >  &  ;  ?  /  = EOB*/
- /*  0 */{   E1, 0,E1, 1,E1,E1,E1,E1,E1,E1,-63}, // .<
- /*  1 */{   E1,E1,E1,E1,E1,E1,E1, 9,E1,E1,-63}, // <.?
- /*  2 */{   -3, 2,E3,E2,E2,E2,E2,E2,12,E2,-63}, // <.
- /*  3 */{   E3,E3,E3,E3,-1,E3,E3,E3,E3,E1,-63}, // < /.>
- /*  4 */{   E3,E3,E3,E3,-2,E3,E3,E3,E3,E1,-63}, // < .>
- /*  5 */{    5, 5, 5,-4, 5, 5, 5, 5, 5, 5,-63}, // da.ta
- /*  6 */{    6,-7,E3,E2,-6,E2,E2,E3,-9,E3,-63}, // <na.me
- /*  7 */{   -8, 7,E3,E2,-2,E2,E2, 7, 3,E3,-63}, // <name .
- /*  8 */{    8,E3,E3,E2,E3,E2,E2,E3,E3,-10,-63}, // att.r
- /*  9 */{    9, 7,E3,E3,E3,E3,E3,E3,E3,E3,-63}, // <?x.ml
- /* 10 */{   E5,E5,-11,E5,E5,E5,E5,E5,E5,E5,-63},// attr=."
- /* 11 */{   11,11,-5 ,11,11,11,11,11,11,11,-63},// attr="va.l
- /* 12 */{  -13,12,E3,E3,E3,E3,E3,E3,E3,E3,-63}, // </ . >
- /* 13 */{  13,-14,E3,E3,-16,E3,E3,E3,E3,E3,-63}, // </ na.me>
- /* 14 */{   E3,14,E3,E3,-15,E3,E3,E3,E3,E3,-63}, // </ name. >
- /* 15 */{0,0,0,0,0,0,0,0,0,0,-63},
- /* 16 */{0,0,0,0,0,0,0,0,0,0,-63},
- /* 17 */{0,0,0,0,0,0,0,0,0,0,-63},
- /* 18 */{0,0,0,0,0,0,0,0,0,0,-63},
- /* 19 */{0,0,0,0,0,0,0,0,0,0,-63},
- /* 20 */{0,0,0,0,0,0,0,0,0,0,-63},
- /* 21 */{0,0,0,0,0,0,0,0,0,0,-63},
- /* 22 */{0,0,0,0,0,0,0,0,0,0,-63},
- /* 23 */{0,0,0,0,0,0,0,0,0,0,-63},
- /* 24 */{0,0,0,0,0,0,0,0,0,0,-63},
+{        /*  dt ws  "  <  >  &  ;  ?  /  =  !  [  ]   - EOB*/
+ /*  0 */{   E1, 0,E1, 1,E1,E1,E1,E1,E1,E1,E3,E1,E1,-63}, // .<
+ /*  1 */{   E1,E1,E1,E1,E1,E1,E1, 9,E1,E1,E3,E1,E1,-63}, // <.?
+ /*  2 */{   -3, 2,E3,E2,E2,E2,E2,E2,12,E2,16,E2,E2,-63}, // <.
+ /*  3 */{   E3,E3,E3,E3,-1,E3,E3,E3,E3,E1,E3,E3,E3,-63}, // < /.>
+ /*  4 */{   E3,E3,E3,E3,-2,E3,E3,E3,E3,E1,E1,E3,E3,-63}, // < .>
+ /*  5 */{    5, 5, 5,-4, 5, 5, 5, 5, 5, 5, 5,E3,E3,-63}, // da.ta
+ /*  6 */{    6,-7,E3,E2,-6,E2,E2,E3,-9,E3,E3,E3,E3,-63}, // <na.me
+ /*  7 */{   -8, 7,E3,E2,-2,E2,E2, 7, 3,E3,E3,E3,E3,-63}, // <name .
+ /*  8 */{    8,-12,E3,E2,E3,E2,E2,E3,E3,-10,E3,E3,E3,-63}, // att.r
+ /*  9 */{    9, 7,E3,E3,E3,E3,E3,E3,E3,E3,E3,E3,E3,-63}, // <?x.ml
+ /* 10 */{   E5,10,-11,E5,E5,E5,E5,E5,E5,E5,E3,E3,E3,-63},// attr=."
+ /* 11 */{   11,11,-5 ,11,11,11,11,11,11,11,E3,E3,E3,-63},// attr="va.l
+ /* 12 */{  -13,12,E3,E3,E3,E3,E3,E3,E3,E3,E3,E3,E3,-63}, // </ . >
+ /* 13 */{  13,-14,E3,E3,-16,E3,E3,E3,E3,E3,E3,E3,E3,-63},// </ na.me>
+ /* 14 */{   E3,14,E3,E3,-15,E3,E3,E3,E3,E3,E3,E3,E3,-63},// </ name. >
+ /* 15 */{   E3,15,E3,E2,E3,E3,E3,E3,E3,10,E3,E3,E3,-63}, // attr .=
+ /* 16 */{   E3,E3,E3,E2,E3,E3,E3,E3,E3,E3,E3,17,E3,-63}, // <!.[CDATA[ ]]>
+ /* 17 */{   17,E3,E3,E3,E3,E3,E3,E3,E3,E3,E3,18,E3,-63}, // <![C.DATA[ ]]>
+ /* 18 */{   18,18,18,18,18,18,18,18,18,18,18,18,19,-63}, // <![CDATA[ . ]]>
+ /* 19 */{   18,18,18,18,-20,18,18,18,18,18,18,18,19,-63}, // <![CDATA[ ].]>
+ /* 20 */{0,0,0,0,0,0,0,0,0,0,0,-63},
+ /* 21 */{0,0,0,0,0,0,0,0,0,0,0,-63},
+ /* 22 */{0,0,0,0,0,0,0,0,0,0,0,-63},
+ /* 23 */{0,0,0,0,0,0,0,0,0,0,0,-63},
+ /* 24 */{0,0,0,0,0,0,0,0,0,0,0,-63},
 };
 
 typedef struct _tag_stack {
@@ -296,7 +296,11 @@ int xml_parse(reader_t*reader, xmlconsumer_t*out)
                    stringstate_finish(&tagname, buffer, pos-1);
                    state = 3;  
                break;
-               case -10: // end of attribute name
+               case -12: // end of attribute name, at ws
+                   stringstate_finish(&attr_name, buffer, pos-1);
+                   state = 15;
+               break;
+               case -10: // end of attribute name, at =
                    stringstate_finish(&attr_name, buffer, pos-1);
                    state = 10;
                break;
@@ -313,9 +317,12 @@ int xml_parse(reader_t*reader, xmlconsumer_t*out)
                    attributes = a;
                    state = 7;
                break;
+               case -20:
+                   state = 5;
+               break;
                default:
                    if(-state&0x40) {
-                       fprintf(stderr, "%s\n", errors[(-state)&0x3f]);
+                       fprintf(stderr, "%s (state %d, char '%c')\n", errors[(-state)&0x3f], old, buffer[pos-1]);
                        return 0;
                    } else {
                        fprintf(stderr, "internal error: no action %d\n", state);