From: Ben Pfaff <blp@cs.stanford.edu>
Date: Fri, 5 Jun 2015 03:09:24 +0000 (-0700)
Subject: cairo-chart: Use "Sans" instead of "sans serif" as font.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=deb0f9c922e36c6dcf48e519f83416eb875b21cb;p=pspp

cairo-chart: Use "Sans" instead of "sans serif" as font.

This fixes a bug on Windows, where Pango doesn't have a font
named "sans serif" but does have one named "Sans".

Reported and tested by Harry Thijssen.
---

diff --git a/src/output/cairo-chart.c b/src/output/cairo-chart.c
index 2cf3c2d6b8..fbb1d77c1d 100644
--- a/src/output/cairo-chart.c
+++ b/src/output/cairo-chart.c
@@ -179,7 +179,7 @@ xrchart_label_rotate (cairo_t *cr, int horz_justify, int vert_justify,
   PangoLayout *layout;
   double x, y;
 
-  desc = pango_font_description_from_string ("sans serif");
+  desc = pango_font_description_from_string ("Sans");
   if (desc == NULL)
     {
       cairo_new_path (cr);
@@ -580,7 +580,7 @@ xrchart_text_extents (cairo_t *cr, const struct xrchart_geometry *geom,
   int width_pango;
   int height_pango;
 
-  desc = pango_font_description_from_string ("sans serif");
+  desc = pango_font_description_from_string ("Sans");
   if (desc == NULL)
       return;
   pango_font_description_set_absolute_size (desc, geom->font_size * PANGO_SCALE);