Backport Upskirt changes for HTML filtering

Filtered HTML now disappears from the rendered document, instead of
appearing with escaped HTML entities.

ext/xhtml.c

@@ -437,23 +437,20 @@ static int
 rndr_raw_html(struct buf *ob, struct buf *text, void *opaque)
 {
 	struct xhtml_renderopt *options = opaque;	
-	int escape_html = 0;
 
-	if ((options->flags & XHTML_SKIP_STYLE) != 0 && is_html_tag(text, "style"))
-		escape_html = 1;
+	if ((options->flags & XHTML_SKIP_HTML) != 0)
+		return 1;
 
-	else if ((options->flags & XHTML_SKIP_LINKS) != 0 && is_html_tag(text, "a"))
-		escape_html = 1;
+	if ((options->flags & XHTML_SKIP_STYLE) != 0 && is_html_tag(text, "style"))
+		return 1;
 
-	else if ((options->flags & XHTML_SKIP_IMAGES) != 0 && is_html_tag(text, "img"))
-		escape_html = 1;
+	if ((options->flags & XHTML_SKIP_LINKS) != 0 && is_html_tag(text, "a"))
+		return 1;
 
+	if ((options->flags & XHTML_SKIP_IMAGES) != 0 && is_html_tag(text, "img"))
+		return 1;
 
-	if (escape_html)
-		attr_escape(ob, text->data, text->size);
-	else
-		bufput(ob, text->data, text->size);
-
+	bufput(ob, text->data, text->size);
 	return 1;
 }
 
@@ -785,10 +782,8 @@ ups_xhtml_renderer(struct mkd_renderer *renderer, unsigned int render_flags)
 		renderer->autolink = NULL;
 	}
 
-	if (render_flags & XHTML_SKIP_HTML) {
-		renderer->raw_html_tag = NULL;
+	if (render_flags & XHTML_SKIP_HTML)
 		renderer->blockhtml = NULL;
-	}
 
 	if (render_flags & XHTML_SMARTYPANTS)
 		renderer->normal_text = rndr_smartypants;

lib/redcarpet.rb

@@ -26,7 +26,7 @@
 #   end
 #
 class Redcarpet
-  VERSION = '1.12.1'
+  VERSION = '1.12.2'
 
   # Original Markdown formatted text.
   attr_reader :text

redcarpet.gemspec

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

test/markdown_test.rb

@@ -42,7 +42,7 @@ def test_that_inline_markdown_starts_and_ends_correctly
 
   def test_that_filter_html_works
     markdown = Markdown.new('Through <em>NO</em> <script>DOUBLE NO</script>', :filter_html)
-    html_equal "<p>Through &lt;em>NO&lt;/em> &lt;script>DOUBLE NO&lt;/script></p>", markdown.to_html.strip
+    html_equal "<p>Through NO DOUBLE NO</p>", markdown.to_html.strip
   end
 
   def test_that_bluecloth_restrictions_are_supported