storm/w3m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[w3m-dev 02913] wrong table width calculation

Browse Source 
* table.c (set_table_matrix0): refine width calculation
From: Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
This commit is contained in:
Fumitoshi UKAI
2002-01-25 17:25:44 +00:00
parent e130026ebd
commit 86ad8ff868
2 changed files with 36 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+6 -1
View File
@@ -1,3 +1,8 @@
2002-01-26 Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
* [w3m-dev 02913] wrong table width calculation
* table.c (set_table_matrix0): refine width calculation
2002-01-26 Hironori Sakamoto <hsaka@mth.biglobe.ne.jp> 2002-01-26 Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
* [w3m-dev 02875] rendering a table with inconsistent colspan,rowspan * [w3m-dev 02875] rendering a table with inconsistent colspan,rowspan
@@ -2303,4 +2308,4 @@
* release-0-2-1 * release-0-2-1
* import w3m-0.2.1 * import w3m-0.2.1
$Id: ChangeLog,v 1.263 2002/01/25 15:20:34 ukai Exp $ $Id: ChangeLog,v 1.264 2002/01/25 17:25:44 ukai Exp $
table.c
+30 -6
View File
@@ -1,4 +1,4 @@
/* $Id: table.c,v 1.16 2002/01/25 15:20:34 ukai Exp $ */ /* $Id: table.c,v 1.17 2002/01/25 17:25:44 ukai Exp $ */
/* /*
* HTML table * HTML table
*/ */
@@ -3215,8 +3215,8 @@ set_table_matrix0(struct table *t, int maxwidth)
{ {
int size = t->maxcol + 1; int size = t->maxcol + 1;
int i, j, k, bcol, ecol; int i, j, k, bcol, ecol;
int width, a; int width;
double w0, w1, w, s, b; double w0, w1, w, e, s, b;
#ifdef __GNUC__ #ifdef __GNUC__
double we[size]; double we[size];
char expand[size]; char expand[size];
@@ -3254,10 +3254,31 @@ set_table_matrix0(struct table *t, int maxwidth)
} }
} }
for (k = 0; k < cell->necell; k++) {
j = cell->eindex[k];
bcol = cell->col[j];
ecol = bcol + cell->colspan[j];
width = cell->width[j] - (cell->colspan[j] - 1) * t->cellspacing;
e = 0.;
for (i = bcol; i < ecol; i++) {
e += expand[i];
}
for (i = bcol; i < ecol; i++) {
w = weight(width * expand[i] / e);
if (w > we[i])
we[i] = w;
}
}
w0 = 0.;
w1 = 0.; w1 = 0.;
for (i = 0; i < size; i++) for (i = 0; i < size; i++) {
w0 += we[i];
if (expand[i] == 0) if (expand[i] == 0)
w1 += we[i]; w1 += we[i];
}
if (w0 <= 0.)
w0 = 1.;
for (k = 0; k < cell->necell; k++) { for (k = 0; k < cell->necell; k++) {
j = cell->eindex[k]; j = cell->eindex[k];
@@ -3265,8 +3286,11 @@ set_table_matrix0(struct table *t, int maxwidth)
width = cell->width[j] - (cell->colspan[j] - 1) * t->cellspacing; width = cell->width[j] - (cell->colspan[j] - 1) * t->cellspacing;
w = weight(width); w = weight(width);
s = w / (w1 + w); s = w / (w1 + w);
a = (int)(s * maxwidth); #if 0
b = sigma_td_nw(a); b = sigma_td_nw((int)(s * maxwidth * cell->colspan[j]));
#else
b = sigma_td_nw((int)(s * maxwidth));
#endif
correct_table_matrix4(t, bcol, cell->colspan[j], expand, s, b); correct_table_matrix4(t, bcol, cell->colspan[j], expand, s, b);
} }