Add support for reading and writing SPV files.

[pspp] / src / output / cairo.c

diff --git a/src/output/cairo.c b/src/output/cairo.c
index 101735418142f9e63b41bb29fbe2caa451461982..11f24d0404925c9f4451caa0316186a5bbccbbf4 100644 (file)
--- a/src/output/cairo.c
+++ b/src/output/cairo.c
@@ -478,7 +478,7 @@ parse_color (struct output_driver *d, struct string_map *options,
 {
   char *string = parse_string (opt (d, options, key, default_value));
   if (!parse_color__ (string, color) && !parse_color__ (default_value, color))
-    *color = CELL_COLOR_BLACK;
+    *color = (struct cell_color) CELL_COLOR_BLACK;
   free (string);
 }
 
@@ -1549,7 +1549,8 @@ xr_layout_cell_text (struct xr_driver *xr, const struct table_cell *cell,
           pango_layout_set_text (font->layout, marker, strlen (marker));
 
           PangoAttrList *attrs = pango_attr_list_new ();
-          pango_attr_list_insert (attrs, pango_attr_rise_new (7000));
+          pango_attr_list_insert (attrs, pango_attr_scale_new (PANGO_SCALE_SMALL));
+          pango_attr_list_insert (attrs, pango_attr_rise_new (3000));
           pango_layout_set_attributes (font->layout, attrs);
           pango_attr_list_unref (attrs);
 
@@ -1596,7 +1597,8 @@ xr_layout_cell_text (struct xr_driver *xr, const struct table_cell *cell,
       if (font_style->underline)
         pango_attr_list_insert (attrs, pango_attr_underline_new (
                                PANGO_UNDERLINE_SINGLE));
-      add_attr_with_start (attrs, pango_attr_rise_new (7000), initial_length);
+      add_attr_with_start (attrs, pango_attr_scale_new (PANGO_SCALE_SMALL), initial_length);
+      add_attr_with_start (attrs, pango_attr_rise_new (3000), initial_length);
       add_attr_with_start (
         attrs, pango_attr_font_desc_new (font->desc), initial_length);
       pango_layout_set_attributes (font->layout, attrs);