Skip to content

Fix blockquote and dd having textblocks double added #405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

Fix blockquote and dd having textblocks double added #405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62be8a6
Add test for floating blockquote
campaul May 29, 2025
a337bac
Prevent double adding text blocks for blockquote and dd
campaul May 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 2 additions & 19 deletions src/html.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2777,15 +2777,6 @@ static void Html_tag_close_a(DilloHtml *html)
html->InVisitedLink = false;
}

/*
* <BLOCKQUOTE>
*/
static void Html_tag_open_blockquote(DilloHtml *html,
const char *tag, int tagsize)
{
Html_add_textblock(html, true, 9, false);
}

/*
* <Q>
*/
Expand Down Expand Up @@ -3047,14 +3038,6 @@ static void Html_tag_open_dt(DilloHtml *html, const char *tag, int tagsize)
HT2TB(html)->addParbreak (9, html->wordStyle ());
}

/*
* <DD>
*/
static void Html_tag_open_dd(DilloHtml *html, const char *tag, int tagsize)
{
Html_add_textblock(html, true, 9, false);
}

/*
* <PRE>
*/
Expand Down Expand Up @@ -3490,7 +3473,7 @@ static const TagInfo Tags[] = {
/* basefont 010001 -- obsolete in HTML5 */
/* bdo 010101 */
{"big", B8(01011),'R', Html_tag_open_default, NULL, NULL},
{"blockquote", B8(01110),'R', Html_tag_open_blockquote, NULL, NULL},
{"blockquote", B8(01110),'R', Html_tag_open_default, NULL, NULL},
{"body", B8(01110),'O', Html_tag_open_body, NULL, Html_tag_close_body},
{"br", B8(01001),'F', Html_tag_open_default, Html_tag_content_br, NULL},
{"button", B8(01111),'R', Html_tag_open_button,NULL,Html_tag_close_button},
Expand All @@ -3500,7 +3483,7 @@ static const TagInfo Tags[] = {
{"code", B8(01011),'R', Html_tag_open_default, NULL, NULL},
/* col 010010 'F' */
/* colgroup */
{"dd", B8(01110),'O', Html_tag_open_dd, NULL, NULL},
{"dd", B8(01110),'O', Html_tag_open_default, NULL, NULL},
{"del", B8(01111),'R', Html_tag_open_default, NULL, NULL},
{"dfn", B8(01011),'R', Html_tag_open_default, NULL, NULL},
{"dir", B8(01100),'R', Html_tag_open_dir, NULL, Html_tag_close_par},
Expand Down
2 changes: 1 addition & 1 deletion src/styleengine.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1027,7 +1027,7 @@ void StyleEngine::init () {
":link {color: blue; text-decoration: underline; cursor: pointer}"
":visited {color: #800080; text-decoration: underline; cursor: pointer}"
"h1, h2, h3, h4, h5, h6, b, strong {font-weight: bolder}"
"address, article, aside, center, div, figure, figcaption, footer,"
"address, article, aside, blockquote, center, div, dd, figure, figcaption, footer,"
" h1, h2, h3, h4, h5, h6, header, main, nav, ol, p, pre, section, ul"
" {display: block}"
"i, em, cite, address, var {font-style: italic}"
Expand Down
1 change: 1 addition & 0 deletions test/html/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ TESTS = \
render/b-div.html \
render/div-100-percent-with-padding.html \
render/float-img-justify.html \
render/floating-blockquote.html \
render/github-infinite-loop.html \
render/hackernews.html \
render/img-aspect-ratio-absolute.html \
Expand Down
26 changes: 26 additions & 0 deletions test/html/render/floating-blockquote.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<!DOCTYPE html>
<html>
<head>
<title>Test floating blockquote</title>
<style type="text/css">
body {
background-color: white;
margin: 0;
}

blockquote {
border-style: solid;
border-color: black;
width: 50px;
height: 50px;
float: left;
background-color: #FC0;
color: black;
margin: 10px;
}
</style>
</head>
<body>
<blockquote></blockquote>
</body>
</html>
26 changes: 26 additions & 0 deletions test/html/render/floating-blockquote.ref.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<!DOCTYPE html>
<html>
<head>
<title>Test floating blockquote</title>
<style type="text/css">
body {
background-color: white;
margin: 0;
}

div {
border-style: solid;
border-color: black;
width: 50px;
height: 50px;
float: left;
background-color: #FC0;
color: black;
margin: 10px;
}
</style>
</head>
<body>
<div></div>
</body>
</html>
Loading