diff options
author | corvid <corvid@lavabit.com> | 2009-10-24 00:27:08 +0000 |
---|---|---|
committer | corvid <corvid@lavabit.com> | 2009-10-24 00:27:08 +0000 |
commit | d8b1c71b7f9ad6e4764ae95ecdd8fdc25fa84e52 (patch) | |
tree | 92c1d150da3446967be89f72223e63372f4c2240 /src | |
parent | fa8e3ded4dc562b9d2c4402f21cdaf5e09139257 (diff) |
don't appear to need WordAfterLI anymore
Diffstat (limited to 'src')
-rw-r--r-- | src/html.cc | 12 | ||||
-rw-r--r-- | src/html_common.hh | 1 |
2 files changed, 1 insertions, 12 deletions
diff --git a/src/html.cc b/src/html.cc index 791330db..593a77bb 100644 --- a/src/html.cc +++ b/src/html.cc @@ -1213,8 +1213,6 @@ static void Html_process_word(DilloHtml *html, const char *word, int size) if (Pword == word2) dFree(Pword); } - if (html->InFlags & IN_LI) - html->WordAfterLI = true; } /* @@ -1792,13 +1790,7 @@ static void Html_tag_open_p(DilloHtml *html, const char *tag, int tagsize) a_Html_tag_set_align_attr (html, &props, tag, tagsize); html->styleEngine->inheritBackgroundColor (); html->styleEngine->setNonCssHints (&props); - - if ((html->InFlags & IN_LI) && !html->WordAfterLI) { - /* ignore first parbreak after an empty <LI> */ - html->WordAfterLI = true; - } else { - HT2TB(html)->addParbreak (9, html->styleEngine->wordStyle ()); - } + HT2TB(html)->addParbreak (9, html->styleEngine->wordStyle ()); } /* @@ -2639,7 +2631,6 @@ static void Html_tag_open_li(DilloHtml *html, const char *tag, int tagsize) BUG_MSG("<li> outside <ul> or <ol>\n"); html->InFlags |= IN_LI; - html->WordAfterLI = false; /* Get our parent tag's variables (used as state storage) */ list_number = &html->stack->getRef(html->stack->size()-2)->list_number; @@ -2680,7 +2671,6 @@ static void Html_tag_open_li(DilloHtml *html, const char *tag, int tagsize) static void Html_tag_close_li(DilloHtml *html, int TagIdx) { html->InFlags &= ~IN_LI; - html->WordAfterLI = false; ((ListItem *)html->dw)->flush (); } diff --git a/src/html_common.hh b/src/html_common.hh index 369d2bf3..6c15e405 100644 --- a/src/html_common.hh +++ b/src/html_common.hh @@ -171,7 +171,6 @@ public: //BUG: for now everything is public bool PrevWasSPC; /* Flag to help handling collapsing white space */ bool InVisitedLink; /* used to 'contrast_visited_colors' */ bool ReqTagClose; /* Flag to help handling bad-formed HTML */ - bool WordAfterLI; /* Flag to help ignoring the 1st <P> after <LI> */ bool TagSoup; /* Flag to enable the parser's cleanup functions */ bool loadCssFromStash; /* current stash content should be loaded as CSS */ |