output: Rename a few struct members for consistency.

[pspp] / src / output / cairo.c

diff --git a/src/output/cairo.c b/src/output/cairo.c
index 32369a7a0e5071e609cfbf863fc3981e676c8d8a..4584181d32a3a779365e7993682010c2231fe544 100644 (file)
--- a/src/output/cairo.c
+++ b/src/output/cairo.c
@@ -1225,11 +1225,11 @@ xr_layout_cell_text (struct xr_driver *xr, const struct table_cell *cell,
                           : options & TAB_EMPH ? &xr->fonts[XR_FONT_EMPHASIS]
                           : &xr->fonts[XR_FONT_PROPORTIONAL]);
   struct xr_font local_font;
-  if (cell->style->font)
+  if (cell->style->typeface)
     {
       PangoFontDescription *desc = parse_font (
-        style->font,
-        style->font_size ? style->font_size * 1000 * 72 / 128 : 10000,
+        style->typeface,
+        style->size ? style->size * 1000 * 72 / 128 : 10000,
         style->bold, style->italic);
       if (desc)
         {