redcarpet 1.8.0 → 1.8.1

data/ext/xhtml.c

@@ -68,17 +68,34 @@ lus_attr_escape(struct buf *ob, const char *src, size_t size)
 static int
 is_html_tag(struct buf *tag, const char *tagname)
 {
-	size_t i;
+	size_t i = 0;
+
+	if (i < tag->size && tag->data[0] != '<')
+		return 0;
+
+	i++;
+
+	while (i < tag->size && isspace(tag->data[i]))
+		i++;
 
-	for (i = 0; i < tag->size; ++i) {
-		if (tagname[i] == '>')
+	if (i < tag->size && tag->data[i] == '/')
+		i++;
+
+	while (i < tag->size && isspace(tag->data[i]))
+		i++;
+
+	for (; i < tag->size; ++i, ++tagname) {
+		if (*tagname == 0)
 			break;
 
-		if (tag->data[i] != tagname[i])
+		if (tag->data[i] != *tagname)
 			return 0;
 	}
 
-	return (i == tag->size || isspace(tag->data[i]) || tag->data[i] == '>');
+	if (i == tag->size)
+		return 0;
+
+	return (isspace(tag->data[i]) || tag->data[i] == '>');
 }
 
 /********************
@@ -261,7 +278,7 @@ rndr_paragraph(struct buf *ob, struct buf *text, void *opaque)
 			if (i >= text->size)
 				break;
 
-			BUFPUTSL(ob, "<br/>");
+			BUFPUTSL(ob, "<br/>\n");
 			i++;
 		}
 	} else {
@@ -339,13 +356,13 @@ rndr_raw_html(struct buf *ob, struct buf *text, void *opaque)
 	if (options->flags & XHTML_SKIP_HTML)
 		escape_html = 1;
 
-	else if ((options->flags & XHTML_SKIP_STYLE) != 0 && is_html_tag(text, "<style>"))
+	else 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>"))
+	else if ((options->flags & XHTML_SKIP_LINKS) != 0 && is_html_tag(text, "a"))
 		escape_html = 1;
 
-	else if ((options->flags & XHTML_SKIP_IMAGES) != 0 && is_html_tag(text, "<img>"))
+	else if ((options->flags & XHTML_SKIP_IMAGES) != 0 && is_html_tag(text, "img"))
 		escape_html = 1;
 
 

data/lib/redcarpet.rb

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

data/redcarpet.gemspec

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: redcarpet
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: false
   segments: 
   - 1
   - 8
-  - 0
-  version: 1.8.0
+  - 1
+  version: 1.8.1
 platform: ruby
 authors: 
 - "Natacha Port\xC3\xA9"
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-16 00:00:00 +03:00
+date: 2011-04-17 00:00:00 +03:00
 default_executable: 
 dependencies: []