@@ -201,7 +201,7 @@ htmlblock(Paragraph *p, char *tag)
closesize = sprintf(close, "</%s>", tag);
for ( ; t ; t = t->next) {
- if ( strncasecmp(T(t->text), close, closesize) == 0 ) {
+ if ( T(t->text)[0] == '<' && strcasestr(T(t->text), close) != NULL ) {
ret = t->next;
t->next = 0;
return ret;
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_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",
+ markdown.to_html
+ end
+
# Build tests for each file in the MarkdownTest test suite
Dir["#{MARKDOWN_TEST_DIR}/Tests/*.text"].each do |text_file|
test/markdown_test.rb
6c219beca75e86c5a9866449ff062ea1feceed0f
Geoff Garside
geoff@geoffgarside.co.uk
http://github.com/rtomayko/rdiscount/commit/6bc35d19747f0ecc71223507663910ccf412b1af
6bc35d19747f0ecc71223507663910ccf412b1af
2009-03-18T04:32:48-07:00
2009-03-14T05:38:20-07:00
Recognize htmlblock close tags anywhere in line
Previously htmlblock() could only detect a closing tag if it was on
its own on a line. Unfortunately the Pygments library when generating
code blocks with line numbers does not put the closing </table> on
its own line. Instead it writes it as </td></tr></table>, in this
form the Discount library would not detect the closing tag and would
interpret the remainder of the document as HTML.
Signed-off-by: Ryan Tomayko <rtomayko@gmail.com>
NOTE: The original patch included modifications for the Markdown
conformance suite. I didn't want to modify the conformance suite
directly so I created a simple test case in test/markdown_test.rb
94a601a1e775bd0b9df65521a6a911ffc287b3d9
Ryan Tomayko
rtomayko
rtomayko@gmail.com