redcarpet 1.11.3 → 1.11.4

data/ext/markdown.c

@@ -415,7 +415,7 @@ parse_emph1(struct buf *ob, struct render *rndr, char *data, size_t size, char c
 
 		if (data[i] == c && !isspace(data[i - 1])) {
 
-			if ((rndr->ext_flags & MKDEXT_LAX_EMPHASIS) == 0) {
+			if (rndr->ext_flags & MKDEXT_STRICT_EMPHASIS) {
 				if (!(i + 1 == size || isspace(data[i + 1]) || ispunct(data[i + 1])))
 					continue;
 			}

data/ext/markdown.h

@@ -33,7 +33,7 @@ enum mkd_autolink {
 };
 
 enum mkd_extensions {
-	MKDEXT_LAX_EMPHASIS = (1 << 0),
+	MKDEXT_STRICT_EMPHASIS = (1 << 0),
 	MKDEXT_TABLES = (1 << 1),
 	MKDEXT_FENCED_CODE = (1 << 2),
 	MKDEXT_AUTOLINK = (1 << 3),

data/ext/redcarpet.c

@@ -56,7 +56,7 @@ static void rb_redcarpet__get_flags(VALUE ruby_obj,
 	 * Markdown extensions -- all disabled by default 
 	 */
 	if (rb_funcall(ruby_obj, rb_intern("strict"), 0) == Qtrue)
-		extensions |= MKDEXT_LAX_EMPHASIS;
+		extensions |= MKDEXT_STRICT_EMPHASIS;
 
 	if (rb_funcall(ruby_obj, rb_intern("tables"), 0) == Qtrue)
 		extensions |= MKDEXT_TABLES;

data/ext/xhtml.c

@@ -49,38 +49,6 @@ put_scaped_char(struct buf *ob, char c)
 	}
 }
 
-static void
-uri_escape(struct buf *ob, const char *src, size_t size)
-{
-	size_t i;
-
-	for (i = 0; i < size; ++i) {
-		char c = src[i];
-
-		if (c == '%' && i + 2 < size && isxdigit(src[i + 1]) && isxdigit(src[i + 2])) {
-			bufput(ob, src + i, 3);
-			i += 2;
-			continue;
-		}
-
-		switch (c) {
-			case ';': case '/':
-			case '?': case ':':
-			case '@': case '=':
-			case '#': case '&':
-			case '.': case '+':
-			case '-':
-				bufputc(ob, c);
-				continue;
-		}
-
-		if (!isalnum(c))
-			bufprintf(ob, "%%%02x", (int)c);
-		else
-			bufputc(ob, c);
-	}
-}
-
 /* attr_escape • copy the buffer entity-escaping '<', '>', '&' and '"' */
 static void
 attr_escape(struct buf *ob, const char *src, size_t size)
@@ -154,7 +122,7 @@ rndr_autolink(struct buf *ob, struct buf *link, enum mkd_autolink type, void *op
 	BUFPUTSL(ob, "<a href=\"");
 	if (type == MKDA_EMAIL)
 		BUFPUTSL(ob, "mailto:");
-	uri_escape(ob, link->data, link->size);
+	bufput(ob, link->data, link->size);
 	BUFPUTSL(ob, "\">");
 
 	/*
@@ -323,7 +291,7 @@ rndr_link(struct buf *ob, struct buf *link, struct buf *title, struct buf *conte
 		return 0;
 
 	BUFPUTSL(ob, "<a href=\"");
-	if (link && link->size) uri_escape(ob, link->data, link->size);
+	if (link && link->size) bufput(ob, link->data, link->size);
 	if (title && title->size) {
 		BUFPUTSL(ob, "\" title=\"");
 		attr_escape(ob, title->data, title->size); }

data/lib/redcarpet.rb

@@ -26,7 +26,7 @@
 #   end
 #
 class Redcarpet
-  VERSION = '1.11.3'
+  VERSION = '1.11.4'
 
   # Original Markdown formatted text.
   attr_reader :text
@@ -49,7 +49,7 @@ class Redcarpet
   # Treat newlines in paragraphs as real line breaks, GitHub style
   attr_accessor :hard_wrap
 
-  # Disable superscript and relaxed emphasis processing.
+  # Disable relaxed emphasis processing.
   attr_accessor :strict
 
   # Generate safer HTML for code blocks (no custom CSS classes)
@@ -97,6 +97,7 @@ class RedcarpetCompat < Redcarpet
     super(text, *extensions)
     self.tables = !self.no_tables
     self.strikethrough = true
+    self.lax_htmlblock = true
   end
 end
 

data/redcarpet.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
   s.name = 'redcarpet'
-  s.version = '1.11.3'
+  s.version = '1.11.4'
   s.summary = "Ruby bindings for libupskirt"
   s.description = 'A fast and safe Markdown to (X)HTML parser'
-  s.date = '2011-04-27'
+  s.date = '2011-04-28'
   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: 61
+  hash: 51
   prerelease: false
   segments: 
   - 1
   - 11
-  - 3
-  version: 1.11.3
+  - 4
+  version: 1.11.4
 platform: ruby
 authors: 
 - "Natacha Port\xC3\xA9"
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-27 00:00:00 +03:00
+date: 2011-04-28 00:00:00 +03:00
 default_executable: 
 dependencies: []