projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
render: Fix spanned width distribution for cells not at top or left.
[pspp]
/
src
/
output
/
render.c
diff --git
a/src/output/render.c
b/src/output/render.c
index c8766266f2af2268b8c98744c6dddd3aeb826f7b..dcb320a9d0cd5486016deb8d31270941aaab4341 100644
(file)
--- a/
src/output/render.c
+++ b/
src/output/render.c
@@
-806,8
+806,10
@@
render_page_create (const struct render_params *params, struct table *table,
params->ops->measure_cell_width (params->aux, &cell,
&w[MIN], &w[MAX]);
for (int i = 0; i < 2; i++)
params->ops->measure_cell_width (params->aux, &cell,
&w[MIN], &w[MAX]);
for (int i = 0; i < 2; i++)
- distribute_spanned_width (w[i], &columns[i][cell.d[H][0]],
- rules[H], table_cell_colspan (&cell));
+ distribute_spanned_width (w[i],
+ &columns[i][cell.d[H][0]],
+ &rules[H][cell.d[H][0]],
+ table_cell_colspan (&cell));
}
x = cell.d[H][1];
}
}
x = cell.d[H][1];
}
@@
-891,7
+893,9
@@
render_page_create (const struct render_params *params, struct table *table,
{
int w = joined_width (page, H, cell.d[H][0], cell.d[H][1]);
int h = params->ops->measure_cell_height (params->aux, &cell, w);
{
int w = joined_width (page, H, cell.d[H][0], cell.d[H][1]);
int h = params->ops->measure_cell_height (params->aux, &cell, w);
- distribute_spanned_width (h, &rows[cell.d[V][0]], rules[V],
+ distribute_spanned_width (h,
+ &rows[cell.d[V][0]],
+ &rules[V][cell.d[V][0]],
table_cell_rowspan (&cell));
}
x = cell.d[H][1];
table_cell_rowspan (&cell));
}
x = cell.d[H][1];