e621ng/dtext_rb
1
0
Fork 0
mirror of https://github.com/e621ng/dtext_rb.git synced 2025-03-04 03:03:03 -05:00
Code Packages Projects Releases Activity

Fix lists incorrectly closing previous tags

Browse Source 
6627c65b9e

Co-Authored-By: evazion <noizave@gmail.com>
This commit is contained in:
Earlopain 2023-03-31 19:10:03 +02:00
parent 8ea08a5285
commit c6cd30d7bc
No known key found for this signature in database
GPG Key ID: 6CFB948E15246897
2 changed files with 69 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ext/dtext/dtext.cpp.rl
View File

@ -645,7 +645,7 @@ list := |*
newline;
any => {
dstack_rewind(sm);
dstack_close_leaf_blocks(sm);
fhold;
fret;
};
@ -1144,6 +1144,19 @@ static void dstack_close_all(StateMachine * sm) {
}
}
// container blocks: [quote], [spoiler], [section], [tn]
// leaf blocks: [code], [table], [td]?, [th]?, <h1>, <p>, <li>, <ul>
static void dstack_close_leaf_blocks(StateMachine * sm) {
g_debug("dstack close leaf blocks");
while (!sm->dstack.empty() && !dstack_check(sm, BLOCK_QUOTE) && !dstack_check(sm, BLOCK_SPOILER) && !dstack_check(sm, BLOCK_SECTION) && !dstack_check(sm, BLOCK_TN)) {
dstack_rewind(sm);
}
sm->header_mode = false;
sm->list_nest = 0;
}
// Close all open tags up to and including the given tag.
static void dstack_close_until(StateMachine * sm, element_t element) {
while (!sm->dstack.empty() && !dstack_check(sm, element)) {

66
test/dtext_test.rb
View File

@ -245,6 +245,7 @@ test2[/ltable]
def test_quote_blocks_nested_spoiler
assert_parse("<blockquote><p>a<br><span class=\"spoiler\">blah</span><br>c</p></blockquote>", "[quote]\na\n[spoiler]blah[/spoiler]\nc[/quote]")
assert_parse("<blockquote><p>a</p><div class=\"spoiler\"><p>blah</p></div><p>c</p></blockquote>", "[quote]\na\n\n[spoiler]blah[/spoiler]\n\nc[/quote]")
assert_parse('<details><summary></summary><div class="spoiler"><ul><li>blah<br></li></ul></div></details>', "[section]\n[spoiler]\n* blah\n[/spoiler]\n[/section]")
end
def test_quote_blocks_nested_expand
@ -340,24 +341,67 @@ test2[/ltable]
assert_parse('<p>a 「<a rel="nofollow" class="dtext-link dtext-external-link" href="http://test.com">title</a>」 b</p>', 'a 「"title":[http://test.com]」 b')
end
def test_lists_1
def test_lists
assert_parse('<ul><li>a</li></ul>', '* a')
end
def test_lists_2
assert_parse('<ul><li>a</li><li>b</li></ul>', "* a\n* b")
end
assert_parse('<ul><li>a</li><li>b</li><li>c</li></ul>', "* a\n* b\n* c")
assert_parse('<ul><li>a</li><li>b</li></ul>', "* a\r\n* b")
assert_parse('<ul><li>a</li></ul><ul><li>b</li></ul>', "* a\n\n* b")
assert_parse('<ul><li>a</li><li>b</li><li>c</li></ul>', "* a\r\n* b\r\n* c")
def test_lists_nested
assert_parse('<ul><li>a</li><ul><li>b</li></ul></ul>', "* a\n** b")
end
assert_parse('<ul><li>a</li><ul><li>b</li><ul><li>c</li></ul></ul></ul>', "* a\n** b\n*** c")
# assert_parse('<ul><ul><ul><li>a</li></ul><li>b</li></ul><li>c</li></ul>', "*** a\n**\n b\n* c")
assert_parse('<ul><ul><ul><li>a</li></ul></ul><li>b</li></ul>', "*** a\n* b")
assert_parse('<ul><ul><ul><li>a</li></ul></ul></ul>', "*** a")
def test_lists_inline
assert_parse('<ul><li><a class="dtext-link dtext-id-link dtext-post-id-link" href="/posts/1">post #1</a></li></ul>', "* post #1")
end
# assert_parse('<ul><li>a</li></ul><p>b</p><ul><li>c</li></ul>', "* a\nb\n* c")
assert_parse('<ul><li>a<br>b</li><li>c</li></ul>', "* a\nb\n* c") # XXX wrong?
def test_lists_not_preceded_by_newline
assert_parse('<p>a<br>b</p><ul><li>c</li><li>d</li></ul>', "a\nb\n* c\n* d")
assert_parse('<p>a</p><ul><li>b<br>c</li><li>d<br>e</li></ul><p>another one</p>', "a\n* b\nc\n* d\ne\n\nanother one")
assert_parse('<p>a</p><ul><li>b<br>c</li><ul><li>d<br>e</li></ul></ul><p>another one</p>', "a\n* b\nc\n** d\ne\n\nanother one")
assert_parse('<ul><li><a class="dtext-link dtext-id-link dtext-post-id-link" href="/posts/1">post #1</a></li></ul>', "* post #1")
assert_parse('<ul><li><em>a</em></li><li>b</li></ul>', "* [i]a[/i]\n* b")
# assert_parse('<ul><li><em>a</em></li><li>b</li></ul>', "* [i]a\n* b")
assert_parse('<ul><li><em>a<li>b</li></em></li></ul>', "* [i]a\n* b") # XXX wrong
# assert_parse('<p><em>a</em><ul><li>a<li>b</li></li></ul>', "[i]a\n* b\n* c")
assert_parse('<p><em>a<ul><li>b</li><li>c</li></ul></em></p>', "[i]a\n* b\n* c") # XXX wrong
# assert_parse('<ul><li></li></ul><h4>See also</h4><ul><li>a</li></ul>', "* h4. See also\n* a")
assert_parse('<ul><li>h4. See also</li><li>a</li></ul>', "* h4. See also\n* a") # XXX wrong?
# assert_parse('<ul><li>a</li></ul><h4>See also</h4>', "* a\nh4. See also")
assert_parse('<ul><li>a<br>h4. See also</li></ul>', "* a\nh4. See also") # XXX wrong
# assert_parse('<h4><em>See also</em></h4><ul><li>a</li></ul>', "h4. [i]See also\n* a")
assert_parse('<h4><em>See also</em><ul><li>a</li></ul></h4>', "h4. [i]See also\n* a") # XXX wrong
# assert_parse('<ul><li><em>a</em></li></ul><h4>See also</h4>', "* [i]a\nh4. See also")
assert_parse('<ul><li><em>a<br>h4. See also</em></li></ul>', "* [i]a\nh4. See also") # XXX wrong
assert_parse('<h4>See also</h4><ul><li>a</li></ul>', "h4. See also\n* a")
assert_parse('<h4>See also</h4><ul><li>a</li><li>h4. External links</li></ul>', "h4. See also\n* a\n* h4. External links")
# assert_parse('<p>a</p><div class="spoiler"><ul><li>b</li><li>c</li></ul></div><p>d</p>', "a\n[spoilers]\n* b\n* c\n[/spoilers]\nd")
assert_parse('<p>a<br><span class="spoiler"><ul><li>b</li><li>c<br></li></ul></span><br>d</p>', "a\n[spoilers]\n* b\n* c\n[/spoilers]\nd") # XXX wrong
assert_parse('<p>a</p><blockquote><ul><li>b</li><li>c<br></li></ul></blockquote><p>d</p>', "a\n[quote]\n* b\n* c\n[/quote]\nd")
assert_parse('<p>a</p><details><summary></summary><ul><li>b</li><li>c<br></li></ul></details><p>d</p>', "a\n[section]\n* b\n* c\n[/section]\nd")
assert_parse('<p>a</p><blockquote><ul><li>b</li><li>c</li></ul><p>d</p></blockquote>', "a\n[quote]\n* b\n* c\n\nd")
assert_parse('<p>a</p><details><summary></summary><ul><li>b</li><li>c</li></ul><p>d</p></details>', "a\n[section]\n* b\n* c\n\nd")
assert_parse('<p>*</p>', "*")
assert_parse('<p>*a</p>', "*a")
assert_parse('<p>***</p>', "***")
assert_parse('<p>*<br>*<br>*</p>', "*\n*\n*")
assert_parse('<p>* <br>blah</p>', "* \r\nblah")
end
def test_lists_with_multiline_items