output: Add support for vertical alignment of cells.

[pspp] / src / output / cairo.c

diff --git a/src/output/cairo.c b/src/output/cairo.c
index c0a2b5ee0ff8375e407df101c0403aff23c55312..b363aef51d6109fa8faa747fc97d9a02bb869e43 100644 (file)
--- a/src/output/cairo.c
+++ b/src/output/cairo.c
@@ -926,7 +926,7 @@ xr_layout_cell_text (struct xr_driver *xr,
 
   if (contents->n_footnotes == 0)
     merge_footnotes = false;
-  else if (contents->n_footnotes == 1 && (options & TAB_ALIGNMENT) == TAB_RIGHT)
+  else if (contents->n_footnotes == 1 && (options & TAB_HALIGN) == TAB_RIGHT)
     {
       PangoAttrList *attrs;
 
@@ -991,8 +991,8 @@ xr_layout_cell_text (struct xr_driver *xr,
 
   pango_layout_set_alignment (
     font->layout,
-    ((options & TAB_ALIGNMENT) == TAB_RIGHT ? PANGO_ALIGN_RIGHT
-     : (options & TAB_ALIGNMENT) == TAB_LEFT ? PANGO_ALIGN_LEFT
+    ((options & TAB_HALIGN) == TAB_RIGHT ? PANGO_ALIGN_RIGHT
+     : (options & TAB_HALIGN) == TAB_LEFT ? PANGO_ALIGN_LEFT
      : PANGO_ALIGN_CENTER));
   pango_layout_set_width (
     font->layout,