cairo: Use pango_cairo_context_set_resolution() to get font sizes correct.

[pspp] / src / output / cairo-fsm.c

diff --git a/src/output/cairo-fsm.c b/src/output/cairo-fsm.c
index c9794d4630a942ece7cf0d9d0802d2a317bc7891..a9e4d4c68ddc2482a20d3891fc2bc2d7dd03db0d 100644 (file)
--- a/src/output/cairo-fsm.c
+++ b/src/output/cairo-fsm.c
@@ -88,7 +88,7 @@ xr_fsm_style_equals (const struct xr_fsm_style *a,
       || a->min_break[V] != b->min_break[V]
       || a->use_system_colors != b->use_system_colors
       || a->transparent != b->transparent
-      || a->font_scale != b->font_scale)
+      || a->font_resolution != b->font_resolution)
     return false;
 
   for (size_t i = 0; i < XR_N_FONTS; i++)
@@ -608,13 +608,16 @@ xr_layout_cell_text (struct xr_fsm *xr, const struct table_cell *cell,
   if (font_style->typeface)
       desc = parse_font (
         font_style->typeface,
-        font_style->size ? font_style->size * 1000 * xr->style->font_scale : 10000,
+        font_style->size ? font_style->size * 1000 : 10000,
         font_style->bold, font_style->italic);
   if (!desc)
     desc = xr->style->fonts[font_type];
 
   assert (xr->cairo);
-  PangoLayout *layout = pango_cairo_create_layout (xr->cairo);
+  PangoContext *context = pango_cairo_create_context (xr->cairo);
+  pango_cairo_context_set_resolution (context, xr->style->font_resolution);
+  PangoLayout *layout = pango_layout_new (context);
+  g_object_unref (context);
   pango_layout_set_font_description (layout, desc);
 
   const char *text = cell->text;
@@ -1111,7 +1114,10 @@ xr_fsm_create (const struct output_item *item_,
 
   for (int i = 0; i < XR_N_FONTS; i++)
     {
-      PangoLayout *layout = pango_cairo_create_layout (cr);
+      PangoContext *context = pango_cairo_create_context (cr);
+      pango_cairo_context_set_resolution (context, style->font_resolution);
+      PangoLayout *layout = pango_layout_new (context);
+      g_object_unref (context);
       pango_layout_set_font_description (layout, style->fonts[i]);
 
       pango_layout_set_text (layout, "0", 1);