@@ -189,22 +189,45 @@ static Line *
htmlblock(Paragraph *p, char *tag)
{
Line *t = p->text, *ret;
- int closesize;
+ int closesize, tagsize;
char close[MAXTAG+4];
- if ( selfclose(t, tag) || (strlen(tag) >= MAXTAG) ) {
+ char *ps, *pse;
+ int depth;
+
+ tagsize = strlen(tag);
+
+ if ( selfclose(t, tag) || (tagsize >= MAXTAG) ) {
ret = t->next;
t->next = 0;
return ret;
}
closesize = sprintf(close, "</%s>", tag);
+ depth = 0;
for ( ; t ; t = t->next) {
- if ( T(t->text)[0] == '<' && strcasestr(T(t->text), close) != NULL ) {
- ret = t->next;
- t->next = 0;
- return ret;
+ ps = T(t->text);
+ pse = ps + (S(t->text) - (tagsize + 1));
+ for ( ; ps < pse; ps++ ) {
+ if ( *ps == '<' ) {
+ /* check for close tag */
+ if ( strncasecmp(ps, close, closesize) == 0 ) {
+ depth--;
+ if ( depth == 0 ) {
+ ret = t->next;
+ t->next = 0;
+ return ret;
+ }
+ continue;
+ }
+
+ /* check for nested open tag */
+ if ( (strncasecmp(ps + 1, tag, tagsize) == 0) &&
+ (ps[tagsize + 1] == '>' || ps[tagsize + 1] == ' ') ) {
+ depth++;
+ }
+ }
}
}
return 0;
ext/markdown.c
@@ -82,6 +82,12 @@ class MarkdownTest < Test::Unit::TestCase
assert_equal "<p><a href=\"/search?query=Markdown+Test&page=2\">Page 2</a></p>\n", markdown.to_html
end
+ def test_simple_inline_html
+ markdown = Markdown.new("before\n\n<div>\n foo\n</div>\nafter")
+ assert_equal "<p>before</p>\n\n<div>\n foo\n</div>\n\n\n<p>after</p>\n",
+ markdown.to_html
+ end
+
def test_that_html_blocks_do_not_require_their_own_end_tag_line
markdown = Markdown.new("Para 1\n\n<div><pre>HTML block\n</pre></div>\n\nPara 2 [Link](#anchor)")
assert_equal "<p>Para 1</p>\n\n<div><pre>HTML block\n</pre></div>\n\n\n<p>Para 2 <a href=\"#anchor\">Link</a></p>\n",
test/markdown_test.rb
ce243b65f072b5f141c60b69db5cf4df01ed93b1
Ryan Tomayko
rtomayko@gmail.com
http://github.com/rtomayko/rdiscount/commit/5d452caeff8373a1983e60d790a3dc406275ba18
5d452caeff8373a1983e60d790a3dc406275ba18
2009-03-18T05:53:57-07:00
2009-03-18T05:53:56-07:00
Detect end tags anywhere on a line; account for nesting
2285bf9ce197b52b168b3a1c6770c1eabf216d91
Ryan Tomayko
rtomayko@gmail.com