redcarpet 1.8.2 → 1.9.0

data/ext/markdown.c

@@ -1102,13 +1102,11 @@ parse_paragraph(struct buf *ob, struct render *rndr, char *data, size_t size)
 		if (is_empty(data + i, size - i) || (level = is_headerline(data + i, size - i)) != 0)
 			break;
 
-		/* HTML blocks should not nest inside the paragraph, even if they
-		 * are not separated by a blank line; we run `parse_htmlblock` without
-		 * actually generating any output, to make sure that this is indeed
-		 * a HTML block */
-		if (data[i] == '<' && rndr->make.blockhtml && parse_htmlblock(ob, rndr, data + i, size - i, 0)) {
-			end = i;
-			break;
+		if (rndr->ext_flags & MKDEXT_LAX_HTML_BLOCKS) {
+			if (data[i] == '<' && rndr->make.blockhtml && parse_htmlblock(ob, rndr, data + i, size - i, 0)) {
+				end = i;
+				break;
+			}
 		}
 
 		if (data[i] == '#' || is_hrule(data + i, size - i)) {
@@ -1438,7 +1436,7 @@ parse_atxheader(struct buf *ob, struct render *rndr, char *data, size_t size)
 /* htmlblock_end • checking end of HTML block : </tag>[ \t]*\n[ \t*]\n */
 /*	returns the length on match, 0 otherwise */
 static size_t
-htmlblock_end(struct html_tag *tag, char *data, size_t size)
+htmlblock_end(struct html_tag *tag, struct render *rndr, char *data, size_t size)
 {
 	size_t i, w;
 
@@ -1458,14 +1456,13 @@ htmlblock_end(struct html_tag *tag, char *data, size_t size)
 	i += w;
 	w = 0;
 
-		 
-#ifdef UPSKIRT_NEWLINE_AFTER_TAGS
-	if (i < size && (w = is_empty(data + i, size - i)) == 0)
-		return 0; /* non-blank line after tag line */
-#else
-	if (i < size)
-		w = is_empty(data + i, size - i);
-#endif
+	if (rndr->ext_flags & MKDEXT_LAX_HTML_BLOCKS) {
+		if (i < size)
+			w = is_empty(data + i, size - i);
+	} else  {
+		if (i < size && (w = is_empty(data + i, size - i)) == 0)
+			return 0; /* non-blank line after tag line */
+	}
 
 	return i + w;
 }
@@ -1533,19 +1530,18 @@ parse_htmlblock(struct buf *ob, struct render *rndr, char *data, size_t size, in
 	/*	followed by a blank line */
 	i = 1;
 	found = 0;
-#if 0
+
 	while (i < size) {
 		i += 1;
 		while (i < size && !(data[i - 2] == '\n'
 		&& data[i - 1] == '<' && data[i] == '/'))
 			i += 1;
 		if (i + 2 + curtag->size >= size) break;
-		j = htmlblock_end(curtag, data + i - 1, size - i + 1);
+		j = htmlblock_end(curtag, rndr, data + i - 1, size - i + 1);
 		if (j) {
 			i += j - 1;
 			found = 1;
 			break; } }
-#endif
 
 	/* if not found, trying a second pass looking for indented match */
 	/* but not if tag is "ins" or "del" (following original Markdown.pl) */
@@ -1559,7 +1555,7 @@ parse_htmlblock(struct buf *ob, struct render *rndr, char *data, size_t size, in
 			if (i + 2 + curtag->size >= size)
 				break;
 
-			j = htmlblock_end(curtag, data + i - 1, size - i + 1);
+			j = htmlblock_end(curtag, rndr, data + i - 1, size - i + 1);
 
 			if (j) {
 				i += j - 1;

data/ext/markdown.h

@@ -21,9 +21,6 @@
 
 #include "buffer.h"
 
-/* Require a blank newline after HTML tags */
-#define UPSKIRT_NEWLINE_AFTER_TAGS
-
 /********************
  * TYPE DEFINITIONS *
  ********************/
@@ -42,6 +39,7 @@ enum mkd_extensions {
 	MKDEXT_FENCED_CODE = (1 << 2),
 	MKDEXT_AUTOLINK = (1 << 3),
 	MKDEXT_STRIKETHROUGH = (1 << 4),
+	MKDEXT_LAX_HTML_BLOCKS = (1 << 5),
 };
 
 /* mkd_renderer • functions for rendering parsed data */

data/ext/redcarpet.c

@@ -67,6 +67,9 @@ static void rb_redcarpet__get_flags(VALUE ruby_obj,
 	if (rb_funcall(ruby_obj, rb_intern("strikethrough"), 0) == Qtrue)
 		extensions |= MKDEXT_STRIKETHROUGH;
 
+	if (rb_funcall(ruby_obj, rb_intern("lax_htmlblock"), 0) == Qtrue)
+		extensions |= MKDEXT_LAX_HTML_BLOCKS;
+
 	*enabled_extensions_p = extensions;
 	*render_flags_p = render_flags;
 }

data/lib/redcarpet.rb

@@ -26,7 +26,7 @@
 #   end
 #
 class Redcarpet
-  VERSION = '1.8.2'
+  VERSION = '1.9.0'
 
   # Original Markdown formatted text.
   attr_reader :text
@@ -70,6 +70,9 @@ class Redcarpet
   # Enable PHP-Markdown fenced code extension
   attr_accessor :fenced_code
 
+  # Allow HTML blocks inside of paragraphs without being surrounded by newlines
+  attr_accessor :lax_htmlblock
+
   def initialize(text, *extensions)
     @text  = text
     extensions.each { |e| send("#{e}=", true) }

data/redcarpet.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'redcarpet'
-  s.version = '1.8.2'
+  s.version = '1.9.0'
   s.summary = "Ruby bindings for libupskirt"
   s.description = 'A fast and safe Markdown to (X)HTML parser'
   s.date = '2011-04-18'

data/test/markdown_test.rb

@@ -131,8 +131,8 @@ class MarkdownTest < Test::Unit::TestCase
   def test_para_before_block_html_should_not_wrap_in_p_tag
     markdown = Redcarpet.new(
       "Things to watch out for\n" +
-      "<ul>\n<li>Blah</li>\n</ul>\n"
-    )
+      "<ul>\n<li>Blah</li>\n</ul>\n", :lax_htmlblock)
+
     assert_equal "<p>Things to watch out for</p>\n\n" +
       "<ul>\n<li>Blah</li>\n</ul>\n",
       markdown.to_html

data/test/redcarpet_test.rb

@@ -168,8 +168,8 @@ EOS
 
   def test_strikethrough_flag_works
     text = "this is ~some~ striked ~~text~~"
-    assert Redcarpet.new(text).to_html !~ /text-decoration:line-through;/
-    assert Redcarpet.new(text, :strikethrough).to_html =~ /text-decoration:line-through;/
+    assert Redcarpet.new(text).to_html !~ /<del/
+    assert Redcarpet.new(text, :strikethrough).to_html =~ /<del/
   end
 
   def test_that_fenced_flag_works
@@ -196,7 +196,7 @@ This is ~~striked through~~ test
 EOS
     assert rd.tables
     assert rd.to_html =~ /<table/
-    assert rd.to_html =~ /text-decoration:line-through;/
+    assert rd.to_html =~ /<del/
   end
 
   def test_that_headers_are_linkable

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 8
-  - 2
-  version: 1.8.2
+  - 9
+  - 0
+  version: 1.9.0
 platform: ruby
 authors: 
 - "Natacha Port\xC3\xA9"