redcarpet 2.0.0b → 2.0.0b3

data/README.markdown

@@ -123,7 +123,7 @@ renderers are actually implemented in C, and hence offer a brilliant
 performance, several degrees of magnitude faster than other Ruby Markdown
 solutions.
 
-The `HTML` renderer has an alternate version, `Redcarpet::Render::HTML_toc`,
+The `HTML` renderer has an alternate version, `Redcarpet::Render::HTML_TOC`,
 which will output a table of contents in HTML based on the headers of the
 Markdown document.
 
@@ -180,7 +180,7 @@ The following instance methods may be implemented by the renderer:
     header(text, header_level)
     hrule()
     list(contents, list_type)
-    list_item(text)
+    list_item(text, list_type)
     paragraph(text)
     table(header, body)
     table_row(content)

data/ext/redcarpet/html.c

@@ -25,17 +25,6 @@
 
 #define USE_XHTML(opt) (opt->flags & HTML_USE_XHTML)
 
-struct html_renderopt {
-	void *extra;
-
-	struct {
-		int header_count;
-		int current_level;
-	} toc_data;
-
-	unsigned int flags;
-};
-
 static inline void
 put_scaped_char(struct buf *ob, char c)
 {
@@ -122,7 +111,14 @@ rndr_autolink(struct buf *ob, struct buf *link, enum mkd_autolink type, void *op
 	if (type == MKDA_EMAIL)
 		BUFPUTSL(ob, "mailto:");
 	bufput(ob, link->data, link->size);
-	BUFPUTSL(ob, "\">");
+
+	if (options->link_attributes) {
+		bufputc(ob, '\"');
+		options->link_attributes(ob, link, opaque);
+		bufputc(ob, '>');
+	} else {
+		BUFPUTSL(ob, "\">");
+	}
 
 	/*
 	 * Pretty printing: if we get an email address as
@@ -308,11 +304,23 @@ rndr_link(struct buf *ob, struct buf *link, struct buf *title, struct buf *conte
 		return 0;
 
 	BUFPUTSL(ob, "<a href=\"");
-	if (link && link->size) bufput(ob, link->data, link->size);
+
+	if (link && link->size)
+		bufput(ob, link->data, link->size);
+
 	if (title && title->size) {
 		BUFPUTSL(ob, "\" title=\"");
-		sdhtml_escape(ob, title->data, title->size); }
-	BUFPUTSL(ob, "\">");
+		sdhtml_escape(ob, title->data, title->size);
+	}
+
+	if (options->link_attributes) {
+		bufputc(ob, '\"');
+		options->link_attributes(ob, link, opaque);
+		bufputc(ob, '>');
+	} else {
+		BUFPUTSL(ob, "\">");
+	}
+
 	if (content && content->size) bufput(ob, content->data, content->size);
 	BUFPUTSL(ob, "</a>");
 	return 1;
@@ -558,9 +566,9 @@ toc_finalize(struct buf *ob, void *opaque)
 }
 
 void
-sdhtml_toc_renderer(struct mkd_renderer *renderer, void *extra)
+sdhtml_toc_renderer(struct sd_callbacks *callbacks, struct html_renderopt *options)
 {
-	static const struct mkd_renderer toc_render = {
+	static const struct sd_callbacks cb_default = {
 		NULL,
 		NULL,
 		NULL,
@@ -590,23 +598,18 @@ sdhtml_toc_renderer(struct mkd_renderer *renderer, void *extra)
 
 		NULL,
 		toc_finalize,
-
-		NULL
 	};
 
-	struct html_renderopt *options;	
-	options = calloc(1, sizeof(struct html_renderopt));
+	memset(options, 0x0, sizeof(struct html_renderopt));
 	options->flags = HTML_TOC;
-	options->extra = extra;
 
-	memcpy(renderer, &toc_render, sizeof(struct mkd_renderer));
-	renderer->opaque = options;
+	memcpy(callbacks, &cb_default, sizeof(struct sd_callbacks));
 }
 
 void
-sdhtml_renderer(struct mkd_renderer *renderer, unsigned int render_flags, void *extra)
+sdhtml_renderer(struct sd_callbacks *callbacks, struct html_renderopt *options, unsigned int render_flags)
 {
-	static const struct mkd_renderer renderer_default = {
+	static const struct sd_callbacks cb_default = {
 		rndr_blockcode,
 		rndr_blockquote,
 		rndr_raw_block,
@@ -636,36 +639,26 @@ sdhtml_renderer(struct mkd_renderer *renderer, unsigned int render_flags, void *
 
 		NULL,
 		NULL,
-
-		NULL
 	};
 
-	struct html_renderopt *options;	
-	options = calloc(1, sizeof(struct html_renderopt));
+	/* Prepare the options pointer */
+	memset(options, 0x0, sizeof(struct html_renderopt));
 	options->flags = render_flags;
-	options->extra = extra;
 
-	memcpy(renderer, &renderer_default, sizeof(struct mkd_renderer));
-	renderer->opaque = options;
+	/* Prepare the callbacks */
+	memcpy(callbacks, &cb_default, sizeof(struct sd_callbacks));
 
 	if (render_flags & HTML_SKIP_IMAGES)
-		renderer->image = NULL;
+		callbacks->image = NULL;
 
 	if (render_flags & HTML_SKIP_LINKS) {
-		renderer->link = NULL;
-		renderer->autolink = NULL;
+		callbacks->link = NULL;
+		callbacks->autolink = NULL;
 	}
 
 	if (render_flags & HTML_SKIP_HTML)
-		renderer->blockhtml = NULL;
+		callbacks->blockhtml = NULL;
 
 	if (render_flags & HTML_GITHUB_BLOCKCODE)
-		renderer->blockcode = rndr_blockcode_github;
+		callbacks->blockcode = rndr_blockcode_github;
 }
-
-void
-sdhtml_free_renderer(struct mkd_renderer *renderer)
-{
-	free(renderer->opaque);
-}
-

data/ext/redcarpet/html.h

@@ -21,6 +21,18 @@
 #include "buffer.h"
 #include <stdlib.h>
 
+struct html_renderopt {
+	struct {
+		int header_count;
+		int current_level;
+	} toc_data;
+
+	unsigned int flags;
+
+	/* extra callbacks */
+	void (*link_attributes)(struct buf *ob, struct buf *url, void *self);
+};
+
 typedef enum {
 	HTML_SKIP_HTML = (1 << 0),
 	HTML_SKIP_STYLE = (1 << 1),
@@ -32,7 +44,7 @@ typedef enum {
 	HTML_HARD_WRAP = (1 << 9),
 	HTML_GITHUB_BLOCKCODE = (1 << 10),
 	HTML_USE_XHTML = (1 << 11),
-} render_mode;
+} html_render_mode;
 
 typedef enum {
 	HTML_TAG_NONE = 0,
@@ -47,13 +59,10 @@ int
 sdhtml_tag(const char *tag_data, size_t tag_size, const char *tagname);
 
 extern void
-sdhtml_renderer(struct mkd_renderer *renderer, unsigned int render_flags, void *extra);
-
-extern void
-sdhtml_toc_renderer(struct mkd_renderer *renderer, void *extra);
+sdhtml_renderer(struct sd_callbacks *callbacks, struct html_renderopt *options_ptr, unsigned int render_flags);
 
 extern void
-sdhtml_free_renderer(struct mkd_renderer *renderer);
+sdhtml_toc_renderer(struct sd_callbacks *callbacks, struct html_renderopt *options_ptr);
 
 extern void
 sdhtml_smartypants(struct buf *ob, struct buf *text);

data/ext/redcarpet/markdown.c

@@ -94,7 +94,9 @@ static char_trigger markdown_char_ptrs[] = {
 
 /* render • structure containing one particular render */
 struct render {
-	struct mkd_renderer	make;
+	struct sd_callbacks	cb;
+	void *opaque;
+
 	struct array refs;
 	char active_char[256];
 	struct parray work_bufs[2];
@@ -354,10 +356,10 @@ parse_inline(struct buf *ob, struct render *rndr, char *data, size_t size)
 			end++;
 		}
 
-		if (rndr->make.normal_text) {
+		if (rndr->cb.normal_text) {
 			work.data = data + i;
 			work.size = end - i;
-			rndr->make.normal_text(ob, &work, rndr->make.opaque);
+			rndr->cb.normal_text(ob, &work, rndr->opaque);
 		}
 		else
 			bufput(ob, data + i, end - i);
@@ -461,7 +463,7 @@ parse_emph1(struct buf *ob, struct render *rndr, char *data, size_t size, char c
 	struct buf *work = 0;
 	int r;
 
-	if (!rndr->make.emphasis) return 0;
+	if (!rndr->cb.emphasis) return 0;
 
 	/* skipping one symbol if coming from emph3 */
 	if (size > 1 && data[0] == c && data[1] == c) i = 1;
@@ -486,7 +488,7 @@ parse_emph1(struct buf *ob, struct render *rndr, char *data, size_t size, char c
 
 			work = rndr_newbuf(rndr, BUFFER_SPAN);
 			parse_inline(work, rndr, data, i);
-			r = rndr->make.emphasis(ob, work, rndr->make.opaque);
+			r = rndr->cb.emphasis(ob, work, rndr->opaque);
 			rndr_popbuf(rndr, BUFFER_SPAN);
 			return r ? i + 1 : 0;
 		}
@@ -504,7 +506,7 @@ parse_emph2(struct buf *ob, struct render *rndr, char *data, size_t size, char c
 	struct buf *work = 0;
 	int r;
 
-	render_method = (c == '~') ? rndr->make.strikethrough : rndr->make.double_emphasis;
+	render_method = (c == '~') ? rndr->cb.strikethrough : rndr->cb.double_emphasis;
 
 	if (!render_method)
 		return 0;
@@ -517,7 +519,7 @@ parse_emph2(struct buf *ob, struct render *rndr, char *data, size_t size, char c
 		if (i + 1 < size && data[i] == c && data[i + 1] == c && i && !isspace(data[i - 1])) {
 			work = rndr_newbuf(rndr, BUFFER_SPAN);
 			parse_inline(work, rndr, data, i);
-			r = render_method(ob, work, rndr->make.opaque);
+			r = render_method(ob, work, rndr->opaque);
 			rndr_popbuf(rndr, BUFFER_SPAN);
 			return r ? i + 2 : 0;
 		}
@@ -543,12 +545,12 @@ parse_emph3(struct buf *ob, struct render *rndr, char *data, size_t size, char c
 		if (data[i] != c || isspace(data[i - 1]))
 			continue;
 
-		if (i + 2 < size && data[i + 1] == c && data[i + 2] == c && rndr->make.triple_emphasis) {
+		if (i + 2 < size && data[i + 1] == c && data[i + 2] == c && rndr->cb.triple_emphasis) {
 			/* triple symbol found */
 			struct buf *work = rndr_newbuf(rndr, BUFFER_SPAN);
 
 			parse_inline(work, rndr, data, i);
-			r = rndr->make.triple_emphasis(ob, work, rndr->make.opaque);
+			r = rndr->cb.triple_emphasis(ob, work, rndr->opaque);
 			rndr_popbuf(rndr, BUFFER_SPAN);
 			return r ? i + 3 : 0;
 
@@ -613,7 +615,7 @@ char_linebreak(struct buf *ob, struct render *rndr, char *data, size_t offset, s
 	while (ob->size && ob->data[ob->size - 1] == ' ')
 		ob->size--;
 
-	return rndr->make.linebreak(ob, rndr->make.opaque) ? 1 : 0;
+	return rndr->cb.linebreak(ob, rndr->opaque) ? 1 : 0;
 }
 
 
@@ -649,10 +651,10 @@ char_codespan(struct buf *ob, struct render *rndr, char *data, size_t offset, si
 	/* real code span */
 	if (f_begin < f_end) {
 		struct buf work = { data + f_begin, f_end - f_begin, 0, 0, 0 };
-		if (!rndr->make.codespan(ob, &work, rndr->make.opaque))
+		if (!rndr->cb.codespan(ob, &work, rndr->opaque))
 			end = 0;
 	} else {
-		if (!rndr->make.codespan(ob, 0, rndr->make.opaque))
+		if (!rndr->cb.codespan(ob, 0, rndr->opaque))
 			end = 0;
 	}
 
@@ -671,10 +673,10 @@ char_escape(struct buf *ob, struct render *rndr, char *data, size_t offset, size
 		if (strchr(escape_chars, data[1]) == NULL)
 			return 0;
 
-		if (rndr->make.normal_text) {
+		if (rndr->cb.normal_text) {
 			work.data = data + 1;
 			work.size = 1;
-			rndr->make.normal_text(ob, &work, rndr->make.opaque);
+			rndr->cb.normal_text(ob, &work, rndr->opaque);
 		}
 		else bufputc(ob, data[1]);
 	}
@@ -701,10 +703,10 @@ char_entity(struct buf *ob, struct render *rndr, char *data, size_t offset, size
 	else
 		return 0; /* lone '&' */
 
-	if (rndr->make.entity) {
+	if (rndr->cb.entity) {
 		work.data = data;
 		work.size = end;
-		rndr->make.entity(ob, &work, rndr->make.opaque);
+		rndr->cb.entity(ob, &work, rndr->opaque);
 	}
 	else bufput(ob, data, end);
 
@@ -721,16 +723,16 @@ char_langle_tag(struct buf *ob, struct render *rndr, char *data, size_t offset,
 	int ret = 0;
 
 	if (end > 2) {
-		if (rndr->make.autolink && altype != MKDA_NOT_AUTOLINK) {
+		if (rndr->cb.autolink && altype != MKDA_NOT_AUTOLINK) {
 			struct buf *u_link = rndr_newbuf(rndr, BUFFER_SPAN);
 			work.data = data + 1;
 			work.size = end - 2;
 			unscape_text(u_link, &work);
-			ret = rndr->make.autolink(ob, u_link, altype, rndr->make.opaque);
+			ret = rndr->cb.autolink(ob, u_link, altype, rndr->opaque);
 			rndr_popbuf(rndr, BUFFER_SPAN);
 		}
-		else if (rndr->make.raw_html_tag)
-			ret = rndr->make.raw_html_tag(ob, &work, rndr->make.opaque);
+		else if (rndr->cb.raw_html_tag)
+			ret = rndr->cb.raw_html_tag(ob, &work, rndr->opaque);
 	}
 
 	if (!ret) return 0;
@@ -743,7 +745,7 @@ char_autolink_www(struct buf *ob, struct render *rndr, char *data, size_t offset
 	struct buf *link, *link_url;
 	size_t link_len, rewind;
 
-	if (!rndr->make.link)
+	if (!rndr->cb.link)
 		return 0;
 
 	link = rndr_newbuf(rndr, BUFFER_SPAN);
@@ -754,7 +756,7 @@ char_autolink_www(struct buf *ob, struct render *rndr, char *data, size_t offset
 		bufput(link_url, link->data, link->size);
 
 		ob->size -= rewind;
-		rndr->make.link(ob, link_url, NULL, link, rndr->make.opaque);
+		rndr->cb.link(ob, link_url, NULL, link, rndr->opaque);
 		rndr_popbuf(rndr, BUFFER_SPAN);
 	}
 
@@ -768,14 +770,14 @@ char_autolink_email(struct buf *ob, struct render *rndr, char *data, size_t offs
 	struct buf *link;
 	size_t link_len, rewind;
 
-	if (!rndr->make.autolink)
+	if (!rndr->cb.autolink)
 		return 0;
 
 	link = rndr_newbuf(rndr, BUFFER_SPAN);
 
 	if ((link_len = sd_autolink__email(&rewind, link, data, offset, size)) > 0) {
 		ob->size -= rewind;
-		rndr->make.autolink(ob, link, MKDA_EMAIL, rndr->make.opaque);
+		rndr->cb.autolink(ob, link, MKDA_EMAIL, rndr->opaque);
 	}
 
 	rndr_popbuf(rndr, BUFFER_SPAN);
@@ -788,14 +790,14 @@ char_autolink_url(struct buf *ob, struct render *rndr, char *data, size_t offset
 	struct buf *link;
 	size_t link_len, rewind;
 
-	if (!rndr->make.autolink)
+	if (!rndr->cb.autolink)
 		return 0;
 
 	link = rndr_newbuf(rndr, BUFFER_SPAN);
 
 	if ((link_len = sd_autolink__url(&rewind, link, data, offset, size)) > 0) {
 		ob->size -= rewind;
-		rndr->make.autolink(ob, link, MKDA_NORMAL, rndr->make.opaque);
+		rndr->cb.autolink(ob, link, MKDA_NORMAL, rndr->opaque);
 	}
 
 	rndr_popbuf(rndr, BUFFER_SPAN);
@@ -816,7 +818,7 @@ char_link(struct buf *ob, struct render *rndr, char *data, size_t offset, size_t
 	int text_has_nl = 0, ret = 0;
 
 	/* checking whether the correct renderer exists */
-	if ((is_img && !rndr->make.image) || (!is_img && !rndr->make.link))
+	if ((is_img && !rndr->cb.image) || (!is_img && !rndr->cb.link))
 		goto cleanup;
 
 	/* looking for the matching closing bracket */
@@ -1013,9 +1015,9 @@ char_link(struct buf *ob, struct render *rndr, char *data, size_t offset, size_t
 		if (ob->size && ob->data[ob->size - 1] == '!')
 			ob->size -= 1;
 
-		ret = rndr->make.image(ob, u_link, title, content, rndr->make.opaque);
+		ret = rndr->cb.image(ob, u_link, title, content, rndr->opaque);
 	} else {
-		ret = rndr->make.link(ob, u_link, title, content, rndr->make.opaque);
+		ret = rndr->cb.link(ob, u_link, title, content, rndr->opaque);
 	}
 
 	/* cleanup */
@@ -1030,7 +1032,7 @@ char_superscript(struct buf *ob, struct render *rndr, char *data, size_t offset,
 	size_t sup_start, sup_len;
 	struct buf *sup;
 
-	if (!rndr->make.superscript)
+	if (!rndr->cb.superscript)
 		return 0;
 
 	if (size < 2)
@@ -1056,7 +1058,7 @@ char_superscript(struct buf *ob, struct render *rndr, char *data, size_t offset,
 
 	sup = rndr_newbuf(rndr, BUFFER_SPAN);
 	parse_inline(sup, rndr, data + sup_start, sup_len - sup_start);
-	rndr->make.superscript(ob, sup, rndr->make.opaque);
+	rndr->cb.superscript(ob, sup, rndr->opaque);
 	rndr_popbuf(rndr, BUFFER_SPAN);
 
 	return (sup_start == 2) ? sup_len + 1 : sup_len;
@@ -1317,8 +1319,8 @@ parse_blockquote(struct buf *ob, struct render *rndr, char *data, size_t size)
 	}
 
 	parse_block(out, rndr, work_data, work_size);
-	if (rndr->make.blockquote)
-		rndr->make.blockquote(ob, out, rndr->make.opaque);
+	if (rndr->cb.blockquote)
+		rndr->cb.blockquote(ob, out, rndr->opaque);
 	rndr_popbuf(rndr, BUFFER_BLOCK);
 	return end;
 }
@@ -1341,7 +1343,7 @@ parse_paragraph(struct buf *ob, struct render *rndr, char *data, size_t size)
 			break;
 
 		if (rndr->ext_flags & MKDEXT_LAX_HTML_BLOCKS) {
-			if (data[i] == '<' && rndr->make.blockhtml && parse_htmlblock(ob, rndr, data + i, size - i, 0)) {
+			if (data[i] == '<' && rndr->cb.blockhtml && parse_htmlblock(ob, rndr, data + i, size - i, 0)) {
 				end = i;
 				break;
 			}
@@ -1362,8 +1364,8 @@ parse_paragraph(struct buf *ob, struct render *rndr, char *data, size_t size)
 	if (!level) {
 		struct buf *tmp = rndr_newbuf(rndr, BUFFER_BLOCK);
 		parse_inline(tmp, rndr, work.data, work.size);
-		if (rndr->make.paragraph)
-			rndr->make.paragraph(ob, tmp, rndr->make.opaque);
+		if (rndr->cb.paragraph)
+			rndr->cb.paragraph(ob, tmp, rndr->opaque);
 		rndr_popbuf(rndr, BUFFER_BLOCK);
 	} else {
 		struct buf *header_work;
@@ -1384,8 +1386,8 @@ parse_paragraph(struct buf *ob, struct render *rndr, char *data, size_t size)
 				struct buf *tmp = rndr_newbuf(rndr, BUFFER_BLOCK);
 				parse_inline(tmp, rndr, work.data, work.size);
 
-				if (rndr->make.paragraph)
-					rndr->make.paragraph(ob, tmp, rndr->make.opaque);
+				if (rndr->cb.paragraph)
+					rndr->cb.paragraph(ob, tmp, rndr->opaque);
 
 				rndr_popbuf(rndr, BUFFER_BLOCK);
 				work.data += beg;
@@ -1397,8 +1399,8 @@ parse_paragraph(struct buf *ob, struct render *rndr, char *data, size_t size)
 		header_work = rndr_newbuf(rndr, BUFFER_SPAN);
 		parse_inline(header_work, rndr, work.data, work.size);
 
-		if (rndr->make.header)
-			rndr->make.header(ob, header_work, (int)level, rndr->make.opaque);
+		if (rndr->cb.header)
+			rndr->cb.header(ob, header_work, (int)level, rndr->opaque);
 
 		rndr_popbuf(rndr, BUFFER_SPAN);
 	}
@@ -1443,8 +1445,8 @@ parse_fencedcode(struct buf *ob, struct render *rndr, char *data, size_t size)
 	if (work->size && work->data[work->size - 1] != '\n')
 		bufputc(work, '\n');
 
-	if (rndr->make.blockcode)
-		rndr->make.blockcode(ob, work, lang.size ? &lang : NULL, rndr->make.opaque);
+	if (rndr->cb.blockcode)
+		rndr->cb.blockcode(ob, work, lang.size ? &lang : NULL, rndr->opaque);
 
 	rndr_popbuf(rndr, BUFFER_BLOCK);
 	return beg;
@@ -1484,8 +1486,8 @@ parse_blockcode(struct buf *ob, struct render *rndr, char *data, size_t size)
 
 	bufputc(work, '\n');
 
-	if (rndr->make.blockcode)
-		rndr->make.blockcode(ob, work, NULL, rndr->make.opaque);
+	if (rndr->cb.blockcode)
+		rndr->cb.blockcode(ob, work, NULL, rndr->opaque);
 
 	rndr_popbuf(rndr, BUFFER_BLOCK);
 	return beg;
@@ -1599,8 +1601,8 @@ parse_listitem(struct buf *ob, struct render *rndr, char *data, size_t size, int
 	}
 
 	/* render of li itself */
-	if (rndr->make.listitem)
-		rndr->make.listitem(ob, inter, *flags, rndr->make.opaque);
+	if (rndr->cb.listitem)
+		rndr->cb.listitem(ob, inter, *flags, rndr->opaque);
 
 	rndr_popbuf(rndr, BUFFER_SPAN);
 	rndr_popbuf(rndr, BUFFER_SPAN);
@@ -1625,8 +1627,8 @@ parse_list(struct buf *ob, struct render *rndr, char *data, size_t size, int fla
 			break;
 	}
 
-	if (rndr->make.list)
-		rndr->make.list(ob, work, flags, rndr->make.opaque);
+	if (rndr->cb.list)
+		rndr->cb.list(ob, work, flags, rndr->opaque);
 	rndr_popbuf(rndr, BUFFER_BLOCK);
 	return i;
 }
@@ -1657,8 +1659,8 @@ parse_atxheader(struct buf *ob, struct render *rndr, char *data, size_t size)
 
 		parse_inline(work, rndr, data + i, end - i);
 
-		if (rndr->make.header)
-			rndr->make.header(ob, work, (int)level, rndr->make.opaque);
+		if (rndr->cb.header)
+			rndr->cb.header(ob, work, (int)level, rndr->opaque);
 
 		rndr_popbuf(rndr, BUFFER_SPAN);
 	}
@@ -1732,8 +1734,8 @@ parse_htmlblock(struct buf *ob, struct render *rndr, char *data, size_t size, in
 
 			if (j) {
 				work.size = i + j;
-				if (do_render && rndr->make.blockhtml)
-					rndr->make.blockhtml(ob, &work, rndr->make.opaque);
+				if (do_render && rndr->cb.blockhtml)
+					rndr->cb.blockhtml(ob, &work, rndr->opaque);
 				return work.size;
 			} 
 		}
@@ -1749,8 +1751,8 @@ parse_htmlblock(struct buf *ob, struct render *rndr, char *data, size_t size, in
 				j = is_empty(data + i, size - i);
 				if (j) {
 					work.size = i + j;
-					if (do_render && rndr->make.blockhtml)
-						rndr->make.blockhtml(ob, &work, rndr->make.opaque);
+					if (do_render && rndr->cb.blockhtml)
+						rndr->cb.blockhtml(ob, &work, rndr->opaque);
 					return work.size;
 				}
 			} 
@@ -1791,8 +1793,8 @@ parse_htmlblock(struct buf *ob, struct render *rndr, char *data, size_t size, in
 
 	/* the end of the block has been found */
 	work.size = i;
-	if (do_render && rndr->make.blockhtml)
-		rndr->make.blockhtml(ob, &work, rndr->make.opaque);
+	if (do_render && rndr->cb.blockhtml)
+		rndr->cb.blockhtml(ob, &work, rndr->opaque);
 
 	return i;
 }
@@ -1828,8 +1830,8 @@ parse_table_row(struct buf *ob, struct render *rndr, char *data, size_t size, si
 			cell_end--;
 
 		parse_inline(cell_work, rndr, data + cell_start, 1 + cell_end - cell_start);
-		if (rndr->make.table_cell)
-			rndr->make.table_cell(row_work, cell_work, col_data ? col_data[col] : 0, rndr->make.opaque);
+		if (rndr->cb.table_cell)
+			rndr->cb.table_cell(row_work, cell_work, col_data ? col_data[col] : 0, rndr->opaque);
 
 		rndr_popbuf(rndr, BUFFER_SPAN);
 		i++;
@@ -1837,12 +1839,12 @@ parse_table_row(struct buf *ob, struct render *rndr, char *data, size_t size, si
 
 	for (; col < columns; ++col) {
 		struct buf empty_cell = {0, 0, 0, 0, 0};
-		if (rndr->make.table_cell)
-			rndr->make.table_cell(row_work, &empty_cell, col_data ? col_data[col] : 0, rndr->make.opaque);
+		if (rndr->cb.table_cell)
+			rndr->cb.table_cell(row_work, &empty_cell, col_data ? col_data[col] : 0, rndr->opaque);
 	}
 
-	if (rndr->make.table_row)
-		rndr->make.table_row(ob, row_work, rndr->make.opaque);
+	if (rndr->cb.table_row)
+		rndr->cb.table_row(ob, row_work, rndr->opaque);
 
 	rndr_popbuf(rndr, BUFFER_SPAN);
 }
@@ -1956,8 +1958,8 @@ parse_table(struct buf *ob, struct render *rndr, char *data, size_t size)
 			i++;
 		}
 
-		if (rndr->make.table)
-			rndr->make.table(ob, header_work, body_work, rndr->make.opaque);
+		if (rndr->cb.table)
+			rndr->cb.table(ob, header_work, body_work, rndr->opaque);
 	}
 
 	free(col_data);
@@ -1985,7 +1987,7 @@ parse_block(struct buf *ob, struct render *rndr, char *data, size_t size)
 		if (is_atxheader(rndr, txt_data, end))
 			beg += parse_atxheader(ob, rndr, txt_data, end);
 
-		else if (data[beg] == '<' && rndr->make.blockhtml &&
+		else if (data[beg] == '<' && rndr->cb.blockhtml &&
 				(i = parse_htmlblock(ob, rndr, txt_data, end, 1)) != 0)
 			beg += i;
 
@@ -1993,8 +1995,8 @@ parse_block(struct buf *ob, struct render *rndr, char *data, size_t size)
 			beg += i;
 
 		else if (is_hrule(txt_data, end)) {
-			if (rndr->make.hrule)
-				rndr->make.hrule(ob, rndr->make.opaque);
+			if (rndr->cb.hrule)
+				rndr->cb.hrule(ob, rndr->opaque);
 
 			while (beg < size && data[beg] != '\n')
 				beg++;
@@ -2167,14 +2169,21 @@ static void expand_tabs(struct buf *ob, const char *line, size_t size)
 
 /* markdown • parses the input buffer and renders it into the output buffer */
 void
-sd_markdown(struct buf *ob, struct buf *ib, const struct mkd_renderer *rndrer, unsigned int extensions) {
+sd_markdown(struct buf *ob,
+	const struct buf *ib,
+	unsigned int extensions,
+	const struct sd_callbacks *callbacks,
+	void *opaque) {
+
+	static const float MARKDOWN_GROW_FACTOR = 1.4f;
+
 	struct link_ref *lr;
 	struct buf *text;
 	size_t i, beg, end;
 	struct render rndr;
 
 	/* filling the render structure */
-	if (!rndrer)
+	if (!callbacks)
 		return;
 
 	text = bufnew(64);
@@ -2184,28 +2193,30 @@ sd_markdown(struct buf *ob, struct buf *ib, const struct mkd_renderer *rndrer, u
 	/* Preallocate enough space for our buffer to avoid expanding while copying */
 	bufgrow(text, ib->size);
 
-	memcpy(&rndr.make, rndrer, sizeof(struct mkd_renderer));
+	memcpy(&rndr.cb, callbacks, sizeof(struct sd_callbacks));
 	arr_init(&rndr.refs, sizeof (struct link_ref));
 	parr_init(&rndr.work_bufs[BUFFER_BLOCK]);
 	parr_init(&rndr.work_bufs[BUFFER_SPAN]);
 
-	for (i = 0; i < 256; i++)
-		rndr.active_char[i] = 0;
+/*	for (i = 0; i < 256; i++)
+		rndr.active_char[i] = 0; */
 
-	if (rndr.make.emphasis || rndr.make.double_emphasis || rndr.make.triple_emphasis) {
+	memset(rndr.active_char, 0x0, 256);
+
+	if (rndr.cb.emphasis || rndr.cb.double_emphasis || rndr.cb.triple_emphasis) {
 		rndr.active_char['*'] = MD_CHAR_EMPHASIS;
 		rndr.active_char['_'] = MD_CHAR_EMPHASIS;
 		if (extensions & MKDEXT_STRIKETHROUGH)
 			rndr.active_char['~'] = MD_CHAR_EMPHASIS;
 	}
 
-	if (rndr.make.codespan)
+	if (rndr.cb.codespan)
 		rndr.active_char['`'] = MD_CHAR_CODESPAN;
 
-	if (rndr.make.linebreak)
+	if (rndr.cb.linebreak)
 		rndr.active_char['\n'] = MD_CHAR_LINEBREAK;
 
-	if (rndr.make.image || rndr.make.link)
+	if (rndr.cb.image || rndr.cb.link)
 		rndr.active_char['['] = MD_CHAR_LINK;
 
 	rndr.active_char['<'] = MD_CHAR_LANGLE;
@@ -2223,6 +2234,7 @@ sd_markdown(struct buf *ob, struct buf *ib, const struct mkd_renderer *rndrer, u
 
 	/* Extension data */
 	rndr.ext_flags = extensions;
+	rndr.opaque = opaque;
 	rndr.max_nesting = 16;
 
 	/* first pass: looking for references, copying everything else */
@@ -2253,9 +2265,12 @@ sd_markdown(struct buf *ob, struct buf *ib, const struct mkd_renderer *rndrer, u
 	if (rndr.refs.size)
 		qsort(rndr.refs.base, rndr.refs.size, rndr.refs.unit, cmp_link_ref_sort);
 
+	/* pre-grow the output buffer to minimize allocations */
+	bufgrow(ob, text->size * MARKDOWN_GROW_FACTOR);
+
 	/* second pass: actual rendering */
-	if (rndr.make.doc_header)
-		rndr.make.doc_header(ob, rndr.make.opaque);
+	if (rndr.cb.doc_header)
+		rndr.cb.doc_header(ob, rndr.opaque);
 
 	if (text->size) {
 		/* adding a final newline if not already present */
@@ -2265,8 +2280,8 @@ sd_markdown(struct buf *ob, struct buf *ib, const struct mkd_renderer *rndrer, u
 		parse_block(ob, &rndr, text->data, text->size);
 	}
 
-	if (rndr.make.doc_footer)
-		rndr.make.doc_footer(ob, rndr.make.opaque);
+	if (rndr.cb.doc_footer)
+		rndr.cb.doc_footer(ob, rndr.opaque);
 
 	/* clean-up */
 	bufrelease(text);

data/ext/redcarpet/markdown.h

@@ -31,7 +31,7 @@
  * TYPE DEFINITIONS *
  ********************/
 
-/* mkd_autolink • type of autolink */
+/* mkd_autolink - type of autolink */
 enum mkd_autolink {
 	MKDA_NOT_AUTOLINK,	/* used internally when it is not an autolink*/
 	MKDA_NORMAL,		/* normal http/http/ftp/mailto/etc link */
@@ -49,8 +49,8 @@ enum mkd_extensions {
 	MKDEXT_SUPERSCRIPT = (1 << 7),
 };
 
-/* mkd_renderer • functions for rendering parsed data */
-struct mkd_renderer {
+/* sd_callbacks - functions for rendering parsed data */
+struct sd_callbacks {
 	/* block level callbacks - NULL skips the block */
 	void (*blockcode)(struct buf *ob, struct buf *text, struct buf *lang, void *opaque);
 	void (*blockquote)(struct buf *ob, struct buf *text, void *opaque);
@@ -85,9 +85,6 @@ struct mkd_renderer {
 	/* header and footer */
 	void (*doc_header)(struct buf *ob, void *opaque);
 	void (*doc_footer)(struct buf *ob, void *opaque);
-
-	/* user data */
-	void *opaque;
 };
 
 /*********
@@ -108,7 +105,7 @@ struct mkd_renderer {
 
 /* sd_markdown * parses the input buffer and renders it into the output buffer */
 extern void
-sd_markdown(struct buf *ob, struct buf *ib, const struct mkd_renderer *rndr, unsigned int extensions);
+sd_markdown(struct buf *ob, const struct buf *ib, unsigned int extensions, const struct sd_callbacks *rndr, void *opaque);
 
 /* sd_version * returns the library version as major.minor.rev */
 extern void

data/ext/redcarpet/rc_markdown.c

@@ -1,15 +1,19 @@
-#define RSTRING_NOT_MODIFIED
-
-#include <stdio.h>
-#include "ruby.h"
-
-#ifdef HAVE_RUBY_ENCODING_H
-#include <ruby/encoding.h>
-#else
-#define rb_enc_copy(dst, src)
-#endif
-
-#include "markdown.h"
+/*
+ * Copyright (c) 2011, Vicent Marti
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+#include "redcarpet.h"
 
 VALUE rb_mRedcarpet;
 VALUE rb_cMarkdown;
@@ -54,7 +58,7 @@ static VALUE rb_redcarpet_md_render_with(VALUE self, VALUE rb_rndr, VALUE text)
 {
 	VALUE result;
 
-	struct mkd_renderer *renderer;
+	struct rb_redcarpet_rndr *rndr;
 	struct buf input_buf, *output_buf;
 	unsigned int enabled_extensions = 0;
 
@@ -66,17 +70,18 @@ static VALUE rb_redcarpet_md_render_with(VALUE self, VALUE rb_rndr, VALUE text)
 	if (rb_respond_to(rb_rndr, rb_intern("preprocess")))
 		text = rb_funcall(rb_rndr, rb_intern("preprocess"), 1, text);
 
+	Data_Get_Struct(rb_rndr, struct rb_redcarpet_rndr, rndr);
+
+	/* initialize buffers */
 	memset(&input_buf, 0x0, sizeof(struct buf));
 	input_buf.data = RSTRING_PTR(text);
 	input_buf.size = RSTRING_LEN(text);
 
 	output_buf = bufnew(128);
-	bufgrow(output_buf, RSTRING_LEN(text) * 1.4f);
-
-	Data_Get_Struct(rb_rndr, struct mkd_renderer, renderer);
 
+	/* render the magic */
 	rb_redcarpet_md_flags(self, &enabled_extensions);
-	sd_markdown(output_buf, &input_buf, renderer, enabled_extensions);
+	sd_markdown(output_buf, &input_buf, enabled_extensions, &rndr->callbacks, &rndr->options);
 	result = rb_str_new(output_buf->data, output_buf->size);
 	rb_enc_copy(result, text);
 
@@ -93,8 +98,6 @@ static VALUE rb_redcarpet_md_render(VALUE self, VALUE text)
 	return rb_redcarpet_md_render_with(self, rb_iv_get(self, "@renderer"), text);
 }
 
-extern void Init_redcarpet_rndr();
-
 void Init_redcarpet()
 {
     rb_mRedcarpet = rb_define_module("Redcarpet");

data/ext/redcarpet/rc_render.c

@@ -14,23 +14,11 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#define RSTRING_NOT_MODIFIED
-
-#include <ruby.h>
-#include "markdown.h"
-#include "html.h"
-
-#ifdef HAVE_RUBY_ENCODING_H
-#include <ruby/encoding.h>
-#else
-#define rb_enc_copy(dst, src)
-#endif
-
-#define CSTR2SYM(s) (ID2SYM(rb_intern((s))))
+#include "redcarpet.h"
 
 #define SPAN_CALLBACK(method_name, ...) {\
-	struct redcarpet_pload *load = opaque;\
-	VALUE ret = rb_funcall(load->self, rb_intern(method_name), __VA_ARGS__);\
+	struct redcarpet_renderopt *opt = opaque;\
+	VALUE ret = rb_funcall(opt->self, rb_intern(method_name), __VA_ARGS__);\
 	if (NIL_P(ret)) return 0;\
 	Check_Type(ret, T_STRING);\
 	bufput(ob, RSTRING_PTR(ret), RSTRING_LEN(ret));\
@@ -38,8 +26,8 @@
 }
 
 #define BLOCK_CALLBACK(method_name, ...) {\
-	struct redcarpet_pload *load = opaque;\
-	VALUE ret = rb_funcall(load->self, rb_intern(method_name), __VA_ARGS__);\
+	struct redcarpet_renderopt *opt = opaque;\
+	VALUE ret = rb_funcall(opt->self, rb_intern(method_name), __VA_ARGS__);\
 	if (NIL_P(ret)) return;\
 	Check_Type(ret, T_STRING);\
 	bufput(ob, RSTRING_PTR(ret), RSTRING_LEN(ret));\
@@ -52,10 +40,6 @@ VALUE rb_cRenderHTML;
 VALUE rb_cRenderHTML_TOC;
 VALUE rb_mSmartyPants;
 
-struct redcarpet_pload {
-	VALUE self;
-};
-
 static inline VALUE
 buf2str(struct buf *text)
 {
@@ -104,7 +88,8 @@ rndr_list(struct buf *ob, struct buf *text, int flags, void *opaque)
 static void
 rndr_listitem(struct buf *ob, struct buf *text, int flags, void *opaque)
 {
-	BLOCK_CALLBACK("list_item", 1, buf2str(text));
+	BLOCK_CALLBACK("list_item", 2, buf2str(text),
+			(flags & MKD_LIST_ORDERED) ? CSTR2SYM("ordered") : CSTR2SYM("unordered"));
 }
 
 static void
@@ -251,7 +236,7 @@ rndr_doc_footer(struct buf *ob, void *opaque)
 	BLOCK_CALLBACK("doc_footer", 0);
 }
 
-static struct mkd_renderer rb_redcarpet_rndr = {
+static struct sd_callbacks rb_redcarpet_callbacks = {
 	rndr_blockcode,
 	rndr_blockquote,
 	rndr_raw_block,
@@ -281,8 +266,6 @@ static struct mkd_renderer rb_redcarpet_rndr = {
 
 	rndr_doc_header,
 	rndr_doc_footer,
-
-	NULL
 };
 
 static const char *rb_redcarpet_method_names[] = {
@@ -319,58 +302,51 @@ static const char *rb_redcarpet_method_names[] = {
 
 static const size_t rb_redcarpet_method_count = sizeof(rb_redcarpet_method_names)/sizeof(char *);
 
-static void rb_redcarpet_rbase_free(struct mkd_renderer *rndr)
-{
-	xfree(rndr->opaque);
-	xfree(rndr);
-}
-
 static VALUE rb_redcarpet_rbase_alloc(VALUE klass)
 {
-	struct mkd_renderer *rndr = ALLOC(struct mkd_renderer);
-	memset(rndr, 0x0, sizeof(struct mkd_renderer));
-	return Data_Wrap_Struct(klass, NULL, rb_redcarpet_rbase_free, rndr);
+	struct rb_redcarpet_rndr *rndr = ALLOC(struct rb_redcarpet_rndr);
+	memset(rndr, 0x0, sizeof(struct rb_redcarpet_rndr));
+	return Data_Wrap_Struct(klass, NULL, NULL, rndr);
 }
 
-static void rb_redcarpet__overload(VALUE self)
+static void rb_redcarpet__overload(VALUE self, VALUE base_class)
 {
-	size_t i;
-	struct mkd_renderer *rndr;
+	struct rb_redcarpet_rndr *rndr;
+
+	Data_Get_Struct(self, struct rb_redcarpet_rndr, rndr);
+	rndr->options.self = self;
+	rndr->options.base_class = base_class;
 
-	void **source = (void **)&rb_redcarpet_rndr;
-	void **dest;
+	if (rb_obj_class(self) == rb_cRenderBase)
+		rb_raise(rb_eRuntimeError,
+			"The Redcarpet::Render::Base class cannot be instantiated. "
+			"Create an inheriting class instead to implement a custom renderer.");
 
-	Data_Get_Struct(self, struct mkd_renderer, rndr);
-	dest = (void **)rndr;
+	if (rb_obj_class(self) != base_class) {
+		void **source = (void **)&rb_redcarpet_callbacks;
+		void **dest = (void **)&rndr->callbacks;
+		size_t i;
 
-	for (i = 0; i < rb_redcarpet_method_count; ++i) {
-		if (rb_respond_to(self, rb_intern(rb_redcarpet_method_names[i])))
-			dest[i] = source[i];
+		for (i = 0; i < rb_redcarpet_method_count; ++i) {
+			if (rb_respond_to(self, rb_intern(rb_redcarpet_method_names[i])))
+				dest[i] = source[i];
+		}
 	}
 }
 
 static VALUE rb_redcarpet_rbase_init(VALUE self)
 {
-	struct mkd_renderer *rndr;
-	struct redcarpet_pload *payload;
-
-	Data_Get_Struct(self, struct mkd_renderer, rndr);
-	rb_redcarpet__overload(self);
-
-	payload = ALLOC(struct redcarpet_pload);
-	payload->self = self;
-
-	rndr->opaque = payload;
+	rb_redcarpet__overload(self, rb_cRenderBase);
 	return Qnil;
 }
 
 static VALUE rb_redcarpet_html_init(int argc, VALUE *argv, VALUE self)
 {
-	struct mkd_renderer *rndr;
+	struct rb_redcarpet_rndr *rndr;
 	unsigned int render_flags = 0;
 	VALUE hash;
 
-	Data_Get_Struct(self, struct mkd_renderer, rndr);
+	Data_Get_Struct(self, struct rb_redcarpet_rndr, rndr);
 
 	if (rb_scan_args(argc, argv, "01", &hash) == 1)
 	{
@@ -406,23 +382,19 @@ static VALUE rb_redcarpet_html_init(int argc, VALUE *argv, VALUE self)
 			render_flags |= HTML_USE_XHTML;	
 	}
 
-	sdhtml_renderer(rndr, render_flags, (void *)self);
-
-	if (rb_obj_class(self) != rb_cRenderHTML)
-		rb_redcarpet__overload(self);
+	sdhtml_renderer(&rndr->callbacks, (struct html_renderopt *)&rndr->options.html, render_flags);
+	rb_redcarpet__overload(self, rb_cRenderHTML);
 
 	return Qnil;
 }
 
 static VALUE rb_redcarpet_htmltoc_init(VALUE self)
 {
-	struct mkd_renderer *rndr;
-	Data_Get_Struct(self, struct mkd_renderer, rndr);
+	struct rb_redcarpet_rndr *rndr;
+	Data_Get_Struct(self, struct rb_redcarpet_rndr, rndr);
 
-	sdhtml_toc_renderer(rndr, (void *)self);
-
-	if (rb_obj_class(self) != rb_cRenderHTML_TOC)
-		rb_redcarpet__overload(self);
+	sdhtml_toc_renderer(&rndr->callbacks, (struct html_renderopt *)&rndr->options.html);
+	rb_redcarpet__overload(self, rb_cRenderHTML_TOC);
 
 	return Qnil;
 }
@@ -449,7 +421,6 @@ static VALUE rb_redcarpet_smartypants_render(VALUE self, VALUE text)
 	return result;
 }
 
-
 void Init_redcarpet_rndr()
 {
 	rb_mRender = rb_define_module_under(rb_mRedcarpet, "Render");
@@ -465,5 +436,5 @@ void Init_redcarpet_rndr()
 	rb_define_method(rb_cRenderHTML_TOC, "initialize", rb_redcarpet_htmltoc_init, 0);
 
 	rb_mSmartyPants = rb_define_module_under(rb_mRender, "SmartyPants");
-	rb_define_singleton_method(rb_mSmartyPants, "postprocess", rb_redcarpet_smartypants_render, 1);
+	rb_define_method(rb_mSmartyPants, "postprocess", rb_redcarpet_smartypants_render, 1);
 }

data/ext/redcarpet/redcarpet.h

@@ -0,0 +1,32 @@
+#ifndef __REDCARPET_H__ 
+#define __REDCARPET_H__
+
+#define RSTRING_NOT_MODIFIED
+#include "ruby.h"
+#include <stdio.h>
+
+#ifdef HAVE_RUBY_ENCODING_H
+#include <ruby/encoding.h>
+#else
+#define rb_enc_copy(dst, src)
+#endif
+
+#include "markdown.h"
+#include "html.h"
+
+#define CSTR2SYM(s) (ID2SYM(rb_intern((s))))
+
+extern void Init_redcarpet_rndr();
+
+struct redcarpet_renderopt {
+	struct html_renderopt html;
+	VALUE self;
+	VALUE base_class;
+};
+
+struct rb_redcarpet_rndr {
+	struct sd_callbacks callbacks;
+	struct redcarpet_renderopt options;
+};
+
+#endif

data/lib/redcarpet.rb

@@ -1,7 +1,7 @@
 require 'redcarpet.so'
 
 module Redcarpet
-  VERSION = '2.0.0b'
+  VERSION = '2.0.0b3'
 
   class Markdown
     # Available Markdown extensions

data/lib/redcarpet/render_man.rb

@@ -0,0 +1,65 @@
+module Redcarpet
+  module Render
+    class ManPage < Base
+
+      def normal_text(text)
+        text.gsub('-', '\\-').strip
+      end
+
+      def block_code(code, language)
+        "\n.nf\n#{normal_text(code)}\n.fi\n"
+      end
+
+      def codespan(code)
+        block_code(code, nil)
+      end
+
+      def header(title, level)
+        case level
+        when 1
+          "\n.TH #{title}\n"
+
+        when 2
+          "\n.SH #{title}\n"
+
+        when 3
+          "\n.SS #{title}\n"
+        end
+      end
+
+      def double_emphasis(text)
+        "\\fB#{text}\\fP"
+      end
+
+      def emphasis(text)
+        "\\fI#{text}\\fP"
+      end
+
+      def linebreak
+        "\n.LP\n"
+      end
+
+      def paragraph(text)
+        "\n.TP\n#{text}\n"
+      end
+
+      def list(content, list_type)
+        case list_type
+        when :ordered
+          "\n\n.nr step 0 1\n#{content}\n"
+        when :unordered
+          "\n.\n#{content}\n"
+        end
+      end
+
+      def list_item(content, list_type)
+        case list_type
+        when :ordered
+          ".IP \\n+[step]\n#{content.strip}\n"
+        when :unordered
+          ".IP \\[bu] 2 \n#{content.strip}\n"
+        end
+      end
+    end
+  end
+end

data/redcarpet.gemspec

@@ -1,9 +1,9 @@
 Gem::Specification.new do |s|
   s.name = 'redcarpet'
-  s.version = '2.0.0b'
+  s.version = '2.0.0b3'
   s.summary = "Markdown that smells nice"
   s.description = 'A fast, safe and extensible Markdown to (X)HTML parser'
-  s.date = '2011-08-03'
+  s.date = '2011-08-09'
   s.email = 'vicent@github.com'
   s.homepage = 'http://github.com/tanoku/redcarpet'
   s.authors = ["Natacha Porté", "Vicent Martí"]
@@ -27,7 +27,9 @@ Gem::Specification.new do |s|
     ext/redcarpet/markdown.h
     ext/redcarpet/rc_markdown.c
     ext/redcarpet/rc_render.c
+    ext/redcarpet/redcarpet.h
     lib/redcarpet.rb
+    lib/redcarpet/render_man.rb
     redcarpet.gemspec
     sundown
     test/redcarpet_test.rb
@@ -38,4 +40,5 @@ Gem::Specification.new do |s|
   s.extensions = ["ext/redcarpet/extconf.rb"]
   s.executables = ["redcarpet"]
   s.require_paths = ["lib"]
+  s.add_development_dependency "rake-compiler"
 end

data/test/redcarpet_test.rb

@@ -1,8 +1,10 @@
+# coding: UTF-8
 rootdir = File.dirname(File.dirname(__FILE__))
 $LOAD_PATH.unshift "#{rootdir}/lib"
 
 require 'test/unit'
 require 'redcarpet'
+require 'redcarpet/render_man'
 require 'nokogiri'
 
 def html_equal(html_a, html_b)
@@ -46,6 +48,12 @@ class SmartyPantsTest < Test::Unit::TestCase
   end
 end
 
+class SmartyHTMLTests < SmartyPantsTest
+  def setup
+    @pants = Redcarpet::Markdown.new Redcarpet::Render::SmartyHTML
+  end
+end
+
 class HTMLRenderTest < Test::Unit::TestCase
   def setup
     @markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML)

metadata

@@ -1,35 +1,37 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: redcarpet
-version: !ruby/object:Gem::Version 
-  hash: 11
+version: !ruby/object:Gem::Version
+  version: 2.0.0b3
   prerelease: 5
-  segments: 
-  - 2
-  - 0
-  - 0
-  - b
-  version: 2.0.0b
 platform: ruby
-authors: 
-- "Natacha Port\xC3\xA9"
-- "Vicent Mart\xC3\xAD"
+authors:
+- Natacha Porté
+- Vicent Martí
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-03 00:00:00 +02:00
-default_executable: 
-dependencies: []
-
+date: 2011-08-09 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: &70234078705880 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70234078705880
 description: A fast, safe and extensible Markdown to (X)HTML parser
 email: vicent@github.com
-executables: 
+executables:
 - redcarpet
-extensions: 
+extensions:
 - ext/redcarpet/extconf.rb
-extra_rdoc_files: 
+extra_rdoc_files:
 - COPYING
-files: 
+files:
 - COPYING
 - README.markdown
 - Rakefile
@@ -48,44 +50,34 @@ files:
 - ext/redcarpet/markdown.h
 - ext/redcarpet/rc_markdown.c
 - ext/redcarpet/rc_render.c
+- ext/redcarpet/redcarpet.h
 - lib/redcarpet.rb
+- lib/redcarpet/render_man.rb
 - redcarpet.gemspec
 - test/redcarpet_test.rb
-has_rdoc: true
 homepage: http://github.com/tanoku/redcarpet
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Markdown that smells nice
-test_files: 
+test_files:
 - test/redcarpet_test.rb