commit 3dd1edb1e40ada187d10eca4c840c9ca2d10a19d
parent aa52e29c471581005612ad6f95fd242d93d15071
Author: ukai <ukai>
Date: Mon, 28 Jan 2002 14:42:30 +0000
[w3m-dev 02919] wrong table width calculation
* table.c (set_table_matrix0): refine width calculation
From: Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
Diffstat:
2 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,10 @@
2002-01-28 Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
+ * [w3m-dev 02919] wrong table width calculation
+ * table.c (set_table_matrix0): refine width calculation
+
+2002-01-28 Hironori Sakamoto <hsaka@mth.biglobe.ne.jp>
+
* [w3m-dev 02918] fixed scripts/w3mmail.cgi.in
* scripts/w3mmail.cgi.in: add width=80 for header field name
* scripts/w3mmail.cgi.in (url_unquote): use pack instead of chr
diff --git a/table.c b/table.c
@@ -3216,7 +3216,7 @@ set_table_matrix0(struct table *t, int maxwidth)
int size = t->maxcol + 1;
int i, j, k, bcol, ecol;
int width;
- double w0, w1, w, e, s, b;
+ double w0, w1, w, s, b;
#ifdef __GNUC__
double we[size];
char expand[size];
@@ -3249,22 +3249,14 @@ set_table_matrix0(struct table *t, int maxwidth)
j = cell->eindex[k];
bcol = cell->col[j];
ecol = bcol + cell->colspan[j];
- for (i = bcol; i < ecol; i++) {
- expand[i]++;
- }
- }
-
- 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.;
+ w1 = 0.;
for (i = bcol; i < ecol; i++) {
- e += expand[i];
+ w1 += t->tabwidth[i] + 0.1;
+ expand[i]++;
}
for (i = bcol; i < ecol; i++) {
- w = weight(width * expand[i] / e);
+ w = weight(width * (t->tabwidth[i] + 0.1) / w1);
if (w > we[i])
we[i] = w;
}
@@ -3286,11 +3278,7 @@ set_table_matrix0(struct table *t, int maxwidth)
width = cell->width[j] - (cell->colspan[j] - 1) * t->cellspacing;
w = weight(width);
s = w / (w1 + w);
-#if 0
- 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);
}