forks
/
arsd
mirror of https://github.com/adamdruppe/arsd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:adamdruppe/arsd

This commit is contained in:
Adam D. Ruppe 2017-11-17 09:07:18 -05:00
parent 1ca334018c d1e17da83a
commit 4e06a24b0f
1 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dom.d
View File

@ -1073,6 +1073,9 @@ class Document : FileResource {
// in loose mode, we can see some "bad" nesting (it's valid html, but poorly formed xml). // in loose mode, we can see some "bad" nesting (it's valid html, but poorly formed xml).
// It's hard to handle above though because my code sucks. So, we'll fix it here. // It's hard to handle above though because my code sucks. So, we'll fix it here.
// Where to insert based on the parent (for mixed closed/unclosed <p> tags). See #120
// Kind of inefficient because we can't detect when we recurse back out of a node.
Element[Element] insertLocations;
auto iterator = root.tree; auto iterator = root.tree;
foreach(ele; iterator) { foreach(ele; iterator) {
if(ele.parentNode is null) if(ele.parentNode is null)
@ -1081,7 +1084,12 @@ class Document : FileResource {
if(ele.tagName == "p" && ele.parentNode.tagName == ele.tagName) { if(ele.tagName == "p" && ele.parentNode.tagName == ele.tagName) {
auto shouldBePreviousSibling = ele.parentNode; auto shouldBePreviousSibling = ele.parentNode;
auto holder = shouldBePreviousSibling.parentNode; // this is the two element's mutual holder... auto holder = shouldBePreviousSibling.parentNode; // this is the two element's mutual holder...
holder.insertAfter(shouldBePreviousSibling, ele.removeFromTree()); if (auto p = holder in insertLocations) {
shouldBePreviousSibling = *p;
assert(shouldBePreviousSibling.parentNode is holder);
}
ele = holder.insertAfter(shouldBePreviousSibling, ele.removeFromTree());
insertLocations[holder] = ele;
iterator.currentKilled(); // the current branch can be skipped; we'll hit it soon anyway since it's now next up. iterator.currentKilled(); // the current branch can be skipped; we'll hit it soon anyway since it's now next up.
} }
} }
@ -6971,3 +6979,21 @@ Distributed under the Boost Software License, Version 1.0.
(See accompanying file LICENSE_1_0.txt or copy at (See accompanying file LICENSE_1_0.txt or copy at
http://www.boost.org/LICENSE_1_0.txt) http://www.boost.org/LICENSE_1_0.txt)
*/ */
unittest {
// Test for issue #120
string s = `<html>
<body>
<P>AN
<P>bubbles</P>
<P>giggles</P>
</body>
</html>`;
auto doc = new Document();
doc.parseUtf8(s, false, false);
auto s2 = doc.toString();
assert(
s2.indexOf("bubbles") < s2.indexOf("giggles"),
"paragraph order incorrect:\n" ~ s2);
}