projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
output: Add support for colors for rules.
[pspp]
/
src
/
output
/
table-paste.c
diff --git
a/src/output/table-paste.c
b/src/output/table-paste.c
index c1054d1369baf1e5c05915edd8221004206c8ec9..05c8987ce6f891a0a888d582339bb2ff49aa9137 100644
(file)
--- a/
src/output/table-paste.c
+++ b/
src/output/table-paste.c
@@
-227,7
+227,8
@@
table_paste_get_cell (const struct table *t, int x, int y,
static int
table_paste_get_rule (const struct table *t,
static int
table_paste_get_rule (const struct table *t,
- enum table_axis axis, int x, int y)
+ enum table_axis axis, int x, int y,
+ struct cell_color *color)
{
struct table_paste *tp = table_paste_cast (t);
int h = tp->orientation == TABLE_HORZ ? x : y;
{
struct table_paste *tp = table_paste_cast (t);
int h = tp->orientation == TABLE_HORZ ? x : y;
@@
-241,9
+242,9
@@
table_paste_get_rule (const struct table *t,
ps = paste_subtable_lookup (tp, h == 0 ? 0 : h - 1, &start);
if (tp->orientation == TABLE_HORZ) /* XXX */
ps = paste_subtable_lookup (tp, h == 0 ? 0 : h - 1, &start);
if (tp->orientation == TABLE_HORZ) /* XXX */
- r = table_get_rule (ps->table, axis, h - start, k);
+ r = table_get_rule (ps->table, axis, h - start, k
, color
);
else
else
- r = table_get_rule (ps->table, axis, k, h - start);
+ r = table_get_rule (ps->table, axis, k, h - start
, color
);
if (h == start + tower_node_get_size (&ps->node))
{
struct tower_node *ps2_ = tower_next (&tp->subtables, &ps->node);
if (h == start + tower_node_get_size (&ps->node))
{
struct tower_node *ps2_ = tower_next (&tp->subtables, &ps->node);
@@
-253,9
+254,9
@@
table_paste_get_rule (const struct table *t,
int r2;
if (tp->orientation == TABLE_HORZ) /* XXX */
int r2;
if (tp->orientation == TABLE_HORZ) /* XXX */
- r2 = table_get_rule (ps2->table, axis, 0, k);
+ r2 = table_get_rule (ps2->table, axis, 0, k
, color
);
else
else
- r2 = table_get_rule (ps2->table, axis, k, 0);
+ r2 = table_get_rule (ps2->table, axis, k, 0
, color
);
return table_rule_combine (r, r2);
}
}
return table_rule_combine (r, r2);
}
}
@@
-265,9
+266,9
@@
table_paste_get_rule (const struct table *t,
{
ps = paste_subtable_lookup (tp, h, &start);
if (tp->orientation == TABLE_HORZ) /* XXX */
{
ps = paste_subtable_lookup (tp, h, &start);
if (tp->orientation == TABLE_HORZ) /* XXX */
- return table_get_rule (ps->table, axis, h - start, k);
+ return table_get_rule (ps->table, axis, h - start, k
, color
);
else
else
- return table_get_rule (ps->table, axis, k, h - start);
+ return table_get_rule (ps->table, axis, k, h - start
, color
);
}
}
}
}