tab: Support cell-specific styles.

[pspp] / src / output / tab.c

diff --git a/src/output/tab.c b/src/output/tab.c
index a158b22979e1cb79b9ec3f2dc2bd57e325ef42e9..db8488d8546329339e56c57d213b7d59b8831218 100644 (file)
--- a/src/output/tab.c
+++ b/src/output/tab.c
@@ -64,6 +64,8 @@ struct tab_joined_cell
 
   size_t n_footnotes;
   const struct footnote **footnotes;
+
+  const struct cell_style *style;
 };
 
 static const struct table_class tab_table_class;
@@ -106,6 +108,7 @@ tab_create (int nc, int nr)
   t->fmtmap[RC_OTHER] = *settings_get_format ();
 
   memset (t->styles, 0, sizeof t->styles);
+  memset (t->rule_colors, 0, sizeof t->rule_colors);
 
   t->col_ofs = t->row_ofs = 0;
 
@@ -559,6 +562,7 @@ add_joined_cell (struct tab_table *table, int x1, int y1, int x2, int y2,
   j->d[TABLE_VERT][1] = ++y2 + table->row_ofs;
   j->n_footnotes = 0;
   j->footnotes = NULL;
+  j->style = NULL;
 
   {
     void **cc = &table->cc[x1 + y1 * table->cf];
@@ -650,6 +654,27 @@ tab_add_footnote (struct tab_table *table, int x, int y,
   j->footnotes[j->n_footnotes++] = f;
 }
 
+void
+tab_add_style (struct tab_table *table, int x, int y,
+               const struct cell_style *style)
+{
+  int index = x + y * table->cf;
+  unsigned short opt = table->ct[index];
+  struct tab_joined_cell *j;
+
+  if (opt & TAB_JOIN)
+    j = table->cc[index];
+  else
+    {
+      char *text = table->cc[index];
+
+      j = add_joined_cell (table, x, y, x, y, table->ct[index]);
+      j->u.text = text ? text : xstrdup ("");
+    }
+
+  j->style = style;
+}
+
 bool
 tab_cell_is_empty (const struct tab_table *table, int c, int r)
 {
@@ -792,6 +817,11 @@ tab_get_cell (const struct table *table, int x, int y,
   cell->inline_contents.n_footnotes = 0;
   cell->destructor = NULL;
 
+  int style_idx = (opt & TAB_STYLE_MASK) >> TAB_STYLE_SHIFT;
+  const struct cell_style *style = t->styles[style_idx];
+  if (style)
+    cell->style = style;
+
   if (opt & TAB_JOIN)
     {
       const struct tab_joined_cell *jc = cc;
@@ -806,6 +836,9 @@ tab_get_cell (const struct table *table, int x, int y,
       cell->d[TABLE_HORZ][1] = jc->d[TABLE_HORZ][1];
       cell->d[TABLE_VERT][0] = jc->d[TABLE_VERT][0];
       cell->d[TABLE_VERT][1] = jc->d[TABLE_VERT][1];
+
+      if (jc->style)
+        cell->style = jc->style;
     }
   else
     {
@@ -825,19 +858,20 @@ tab_get_cell (const struct table *table, int x, int y,
           cell->n_contents = 0;
         }
     }
-
-  int style_idx = (opt & TAB_STYLE_MASK) >> TAB_STYLE_SHIFT;
-  const struct cell_style *style = t->styles[style_idx];
-  if (style)
-    cell->style = style;
 }
 
 static int
-tab_get_rule (const struct table *table, enum table_axis axis, int x, int y)
+tab_get_rule (const struct table *table, enum table_axis axis, int x, int y,
+              struct cell_color *color)
 {
   const struct tab_table *t = tab_cast (table);
-  return (axis == TABLE_VERT
-          ? t->rh[x + t->cf * y] : t->rv[x + (t->cf + 1) * y]);
+  uint8_t raw = (axis == TABLE_VERT
+                 ? t->rh[x + t->cf * y] : t->rv[x + (t->cf + 1) * y]);
+  struct cell_color *p = t->rule_colors[(raw & TAB_RULE_STYLE_MASK)
+                                        >> TAB_RULE_STYLE_SHIFT];
+  if (p)
+    *color = *p;
+  return (raw & TAB_RULE_TYPE_MASK) >> TAB_RULE_TYPE_SHIFT;
 }
 
 static const struct table_class tab_table_class = {