Rev 8492 | Rev 8500 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 8492 | Rev 8499 | ||
|---|---|---|---|
| Line 85... | Line 85... | ||
| 85 | text_colors.add(text_colors.get_last()); |
85 | text_colors.add(text_colors.get_last()); |
| 86 | } |
86 | } |
| 87 | } |
87 | } |
| 88 | else { |
88 | else { |
| 89 | text_colors.pop(); |
89 | text_colors.pop(); |
| 90 | bg_colors.pop(); |
90 | if (bg_colors.count>1) bg_colors.pop(); //never pop the last color |
| 91 | } |
91 | } |
| 92 | } |
92 | } |
| Line 93... | Line 93... | ||
| 93 | 93 | ||
| 94 | void TWebBrowser::tag_div() |
94 | void TWebBrowser::tag_div() |
| 95 | { |
95 | { |
| 96 | if (streq(#tag.prior,"div")) && (tag.opened) return; |
96 | //if (streq(#tag.prior,"div")) && (tag.opened) return; |
| 97 | if (streq(#tag.prior,"td")) return; |
97 | if (streq(#tag.prior,"td")) return; |
| 98 | //if (streq(#tag.prior,"div")) return; |
98 | if (streq(#tag.prior,"div")) return; |
| 99 | if (!tag.opened) && (style.font) text_colors.pop(); |
99 | if (!tag.opened) && (style.font) text_colors.pop(); |
| 100 | NewLine(); |
100 | NewLine(); |
| Line 101... | Line 101... | ||
| 101 | } |
101 | } |
| Line 159... | Line 159... | ||
| 159 | void TWebBrowser::tag_code() |
159 | void TWebBrowser::tag_code() |
| 160 | { |
160 | { |
| 161 | if (style.pre = tag.opened) { |
161 | if (style.pre = tag.opened) { |
| 162 | bg_colors.add(0xe4ffcb); |
162 | bg_colors.add(0xe4ffcb); |
| 163 | } else { |
163 | } else { |
| 164 | bg_colors.pop(); |
164 | if (bg_colors.count>1) bg_colors.pop(); //never pop the last color |
| 165 | } |
165 | } |
| 166 | } |
166 | } |
| Line 167... | Line 167... | ||
| 167 | 167 | ||
| 168 | void TWebBrowser::tag_ol_ul_dt() |
168 | void TWebBrowser::tag_ol_ul_dt() |
| Line 382... | Line 382... | ||
| 382 | } |
382 | } |
| 383 | //if (tag.get_value_of("height")) table.next_row_y = draw_y + atoi(tag.value); |
383 | //if (tag.get_value_of("height")) table.next_row_y = draw_y + atoi(tag.value); |
| 384 | } |
384 | } |
| Line 385... | Line 385... | ||
| 385 | 385 | ||
| 386 | if (left_gap >= list.w - list.font_w - 10) { |
386 | if (left_gap >= list.w - list.font_w - 10) { |
| 387 | notify("left_gap overflow"); |
387 | debugln("left_gap overflow"); |
| 388 | draw_x = left_gap = BODY_MARGIN; |
388 | draw_x = left_gap = BODY_MARGIN; |
| 389 | table.cx.drop(); |
389 | table.cx.drop(); |
| 390 | table.count = 999; |
390 | table.count = 999; |
| 391 | NewLine(); |
391 | NewLine(); |
| Line 392... | Line 392... | ||
| 392 | } |
392 | } |
| 393 | 393 | ||
| 394 | if (draw_w < 0) || (draw_w >= list.w) { |
394 | if (draw_w < 0) || (draw_w >= list.w) { |
| 395 | notify("draw_w overflow"); |
395 | debugln("draw_w overflow"); |
| 396 | draw_x = left_gap = BODY_MARGIN; |
396 | draw_x = left_gap = BODY_MARGIN; |
| 397 | draw_w = list.w - left_gap; |
397 | draw_w = list.w - left_gap; |
| 398 | NewLine(); |
398 | NewLine(); |