misc tidy and enable ascent/descent - even though clearly wrong

diff --git a/contrib/pangotest/pangotest.c b/contrib/pangotest/pangotest.c
index 3038c15385c600bd4b762ce079035a344e2174f7..b44f6b07f25b280b9a5a7bf93510d6c9aeb1285c 100644 (file)
--- a/contrib/pangotest/pangotest.c
+++ b/contrib/pangotest/pangotest.c
@@ -60,15 +60,15 @@ static void draw_text(cairo_t *cr, char *text, char *font_family, double font_si
 
        cairo_set_source_rgb(cr,1.0,0.0,1.0);
        cairo_rectangle(cr,
-               logical_rect.x/PANGO_SCALE, logical_rect.y/PANGO_SCALE,
-               logical_rect.width/PANGO_SCALE, logical_rect.height/PANGO_SCALE);
+               logical_rect.x / PANGO_SCALE, logical_rect.y / PANGO_SCALE,
+               logical_rect.width / PANGO_SCALE, logical_rect.height / PANGO_SCALE);
        cairo_stroke(cr);
 
        /* draw ink_rect - green */
        cairo_set_source_rgb(cr,0.0,1.0,0.0);
        cairo_rectangle(cr,
-               ink_rect.x/PANGO_SCALE, ink_rect.y/PANGO_SCALE,
-               ink_rect.width/PANGO_SCALE, ink_rect.height/PANGO_SCALE);
+               ink_rect.x / PANGO_SCALE, ink_rect.y / PANGO_SCALE,
+               ink_rect.width / PANGO_SCALE, ink_rect.height / PANGO_SCALE);
        cairo_stroke(cr);
 
        /* draw baseline - red */
@@ -76,8 +76,8 @@ static void draw_text(cairo_t *cr, char *text, char *font_family, double font_si
        iter = pango_layout_get_iter(layout);
        baseline = pango_layout_iter_get_baseline (iter);
 
-       cairo_move_to(cr,logical_rect.y/PANGO_SCALE, baseline / PANGO_SCALE);
-       cairo_rel_line_to(cr,logical_rect.width/PANGO_SCALE, 0);
+       cairo_move_to(cr,logical_rect.x / PANGO_SCALE, baseline / PANGO_SCALE);
+       cairo_rel_line_to(cr,logical_rect.width / PANGO_SCALE, 0);
        cairo_stroke(cr);
 
        /* draw ascent - yellow */
@@ -85,17 +85,17 @@ static void draw_text(cairo_t *cr, char *text, char *font_family, double font_si
        fontmetrics = pango_context_get_metrics(context, NULL, NULL);
 
        ascent = pango_font_metrics_get_ascent(fontmetrics);
-#if 0  /* I don't understand this value */
-       cairo_move_to(cr,logical_rect.y/PANGO_SCALE, (baseline - ascent) / PANGO_SCALE);
-       cairo_rel_line_to(cr,logical_rect.width/PANGO_SCALE, 0);
+#if 1  /* I don't understand this value  - needs some partial scaling by fontsize */
+       cairo_move_to(cr,logical_rect.x / PANGO_SCALE, (baseline - ascent) / PANGO_SCALE);
+       cairo_rel_line_to(cr,logical_rect.width / PANGO_SCALE, 0);
        cairo_stroke(cr);
 #endif
 
        /* draw descent - yellow */
        descent = pango_font_metrics_get_descent(fontmetrics);
-#if 0  /* I don't understand this value */
-       cairo_move_to(cr,logical_rect.y/PANGO_SCALE, (baseline + descent) / PANGO_SCALE);
-       cairo_rel_line_to(cr,logical_rect.width/PANGO_SCALE, 0);
+#if 1  /* I don't understand this value - needs some partial scaling by fontsize  */
+       cairo_move_to(cr,logical_rect.x / PANGO_SCALE, (baseline + descent) / PANGO_SCALE);
+       cairo_rel_line_to(cr,logical_rect.width / PANGO_SCALE, 0);
        cairo_stroke(cr);
 #endif