improvements to font hinting

diff --git a/lib/common/labels.c b/lib/common/labels.c
index 5ea09e2f957fc7dc3279cf7c3b0a16971ed6aa1c..501da7dd76e497d45d43ab26d946141dbc2d838a 100644 (file)
--- a/lib/common/labels.c
+++ b/lib/common/labels.c
@@ -222,11 +222,6 @@ void emit_label(GVJ_t * job, emit_state_t emit_state, textlabel_t * lp)
            p.x = center_x;
            break;
        }
-        tmp = ROUND(p.x);  /* align with integer points */
-        p.x = (double)tmp;
-        tmp = ROUND(p.y);  /* align with integer points */
-        p.y = (double)tmp;
-
        gvrender_textpara(job, p, &(lp->u.txt.para[i]));
 
        /* UL position for next para */

diff --git a/plugin/pango/gvrender_pango.c b/plugin/pango/gvrender_pango.c
index 2933a7788f6755f74a20cf2f1c0e4f5574b4baf9..73ee2101c948131c9e64830443db614cebf2c0a7 100644 (file)
--- a/plugin/pango/gvrender_pango.c
+++ b/plugin/pango/gvrender_pango.c
@@ -71,6 +71,9 @@ typedef enum {
 
 #define ARRAY_SIZE(A) (sizeof(A)/sizeof(A[0]))
 
+/* FIXME - FONT_DPI also defined in gvtextlayout_pango.c - need shared header */
+#define FONT_DPI 96.
+
 static double dashed[] = {6.};
 static int dashed_len = ARRAY_SIZE(dashed);
 
@@ -235,7 +238,10 @@ static void cairogen_textpara(GVJ_t * job, pointf p, textpara_t * para)
     offset.y = para->yoffset;
 
     cairo_move_to (cr, p.x-offset.x, -p.y-offset.y);
+    cairo_save(cr);
+    cairo_scale(cr, POINTS_PER_INCH / FONT_DPI, POINTS_PER_INCH / FONT_DPI);
     pango_cairo_show_layout(cr, (PangoLayout*)(para->layout));
+    cairo_restore(cr);
 }
 
 static void cairogen_set_penstyle(GVJ_t *job, cairo_t *cr)

diff --git a/plugin/pango/gvtextlayout_pango.c b/plugin/pango/gvtextlayout_pango.c
index 8e44454d2180b147c7b467c6332cf70d2e3801d2..d67c5051b88f09e4948cd65471410f585fdfa636 100644 (file)
--- a/plugin/pango/gvtextlayout_pango.c
+++ b/plugin/pango/gvtextlayout_pango.c
@@ -32,7 +32,7 @@ static void pango_free_layout (void *layout)
     g_object_unref((PangoLayout*)layout);
 }
 
-#define FONT_DPI 96
+#define FONT_DPI 96.
 
 static boolean pango_textlayout(textpara_t * para, char **fontpath)
 {
@@ -43,7 +43,7 @@ static boolean pango_textlayout(textpara_t * para, char **fontpath)
     static char *fontname;
     char *fnt;
     PangoLayout *layout;
-    PangoRectangle ink_rect, logical_rect;
+    PangoRectangle logical_rect;
     PangoLayoutIter* iter;
 #if ENABLE_PANGO_XSHOW
     PangoRectangle char_rect;
@@ -53,12 +53,13 @@ static boolean pango_textlayout(textpara_t * para, char **fontpath)
     GError *error = NULL;
 #endif
     char *text;
+    double textlayout_scale;
 
-    if (!fontmap)
+    if (!context) {
        fontmap = pango_cairo_font_map_get_default();
-    if (!context)
        context = pango_cairo_font_map_create_context (PANGO_CAIRO_FONT_MAP(fontmap));
-    pango_cairo_context_set_resolution(context, FONT_DPI);   /* fixed dpi */
+       g_object_unref(fontmap);
+    }
 
     if (!fontname || strcmp(fontname, para->fontname)) {
        fontname = para->fontname;
@@ -130,8 +131,8 @@ static boolean pango_textlayout(textpara_t * para, char **fontpath)
 #endif
         }
     }
-    pango_font_description_set_size (desc,
-       (gint)(para->fontsize * PANGO_SCALE * para->dpi / FONT_DPI));
+    /* all text layout is done at a scale of 96ppi */
+    pango_font_description_set_size (desc, (gint)(para->fontsize * PANGO_SCALE));
 
 #ifdef ENABLE_PANGO_MARKUP
     if (! pango_parse_markup (para->str, -1, 0, &attrs, &text, NULL, &error))
@@ -150,18 +151,20 @@ static boolean pango_textlayout(textpara_t * para, char **fontpath)
     pango_layout_set_attributes (layout, attrs);
 #endif
 
-    pango_layout_get_extents (layout, &ink_rect, &logical_rect);
+    pango_layout_get_extents (layout, NULL, &logical_rect);
 
     /* if pango doesn't like the font then it sets width=0 but height = garbage */
     if (logical_rect.width == 0)
        logical_rect.height = 0;
 
-    para->width = logical_rect.width / PANGO_SCALE;
-    para->height = logical_rect.height / PANGO_SCALE;
+    textlayout_scale = POINTS_PER_INCH / (FONT_DPI * PANGO_SCALE);
+    para->width = logical_rect.width * textlayout_scale;
+    para->height = logical_rect.height * textlayout_scale;
 
     iter = pango_layout_get_iter (layout);
-    para->yoffset = para->fontsize * 0.05
-       + (pango_layout_iter_get_baseline (iter) / PANGO_SCALE) * POINTS_PER_INCH / para->dpi;
+    para->yoffset = pango_layout_iter_get_baseline (iter) * textlayout_scale
+       +.1 * para->fontsize;  /* In labels.c y is already midline 
+                        * 0.15 is the distance below midline for y centering */
 
     /* determine position of each character in the layout */
     para->xshow = NULL;
@@ -169,8 +172,8 @@ static boolean pango_textlayout(textpara_t * para, char **fontpath)
 /* FIXME - unfinished code */
     do {
        pango_layout_iter_get_char_extents (iter, &char_rect);
-       char_rect.x /= PANGO_SCALE;
-       char_rect.y /= PANGO_SCALE;
+       char_rect.x *= fontlayout_scale;
+       char_rect.y *= fontlayout_scale;
     } while (pango_layout_iter_next_char (iter));
     pango_layout_iter_free (iter);
 #endif