redcarpet 1.9.0 → 1.10.0

data/ext/buffer.h

@@ -38,6 +38,8 @@ struct buf {
  * MACROS *
  **********/
 
+#define STRLEN(x) (sizeof(x) - 1)
+
 /* CONST_BUF • global buffer from a string litteral */
 #define CONST_BUF(name, string) \
 	static struct buf name = { string, sizeof string -1, sizeof string }

data/ext/markdown.c

@@ -707,7 +707,7 @@ char_link(struct buf *ob, struct render *rndr, char *data, size_t offset, size_t
 		/* skipping initial whitespace */
 		i += 1;
 
-		while (i < size && (data[i] == ' ' || data[i] == '\t'))
+		while (i < size && isspace(data[i]))
 			i++;
 
 		link_b = i;
@@ -740,7 +740,7 @@ char_link(struct buf *ob, struct render *rndr, char *data, size_t offset, size_t
 		}
 
 		/* remove whitespace at the end of the link */
-		while (link_e > link_b && (data[link_e - 1] == ' ' || data[link_e - 1] == '\t'))
+		while (link_e > link_b && isspace(data[link_e - 1]))
 			link_e--;
 
 		/* remove optional angle brackets around the link */
@@ -944,8 +944,21 @@ is_codefence(char *data, size_t size, struct buf *syntax)
 
 		syntax->data = data + i;
 
-		while (i < size && !isspace(data[i])) {
-			syn++; i++;
+		if (i < size && data[i] == '{') {
+			i++; syntax->data++;
+
+			while (i < size && data[i] != '}' && data[i] != '\n') {
+				syn++; i++;
+			}
+
+			if (i == size || data[i] != '}')
+				return 0;
+
+			i++;
+		} else {
+			while (i < size && !isspace(data[i])) {
+				syn++; i++;
+			}
 		}
 
 		syntax->size = syn;
@@ -1531,21 +1544,9 @@ parse_htmlblock(struct buf *ob, struct render *rndr, char *data, size_t size, in
 	i = 1;
 	found = 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, rndr, data + i - 1, size - i + 1);
-		if (j) {
-			i += j - 1;
-			found = 1;
-			break; } }
-
 	/* if not found, trying a second pass looking for indented match */
 	/* but not if tag is "ins" or "del" (following original Markdown.pl) */
-	if (!found && curtag != INS_TAG && curtag != DEL_TAG) {
+	if (curtag != INS_TAG && curtag != DEL_TAG) {
 		i = 1;
 		while (i < size) {
 			i++;

data/ext/xhtml.c

@@ -18,7 +18,7 @@
 #include "markdown.h"
 #include "xhtml.h"
 
-#include <strings.h>
+#include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <ctype.h>
@@ -131,12 +131,38 @@ rndr_autolink(struct buf *ob, struct buf *link, enum mkd_autolink type, void *op
 static void
 rndr_blockcode(struct buf *ob, struct buf *text, struct buf *lang, void *opaque)
 {
+	static char *sh_lang = "bash";
+	struct buf lang_shebang = {0, 0, 0, 0, 0};
+
 	if (ob->size) bufputc(ob, '\n');
 
+	/*
+	 * Try to guess the language based on the shebang
+	 */
+	if (lang == NULL && text != NULL && text->size > 2) {
+		if (bufprefix(text, "#!/usr/bin/env ") == 0) {
+			size_t i = STRLEN("#!/usr/bin/env ");
+
+			lang_shebang.data = text->data + i;
+			while (i < text->size && !isspace(text->data[i])) {
+				i++; lang_shebang.size++;
+			}
+
+			lang = &lang_shebang;
+		} else if (bufprefix(text, "#!/bin/sh") == 0 && isspace(text->data[STRLEN("#!/bin/sh")])) {
+			lang_shebang.data = sh_lang;
+			lang_shebang.size = strlen(sh_lang);
+			lang = &lang_shebang;
+		}
+	}
+
 	if (lang && lang->size) {
-		BUFPUTSL(ob, "<pre lang=\"");
-		bufput(ob, lang->data, lang->size);
-		BUFPUTSL(ob, "\"><code>");
+		BUFPUTSL(ob, "<pre><code class=\"");
+		if (lang->data[0] == '.')
+			bufput(ob, lang->data + 1, lang->size - 1);
+		else
+			bufput(ob, lang->data, lang->size);
+		BUFPUTSL(ob, "\">");
 	} else
 		BUFPUTSL(ob, "<pre><code>");
 

data/lib/redcarpet.rb

@@ -26,7 +26,7 @@
 #   end
 #
 class Redcarpet
-  VERSION = '1.9.0'
+  VERSION = '1.10.0'
 
   # 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.9.0'
+  s.version = '1.10.0'
   s.summary = "Ruby bindings for libupskirt"
   s.description = 'A fast and safe Markdown to (X)HTML parser'
-  s.date = '2011-04-18'
+  s.date = '2011-04-21'
   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: 51
+  hash: 63
   prerelease: false
   segments: 
   - 1
-  - 9
+  - 10
   - 0
-  version: 1.9.0
+  version: 1.10.0
 platform: ruby
 authors: 
 - "Natacha Port\xC3\xA9"
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-18 00:00:00 +03:00
+date: 2011-04-21 00:00:00 +03:00
 default_executable: 
 dependencies: []