redcarpet 1.3.3 → 1.5.0

data/ext/markdown.h

@@ -36,56 +36,50 @@ enum mkd_autolink {
 	MKDA_IMPLICIT_EMAIL	/* e-mail link without mailto: */
 };
 
-typedef enum {
-	MKD_LAX_EMPHASIS = (1 << 0),
-} mkd_parser_mode;
-
-struct mkd_renderopt {
-	void *opaque;
-	unsigned int flags;
-};
-
-struct mkd_parseropt {
-	unsigned int flags;
-	int recursion_depth;
+enum mkd_extensions {
+	MKDEXT_LAX_EMPHASIS = (1 << 0),
+	MKDEXT_TABLES = (1 << 1),
+	MKDEXT_FENCED_CODE = (1 << 2),
 };
 
 /* mkd_renderer • functions for rendering parsed data */
 struct mkd_renderer {
 	/* block level callbacks - NULL skips the block */
-	void (*blockcode)(struct buf *ob, struct buf *text, struct mkd_renderopt *opaque);
-	void (*blockquote)(struct buf *ob, struct buf *text, struct mkd_renderopt *opaque);
-	void (*blockhtml)(struct buf *ob, struct buf *text, struct mkd_renderopt *opaque);
-	void (*header)(struct buf *ob, struct buf *text, int level, struct mkd_renderopt *opaque);
-	void (*hrule)(struct buf *ob, struct mkd_renderopt *opaque);
-	void (*list)(struct buf *ob, struct buf *text, int flags, struct mkd_renderopt *opaque);
-	void (*listitem)(struct buf *ob, struct buf *text, int flags, struct mkd_renderopt *opaque);
-	void (*paragraph)(struct buf *ob, struct buf *text, struct mkd_renderopt *opaque);
+	void (*blockcode)(struct buf *ob, struct buf *text, void *opaque);
+	void (*blockquote)(struct buf *ob, struct buf *text, void *opaque);
+	void (*blockhtml)(struct buf *ob, struct buf *text, void *opaque);
+	void (*header)(struct buf *ob, struct buf *text, int level, void *opaque);
+	void (*hrule)(struct buf *ob, void *opaque);
+	void (*list)(struct buf *ob, struct buf *text, int flags, void *opaque);
+	void (*listitem)(struct buf *ob, struct buf *text, int flags, void *opaque);
+	void (*paragraph)(struct buf *ob, struct buf *text, void *opaque);
+	void (*table)(struct buf *ob, struct buf *header, struct buf *body, void *opaque);
+	void (*table_row)(struct buf *ob, struct buf *text, void *opaque);
+	void (*table_cell)(struct buf *ob, struct buf *text, int flags, void *opaque);
+
 
 	/* span level callbacks - NULL or return 0 prints the span verbatim */
-	int (*autolink)(struct buf *ob, struct buf *link, enum mkd_autolink type, struct mkd_renderopt *opaque);
-	int (*codespan)(struct buf *ob, struct buf *text, struct mkd_renderopt *opaque);
-	int (*double_emphasis)(struct buf *ob, struct buf *text, char c, struct mkd_renderopt *opaque);
-	int (*emphasis)(struct buf *ob, struct buf *text, char c,struct mkd_renderopt *opaque);
-	int (*image)(struct buf *ob, struct buf *link, struct buf *title, struct buf *alt, struct mkd_renderopt *opaque);
-	int (*linebreak)(struct buf *ob, struct mkd_renderopt *opaque);
-	int (*link)(struct buf *ob, struct buf *link, struct buf *title, struct buf *content, struct mkd_renderopt *opaque);
-	int (*raw_html_tag)(struct buf *ob, struct buf *tag, struct mkd_renderopt *opaque);
-	int (*triple_emphasis)(struct buf *ob, struct buf *text, char c, struct mkd_renderopt *opaque);
+	int (*autolink)(struct buf *ob, struct buf *link, enum mkd_autolink type, void *opaque);
+	int (*codespan)(struct buf *ob, struct buf *text, void *opaque);
+	int (*double_emphasis)(struct buf *ob, struct buf *text, char c, void *opaque);
+	int (*emphasis)(struct buf *ob, struct buf *text, char c,void *opaque);
+	int (*image)(struct buf *ob, struct buf *link, struct buf *title, struct buf *alt, void *opaque);
+	int (*linebreak)(struct buf *ob, void *opaque);
+	int (*link)(struct buf *ob, struct buf *link, struct buf *title, struct buf *content, void *opaque);
+	int (*raw_html_tag)(struct buf *ob, struct buf *tag, void *opaque);
+	int (*triple_emphasis)(struct buf *ob, struct buf *text, char c, void *opaque);
 
 	/* low level callbacks - NULL copies input directly into the output */
-	void (*entity)(struct buf *ob, struct buf *entity, struct mkd_renderopt *opaque);
-	void (*normal_text)(struct buf *ob, struct buf *text, struct mkd_renderopt *opaque);
+	void (*entity)(struct buf *ob, struct buf *entity, void *opaque);
+	void (*normal_text)(struct buf *ob, struct buf *text, void *opaque);
 
 	/* header and footer */
-	void (*doc_header)(struct buf *ob, struct mkd_renderopt *opaque);
-	void (*doc_footer)(struct buf *ob, struct mkd_renderopt *opaque);
+	void (*doc_header)(struct buf *ob, void *opaque);
+	void (*doc_footer)(struct buf *ob, void *opaque);
 
 	/* renderer data */
 	const char *emph_chars; /* chars that trigger emphasis rendering */
-
-	struct mkd_renderopt render_options;
-	struct mkd_parseropt parser_options;
+	void *opaque;
 };
 
 /*********
@@ -96,13 +90,17 @@ struct mkd_renderer {
 #define MKD_LIST_ORDERED	1
 #define MKD_LI_BLOCK		2  /* <li> containing block data */
 
+#define MKD_TABLE_ALIGN_L (1 << 0)
+#define MKD_TABLE_ALIGN_R (1 << 1)
+#define MKD_TABLE_ALIGN_CENTER (MKD_TABLE_ALIGN_L | MKD_TABLE_ALIGN_R)
+
 /**********************
  * EXPORTED FUNCTIONS *
  **********************/
 
 /* markdown • parses the input buffer and renders it into the output buffer */
 void
-markdown(struct buf *ob, struct buf *ib, const struct mkd_renderer *rndr);
+markdown(struct buf *ob, struct buf *ib, const struct mkd_renderer *rndr, unsigned int extensions);
 
 #endif
 

data/ext/redcarpet.c

@@ -4,8 +4,6 @@
 #include "markdown.h"
 #include "xhtml.h"
 
-#define REDCARPET_RECURSION_LIMIT 16
-
 typedef enum
 {
 	REDCARPET_RENDER_XHTML,
@@ -14,41 +12,46 @@ typedef enum
 
 static VALUE rb_cRedcarpet;
 
-static void rb_redcarpet__setup_xhtml(struct mkd_renderer *rnd, VALUE ruby_obj)
+static void rb_redcarpet__get_flags(VALUE ruby_obj,
+		unsigned int *enabled_extensions_p,
+		unsigned int *render_flags_p)
 {
-	unsigned int render_flags = RENDER_EXPAND_TABS;
-	unsigned int parser_flags = 0;
+	unsigned int render_flags = XHTML_EXPAND_TABS;
+	unsigned int extensions = 0;
 
 	/* smart */
 	if (rb_funcall(ruby_obj, rb_intern("smart"), 0) == Qtrue)
-		render_flags |= RENDER_SMARTYPANTS;
+		render_flags |= XHTML_SMARTYPANTS;
 
 	/* filter_html */
 	if (rb_funcall(ruby_obj, rb_intern("filter_html"), 0) == Qtrue)
-		render_flags |= RENDER_SKIP_HTML;
+		render_flags |= XHTML_SKIP_HTML;
 
 	/* no_image */
 	if (rb_funcall(ruby_obj, rb_intern("no_image"), 0) == Qtrue)
-		render_flags |= RENDER_SKIP_IMAGES;
+		render_flags |= XHTML_SKIP_IMAGES;
 
 	/* no_links */
 	if (rb_funcall(ruby_obj, rb_intern("no_links"), 0) == Qtrue)
-		render_flags |= RENDER_SKIP_LINKS;
+		render_flags |= XHTML_SKIP_LINKS;
 
 	/* filter_style */
 	if (rb_funcall(ruby_obj, rb_intern("filter_styles"), 0) == Qtrue)
-		render_flags |= RENDER_SKIP_STYLE;
+		render_flags |= XHTML_SKIP_STYLE;
 
 	/* autolink */
 	if (rb_funcall(ruby_obj, rb_intern("autolink"), 0) == Qtrue)
-		render_flags |= RENDER_AUTOLINK;
+		render_flags |= XHTML_AUTOLINK;
 
 	/* safelink */
 	if (rb_funcall(ruby_obj, rb_intern("safelink"), 0) == Qtrue)
-		render_flags |= RENDER_SAFELINK;
+		render_flags |= XHTML_SAFELINK;
 
 	if (rb_funcall(ruby_obj, rb_intern("generate_toc"), 0) == Qtrue)
-		render_flags |= RENDER_TOC;
+		render_flags |= XHTML_TOC;
+
+	if (rb_funcall(ruby_obj, rb_intern("no_strikethrough"), 0) == Qtrue)
+		render_flags |= XHTML_SKIP_STRIKETHROUGH;
 
 	/* parser - strict
 	 * This is fucking stupid; what the 'strict' flag actually
@@ -56,9 +59,16 @@ static void rb_redcarpet__setup_xhtml(struct mkd_renderer *rnd, VALUE ruby_obj)
 	 * named flag internally, even if outside we have retarded
 	 * naming because of compat. issues .*/
 	if (rb_funcall(ruby_obj, rb_intern("strict"), 0) == Qtrue)
-		parser_flags |= MKD_LAX_EMPHASIS;
+		extensions |= MKDEXT_LAX_EMPHASIS;
+
+	if (rb_funcall(ruby_obj, rb_intern("no_tables"), 0) != Qtrue)
+		extensions |= MKDEXT_TABLES;
 
-	init_xhtml_renderer(rnd, render_flags, parser_flags, REDCARPET_RECURSION_LIMIT);
+	if (rb_funcall(ruby_obj, rb_intern("no_fencedcode"), 0) != Qtrue)
+		extensions |= MKDEXT_FENCED_CODE;
+
+	*enabled_extensions_p = extensions;
+	*render_flags_p = render_flags;
 }
 
 static VALUE rb_redcarpet__render(VALUE self, RendererType render_type)
@@ -68,6 +78,7 @@ static VALUE rb_redcarpet__render(VALUE self, RendererType render_type)
 
 	struct buf input_buf, *output_buf;
 	struct mkd_renderer renderer;
+	unsigned int enabled_extensions, render_flags;
 
 	Check_Type(text, T_STRING);
 
@@ -78,20 +89,22 @@ static VALUE rb_redcarpet__render(VALUE self, RendererType render_type)
 	output_buf = bufnew(128);
 	bufgrow(output_buf, RSTRING_LEN(text) * 1.2f);
 
+	rb_redcarpet__get_flags(self, &enabled_extensions, &render_flags);
+
 	switch (render_type) {
 	case REDCARPET_RENDER_XHTML:
-		rb_redcarpet__setup_xhtml(&renderer, self);
+		init_xhtml_renderer(&renderer, render_flags);
 		break;
 
 	case REDCARPET_RENDER_TOC:
-		init_toc_renderer(&renderer, REDCARPET_RECURSION_LIMIT);
+		init_toc_renderer(&renderer);
 		break;
 
 	default:
 		return Qnil;
 	}
 
-	markdown(output_buf, &input_buf, &renderer);
+	markdown(output_buf, &input_buf, &renderer, enabled_extensions);
 
 	result = rb_str_new(output_buf->data, output_buf->size);
 	bufrelease(output_buf);

data/ext/xhtml.c

@@ -22,9 +22,13 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-struct toc_data {
-	int header_count;
-	int current_level;
+struct xhtml_renderopt {
+	struct {
+		int header_count;
+		int current_level;
+	} toc_data;
+
+	unsigned int flags;
 };
 
 static int
@@ -114,12 +118,14 @@ rndr_autolink2(struct buf *ob, const char *link, size_t link_size, enum mkd_auto
 }
 
 static int
-rndr_autolink(struct buf *ob, struct buf *link, enum mkd_autolink type, struct mkd_renderopt *options)
+rndr_autolink(struct buf *ob, struct buf *link, enum mkd_autolink type, void *opaque)
 {
+	struct xhtml_renderopt *options = opaque;
+
 	if (!link || !link->size)
 		return 0;
 
-	if ((options->flags & RENDER_SAFELINK) != 0 && !is_safe_link(link->data, link->size))
+	if ((options->flags & XHTML_SAFELINK) != 0 && !is_safe_link(link->data, link->size))
 		return 0;
 
 	rndr_autolink2(ob, link->data, link->size, type);
@@ -127,7 +133,7 @@ rndr_autolink(struct buf *ob, struct buf *link, enum mkd_autolink type, struct m
 }
 
 static void
-rndr_blockcode(struct buf *ob, struct buf *text, struct mkd_renderopt *options)
+rndr_blockcode(struct buf *ob, struct buf *text, void *opaque)
 {
 	if (ob->size) bufputc(ob, '\n');
 	BUFPUTSL(ob, "<pre><code>");
@@ -136,7 +142,7 @@ rndr_blockcode(struct buf *ob, struct buf *text, struct mkd_renderopt *options)
 }
 
 static void
-rndr_blockquote(struct buf *ob, struct buf *text, struct mkd_renderopt *options)
+rndr_blockquote(struct buf *ob, struct buf *text, void *opaque)
 {
 	BUFPUTSL(ob, "<blockquote>\n");
 	if (text) bufput(ob, text->data, text->size);
@@ -144,7 +150,7 @@ rndr_blockquote(struct buf *ob, struct buf *text, struct mkd_renderopt *options)
 }
 
 static int
-rndr_codespan(struct buf *ob, struct buf *text, struct mkd_renderopt *options)
+rndr_codespan(struct buf *ob, struct buf *text, void *opaque)
 {
 	BUFPUTSL(ob, "<code>");
 	if (text) lus_attr_escape(ob, text->data, text->size);
@@ -153,19 +159,33 @@ rndr_codespan(struct buf *ob, struct buf *text, struct mkd_renderopt *options)
 }
 
 static int
-rndr_double_emphasis(struct buf *ob, struct buf *text, char c, struct mkd_renderopt *options)
+rndr_double_emphasis(struct buf *ob, struct buf *text, char c, void *opaque)
 {
-	if (!text || !text->size) return 0;
-	BUFPUTSL(ob, "<strong>");
-	bufput(ob, text->data, text->size);
-	BUFPUTSL(ob, "</strong>");
+	struct xhtml_renderopt *options = opaque;
+
+	if (!text || !text->size)
+		return 0;
+
+	if (c == '~') {
+		if (options->flags & XHTML_SKIP_STRIKETHROUGH)
+			return 0;
+		
+		BUFPUTSL(ob, "<span style=\"text-decoration:line-through;\">");
+		bufput(ob, text->data, text->size);
+		BUFPUTSL(ob, "</span>");
+	} else {
+		BUFPUTSL(ob, "<strong>");
+		bufput(ob, text->data, text->size);
+		BUFPUTSL(ob, "</strong>");
+	}
+
 	return 1;
 }
 
 static int
-rndr_emphasis(struct buf *ob, struct buf *text, char c, struct mkd_renderopt *options)
+rndr_emphasis(struct buf *ob, struct buf *text, char c, void *opaque)
 {
-	if (!text || !text->size) return 0;
+	if (!text || !text->size || c == '~') return 0;
 	BUFPUTSL(ob, "<em>");
 	if (text) bufput(ob, text->data, text->size);
 	BUFPUTSL(ob, "</em>");
@@ -173,14 +193,15 @@ rndr_emphasis(struct buf *ob, struct buf *text, char c, struct mkd_renderopt *op
 }
 
 static void
-rndr_header(struct buf *ob, struct buf *text, int level, struct mkd_renderopt *options)
+rndr_header(struct buf *ob, struct buf *text, int level, void *opaque)
 {
+	struct xhtml_renderopt *options = opaque;
+	
 	if (ob->size)
 		bufputc(ob, '\n');
 
-	if (options->flags & RENDER_TOC) {
-		struct toc_data *data = options->opaque;
-		bufprintf(ob, "<a name=\"toc_%d\"></a>", data->header_count++);
+	if (options->flags & XHTML_TOC) {
+		bufprintf(ob, "<a name=\"toc_%d\"></a>", options->toc_data.header_count++);
 	}
 
 	bufprintf(ob, "<h%d>", level);
@@ -189,9 +210,11 @@ rndr_header(struct buf *ob, struct buf *text, int level, struct mkd_renderopt *o
 }
 
 static int
-rndr_link(struct buf *ob, struct buf *link, struct buf *title, struct buf *content, struct mkd_renderopt *options)
+rndr_link(struct buf *ob, struct buf *link, struct buf *title, struct buf *content, void *opaque)
 {
-	if ((options->flags & RENDER_SAFELINK) != 0 && !is_safe_link(link->data, link->size))
+	struct xhtml_renderopt *options = opaque;
+	
+	if ((options->flags & XHTML_SAFELINK) != 0 && !is_safe_link(link->data, link->size))
 		return 0;
 
 	BUFPUTSL(ob, "<a href=\"");
@@ -206,7 +229,7 @@ rndr_link(struct buf *ob, struct buf *link, struct buf *title, struct buf *conte
 }
 
 static void
-rndr_list(struct buf *ob, struct buf *text, int flags, struct mkd_renderopt *options)
+rndr_list(struct buf *ob, struct buf *text, int flags, void *opaque)
 {
 	if (ob->size) bufputc(ob, '\n');
 	bufput(ob, flags & MKD_LIST_ORDERED ? "<ol>\n" : "<ul>\n", 5);
@@ -215,7 +238,7 @@ rndr_list(struct buf *ob, struct buf *text, int flags, struct mkd_renderopt *opt
 }
 
 static void
-rndr_listitem(struct buf *ob, struct buf *text, int flags, struct mkd_renderopt *options)
+rndr_listitem(struct buf *ob, struct buf *text, int flags, void *opaque)
 {
 	BUFPUTSL(ob, "<li>");
 	if (text) {
@@ -226,7 +249,7 @@ rndr_listitem(struct buf *ob, struct buf *text, int flags, struct mkd_renderopt
 }
 
 static void
-rndr_paragraph(struct buf *ob, struct buf *text, struct mkd_renderopt *options)
+rndr_paragraph(struct buf *ob, struct buf *text, void *opaque)
 {
 	size_t i = 0;
 
@@ -245,7 +268,7 @@ rndr_paragraph(struct buf *ob, struct buf *text, struct mkd_renderopt *options)
 }
 
 static void
-rndr_raw_block(struct buf *ob, struct buf *text, struct mkd_renderopt *options)
+rndr_raw_block(struct buf *ob, struct buf *text, void *opaque)
 {
 	size_t org, sz;
 	if (!text) return;
@@ -260,7 +283,7 @@ rndr_raw_block(struct buf *ob, struct buf *text, struct mkd_renderopt *options)
 }
 
 static int
-rndr_triple_emphasis(struct buf *ob, struct buf *text, char c, struct mkd_renderopt *options)
+rndr_triple_emphasis(struct buf *ob, struct buf *text, char c, void *opaque)
 {
 	if (!text || !text->size) return 0;
 	BUFPUTSL(ob, "<strong><em>");
@@ -275,14 +298,14 @@ rndr_triple_emphasis(struct buf *ob, struct buf *text, char c, struct mkd_render
  **********************/
 
 static void
-rndr_hrule(struct buf *ob, struct mkd_renderopt *options)
+rndr_hrule(struct buf *ob, void *opaque)
 {
 	if (ob->size) bufputc(ob, '\n');
 	BUFPUTSL(ob, "<hr />\n");
 }
 
 static int
-rndr_image(struct buf *ob, struct buf *link, struct buf *title, struct buf *alt, struct mkd_renderopt *options)
+rndr_image(struct buf *ob, struct buf *link, struct buf *title, struct buf *alt, void *opaque)
 {
 	if (!link || !link->size) return 0;
 	BUFPUTSL(ob, "<img src=\"");
@@ -298,27 +321,28 @@ rndr_image(struct buf *ob, struct buf *link, struct buf *title, struct buf *alt,
 }
 
 static int
-rndr_linebreak(struct buf *ob, struct mkd_renderopt *options)
+rndr_linebreak(struct buf *ob, void *opaque)
 {
 	BUFPUTSL(ob, "<br />\n");
 	return 1;
 }
 
 static int
-rndr_raw_html(struct buf *ob, struct buf *text, struct mkd_renderopt *options)
+rndr_raw_html(struct buf *ob, struct buf *text, void *opaque)
 {
+	struct xhtml_renderopt *options = opaque;	
 	int escape_html = 0;
 
-	if (options->flags & RENDER_SKIP_HTML)
+	if (options->flags & XHTML_SKIP_HTML)
 		escape_html = 1;
 
-	else if ((options->flags & RENDER_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 & RENDER_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 & RENDER_SKIP_IMAGES) != 0 && is_html_tag(text, "<img>"))
+	else if ((options->flags & XHTML_SKIP_IMAGES) != 0 && is_html_tag(text, "<img>"))
 		escape_html = 1;
 
 
@@ -330,6 +354,55 @@ rndr_raw_html(struct buf *ob, struct buf *text, struct mkd_renderopt *options)
 	return 1;
 }
 
+static void
+rndr_table(struct buf *ob, struct buf *header, struct buf *body, void *opaque)
+{
+	if (ob->size) bufputc(ob, '\n');
+	BUFPUTSL(ob, "<table><thead>\n");
+	if (header)
+		bufput(ob, header->data, header->size);
+	BUFPUTSL(ob, "\n</thead><tbody>\n");
+	if (body)
+		bufput(ob, body->data, body->size);
+	BUFPUTSL(ob, "\n</tbody></table>");
+}
+
+static void
+rndr_tablerow(struct buf *ob, struct buf *text, void *opaque)
+{
+	if (ob->size) bufputc(ob, '\n');
+	BUFPUTSL(ob, "<tr>\n");
+	if (text)
+		bufput(ob, text->data, text->size);
+	BUFPUTSL(ob, "\n</tr>");
+}
+
+static void
+rndr_tablecell(struct buf *ob, struct buf *text, int align, void *opaque)
+{
+	if (ob->size) bufputc(ob, '\n');
+	switch (align) {
+	case MKD_TABLE_ALIGN_L:
+		BUFPUTSL(ob, "<td align=\"left\">");
+		break;
+
+	case MKD_TABLE_ALIGN_R:
+		BUFPUTSL(ob, "<td align=\"right\">");
+		break;
+
+	case MKD_TABLE_ALIGN_CENTER:
+		BUFPUTSL(ob, "<td align=\"center\">");
+		break;
+
+	default:
+		BUFPUTSL(ob, "<td>");
+		break;
+	}
+
+	if (text)
+		bufput(ob, text->data, text->size);
+	BUFPUTSL(ob, "</td>");
+}
 
 static struct {
     char c0;
@@ -418,13 +491,14 @@ smartypants_quotes(struct buf *ob, struct buf *text, size_t i, int is_open)
 }
 
 static void
-rndr_normal_text(struct buf *ob, struct buf *text, struct mkd_renderopt *options)
+rndr_normal_text(struct buf *ob, struct buf *text, void *opaque)
 {
 	size_t i;
 	int open_single = 0, open_double = 0, open_tag = 0;
+	struct xhtml_renderopt *options = opaque;	
 
-	int autolink = (options->flags & RENDER_AUTOLINK);
-	int smartypants = (options->flags & RENDER_SMARTYPANTS);
+	int autolink = (options->flags & XHTML_AUTOLINK);
+	int smartypants = (options->flags & XHTML_SMARTYPANTS);
 
 	if (!text)
 		return;
@@ -563,46 +637,46 @@ rndr_normal_text(struct buf *ob, struct buf *text, struct mkd_renderopt *options
 }
 
 static void
-toc_header(struct buf *ob, struct buf *text, int level, struct mkd_renderopt *options)
+toc_header(struct buf *ob, struct buf *text, int level, void *opaque)
 {
-	struct toc_data *data = (struct toc_data *)options->opaque;
+	struct xhtml_renderopt *options = opaque;
 
-	if (level > data->current_level) {
+	if (level > options->toc_data.current_level) {
 		if (level > 1)
 			BUFPUTSL(ob, "<li>");
 		BUFPUTSL(ob, "<ul>\n");
 	}
 	
-	if (level < data->current_level) {
+	if (level < options->toc_data.current_level) {
 		BUFPUTSL(ob, "</ul>");
-		if (data->current_level > 1)
+		if (options->toc_data.current_level > 1)
 			BUFPUTSL(ob, "</li>\n");
 	}
 
-	data->current_level = level;
+	options->toc_data.current_level = level;
 
-	bufprintf(ob, "<li><a href=\"#toc_%d\">", data->header_count++);
+	bufprintf(ob, "<li><a href=\"#toc_%d\">", options->toc_data.header_count++);
 	if (text)
 		bufput(ob, text->data, text->size);
 	BUFPUTSL(ob, "</a></li>\n");
 }
 
 static void
-toc_finalize(struct buf *ob, struct mkd_renderopt *options)
+toc_finalize(struct buf *ob, void *opaque)
 {
-	struct toc_data *data = (struct toc_data *)options->opaque;
+	struct xhtml_renderopt *options = opaque;
 
-	while (data->current_level > 1) {
+	while (options->toc_data.current_level > 1) {
 		BUFPUTSL(ob, "</ul></li>\n");
-		data->current_level--;
+		options->toc_data.current_level--;
 	}
 
-	if (data->current_level)
+	if (options->toc_data.current_level)
 		BUFPUTSL(ob, "</ul>\n");
 }
 
 void
-init_toc_renderer(struct mkd_renderer *renderer, int recursion_depth)
+init_toc_renderer(struct mkd_renderer *renderer)
 {
 	static const struct mkd_renderer toc_render = {
 		NULL,
@@ -613,6 +687,9 @@ init_toc_renderer(struct mkd_renderer *renderer, int recursion_depth)
 		NULL,
 		NULL,
 		NULL,
+		NULL,
+		NULL,
+		NULL,
 
 		rndr_autolink,
 		rndr_codespan,
@@ -630,23 +707,20 @@ init_toc_renderer(struct mkd_renderer *renderer, int recursion_depth)
 		NULL,
 		toc_finalize,
 
-		NULL,
-
-		{ 0, 0 },
-		{ 0, 0 },
+		"*-~",
+		NULL
 	};
 
-	memcpy(renderer, &toc_render, sizeof(struct mkd_renderer));
+	struct xhtml_renderopt *options;	
+	options = calloc(1, sizeof(struct xhtml_renderopt));
+	options->flags = XHTML_TOC;
 
-	renderer->parser_options.recursion_depth = recursion_depth;
-	renderer->render_options.flags = RENDER_TOC;
-	renderer->render_options.opaque = calloc(1, sizeof(struct toc_data));
+	memcpy(renderer, &toc_render, sizeof(struct mkd_renderer));
+	renderer->opaque = options;
 }
 
 void
-init_xhtml_renderer(struct mkd_renderer *renderer,
-		unsigned int render_flags,
-		unsigned int parser_flags, int recursion_depth)
+init_xhtml_renderer(struct mkd_renderer *renderer, unsigned int render_flags)
 {
 	static const struct mkd_renderer renderer_default = {
 		rndr_blockcode,
@@ -657,6 +731,9 @@ init_xhtml_renderer(struct mkd_renderer *renderer,
 		rndr_list,
 		rndr_listitem,
 		rndr_paragraph,
+		rndr_table,
+		rndr_tablerow,
+		rndr_tablecell,
 
 		rndr_autolink,
 		rndr_codespan,
@@ -674,33 +751,29 @@ init_xhtml_renderer(struct mkd_renderer *renderer,
 		NULL,
 		NULL,
 
-		"*_",
-
-		{ 0, 0 },
-		{ 0, 0 },
+		"*_~",
+		NULL
 	};
 
+	struct xhtml_renderopt *options;	
+	options = calloc(1, sizeof(struct xhtml_renderopt));
+	options->flags = render_flags;
+
 	memcpy(renderer, &renderer_default, sizeof(struct mkd_renderer));
+	renderer->opaque = options;
 
-	if (render_flags & RENDER_SKIP_IMAGES)
+	if (render_flags & XHTML_SKIP_IMAGES)
 		renderer->image = NULL;
 
-	if (render_flags & RENDER_SKIP_LINKS) {
+	if (render_flags & XHTML_SKIP_LINKS) {
 		renderer->link = NULL;
 		renderer->autolink = NULL;
 	}
-
-	renderer->parser_options.recursion_depth = recursion_depth;
-	renderer->parser_options.flags = parser_flags;
-
-	renderer->render_options.flags = render_flags;
-	if (render_flags & RENDER_TOC)
-		renderer->render_options.opaque = calloc(1, sizeof(struct toc_data));
 }
 
 void
 free_renderer(struct mkd_renderer *renderer)
 {
-	free(renderer->render_options.opaque);
+	free(renderer->opaque);
 }