Rev 9103 | Rev 9263 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 9103 | Rev 9104 | ||
|---|---|---|---|
| Line 344... | Line 344... | ||
| 344 | } else { |
344 | } else { |
| 345 | if (tdepth>0) tdepth--; |
345 | if (tdepth>0) tdepth--; |
| 346 | if (tdepth==0) { |
346 | if (tdepth==0) { |
| 347 | draw_x = left_gap = style.tag_list.level * 5 * list.font_w + BODY_MARGIN; |
347 | draw_x = left_gap = style.tag_list.level * 5 * list.font_w + BODY_MARGIN; |
| 348 | draw_w = list.w; |
348 | draw_w = list.w; |
| 349 | - | ||
| 350 | draw_y = math.max(draw_y+style.cur_line_h, tallest_cell_in_row); |
349 | draw_y = math.max(draw_y+style.cur_line_h, tallest_cell_in_row); |
| 351 | row_start_y = draw_y = tallest_cell_in_row = draw_y; |
350 | row_start_y = draw_y = tallest_cell_in_row = draw_y; |
| 352 | style.cur_line_h = list.item_h; |
351 | style.cur_line_h = list.item_h; |
| 353 | } |
352 | } |
| 354 | } |
353 | } |
| Line 358... | Line 357... | ||
| 358 | return; |
357 | return; |
| 359 | } |
358 | } |
| Line 360... | Line 359... | ||
| 360 | 359 | ||
| 361 | if (!secondrun) { |
360 | if (!secondrun) { |
| 362 | if (tag.is("tr")) { |
- | |
| 363 | if (colcount) tr_col_count.set(tr_col_count.count-1, colcount); |
- | |
| 364 | colcount = 0; |
361 | if (tag.is("tr")) { |
| 365 | if (tag.opened) { |
362 | if (tag.opened) { |
| 366 | tr_col_count.add(1); |
363 | tr_col_count.add(1); |
| - | 364 | } |
|
| 367 | } |
365 | colcount = 0; |
| 368 | } |
366 | } |
| 369 | if (tag.opened) && (tag.is("td")) || (tag.is("th")) { |
367 | if (tag.opened) && (tag.is("td")) || (tag.is("th")) { |
| - | 368 | colcount++; |
|
| 370 | colcount++; |
369 | if (colcount) tr_col_count.set(tr_col_count.count-1, colcount); |
| 371 | //if (tag.get_number_of("colspan")) colcount += tag.number-1; |
370 | //if (tag.get_number_of("colspan")) colcount += tag.number-1; |
| 372 | } |
371 | } |
| 373 | } else { |
372 | } else { |
| 374 | if (tag.is("tr")) { |
373 | if (tag.is("tr")) { |
| Line 380... | Line 379... | ||
| 380 | } |
379 | } |
| 381 | style.cur_line_h = list.item_h; |
380 | style.cur_line_h = list.item_h; |
| 382 | tr_pos++; |
381 | tr_pos++; |
| 383 | td_pos = 0; |
382 | td_pos = 0; |
| 384 | } else { |
383 | } else { |
| - | 384 | draw_y = math.max(draw_y, tallest_cell_in_row); |
|
| - | 385 | } |
|
| 385 | draw_x = left_gap = style.tag_list.level * 5 * list.font_w + BODY_MARGIN; |
386 | draw_x = left_gap = style.tag_list.level * 5 * list.font_w + BODY_MARGIN; |
| 386 | draw_w = list.w; |
387 | draw_w = list.w; |
| 387 | draw_y = tallest_cell_in_row; |
- | |
| 388 | } |
- | |
| 389 | } |
388 | } |
| 390 | if (tr_pos) && (tag.is("td")) || (tag.is("th")) { |
389 | if (tr_pos) && (tag.is("td")) || (tag.is("th")) { |
| 391 | tallest_cell_in_row = math.max(draw_y+style.cur_line_h-list.item_h, tallest_cell_in_row); |
390 | tallest_cell_in_row = math.max(draw_y+style.cur_line_h-list.item_h, tallest_cell_in_row); |
| 392 | style.cur_line_h = list.item_h; |
391 | style.cur_line_h = list.item_h; |
| 393 | if (tag.opened) { |
392 | if (tag.opened) { |