Backport Upskirt changes (Fix HTML filter flag)

ext/xhtml.c

@@ -439,10 +439,7 @@ 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_HTML)
-		escape_html = 1;
-
-	else if ((options->flags & XHTML_SKIP_STYLE) != 0 && is_html_tag(text, "style"))
+	if ((options->flags & XHTML_SKIP_STYLE) != 0 && is_html_tag(text, "style"))
 		escape_html = 1;
 
 	else if ((options->flags & XHTML_SKIP_LINKS) != 0 && is_html_tag(text, "a"))
@@ -788,6 +785,11 @@ 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;
+		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.0'
+  VERSION = '1.12.1'
 
   # Original Markdown formatted text.
   attr_reader :text

redcarpet.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
   s.name = 'redcarpet'
-  s.version = '1.12.0'
+  s.version = '1.12.1'
   s.summary = "Ruby bindings for libupskirt"
   s.description = 'A fast and safe Markdown to (X)HTML parser'
-  s.date = '2011-04-30'
+  s.date = '2011-05-01'
   s.email = 'vicent@github.com'
   s.homepage = 'http://github.com/tanoku/redcarpet'
   s.has_rdoc = true