redcarpet 2.0.0b3 → 2.0.0b4

data/ext/redcarpet/markdown.h

@@ -38,6 +38,14 @@ enum mkd_autolink {
 	MKDA_EMAIL,			/* e-mail link without explit mailto: */
 };
 
+enum mkd_tableflags {
+	MKD_TABLE_ALIGN_L = 1,
+	MKD_TABLE_ALIGN_R = 2,
+	MKD_TABLE_ALIGN_CENTER = 3,
+	MKD_TABLE_ALIGNMASK = 3,
+	MKD_TABLE_HEADER = 4
+};
+
 enum mkd_extensions {
 	MKDEXT_NO_INTRA_EMPHASIS = (1 << 0),
 	MKDEXT_TABLES = (1 << 1),
@@ -52,41 +60,43 @@ enum mkd_extensions {
 /* 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);
-	void (*blockhtml)(struct buf *ob, struct buf *text, void *opaque);
-	void (*header)(struct buf *ob, struct buf *text, int level, void *opaque);
+	void (*blockcode)(struct buf *ob, const struct buf *text, const struct buf *lang, void *opaque);
+	void (*blockquote)(struct buf *ob, const struct buf *text, void *opaque);
+	void (*blockhtml)(struct buf *ob,const  struct buf *text, void *opaque);
+	void (*header)(struct buf *ob, const 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);
+	void (*list)(struct buf *ob, const struct buf *text, int flags, void *opaque);
+	void (*listitem)(struct buf *ob, const struct buf *text, int flags, void *opaque);
+	void (*paragraph)(struct buf *ob, const struct buf *text, void *opaque);
+	void (*table)(struct buf *ob, const struct buf *header, const struct buf *body, void *opaque);
+	void (*table_row)(struct buf *ob, const struct buf *text, void *opaque);
+	void (*table_cell)(struct buf *ob, const 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, void *opaque);
-	int (*codespan)(struct buf *ob, struct buf *text, void *opaque);
-	int (*double_emphasis)(struct buf *ob, struct buf *text, void *opaque);
-	int (*emphasis)(struct buf *ob, struct buf *text, void *opaque);
-	int (*image)(struct buf *ob, struct buf *link, struct buf *title, struct buf *alt, void *opaque);
+	int (*autolink)(struct buf *ob, const struct buf *link, enum mkd_autolink type, void *opaque);
+	int (*codespan)(struct buf *ob, const struct buf *text, void *opaque);
+	int (*double_emphasis)(struct buf *ob, const struct buf *text, void *opaque);
+	int (*emphasis)(struct buf *ob, const struct buf *text, void *opaque);
+	int (*image)(struct buf *ob, const struct buf *link, const struct buf *title, const 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, void *opaque);
-	int (*strikethrough)(struct buf *ob, struct buf *text, void *opaque);
-	int (*superscript)(struct buf *ob, struct buf *text, void *opaque);
+	int (*link)(struct buf *ob, const struct buf *link, const struct buf *title, const struct buf *content, void *opaque);
+	int (*raw_html_tag)(struct buf *ob, const struct buf *tag, void *opaque);
+	int (*triple_emphasis)(struct buf *ob, const struct buf *text, void *opaque);
+	int (*strikethrough)(struct buf *ob, const struct buf *text, void *opaque);
+	int (*superscript)(struct buf *ob, const struct buf *text, void *opaque);
 
 	/* low level callbacks - NULL copies input directly into the output */
-	void (*entity)(struct buf *ob, struct buf *entity, void *opaque);
-	void (*normal_text)(struct buf *ob, struct buf *text, void *opaque);
+	void (*entity)(struct buf *ob, const struct buf *entity, void *opaque);
+	void (*normal_text)(struct buf *ob, const struct buf *text, void *opaque);
 
 	/* header and footer */
 	void (*doc_header)(struct buf *ob, void *opaque);
 	void (*doc_footer)(struct buf *ob, void *opaque);
 };
 
+struct sd_markdown;
+
 /*********
  * FLAGS *
  *********/
@@ -95,19 +105,23 @@ struct sd_callbacks {
 #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 *
  **********************/
 
-/* sd_markdown * parses the input buffer and renders it into the output buffer */
+extern struct sd_markdown *
+sd_markdown_new(
+	unsigned int extensions,
+	size_t max_nesting,
+	const struct sd_callbacks *callbacks,
+	void *opaque);
+
+extern void
+sd_markdown_render(struct buf *ob, const uint8_t *document, size_t doc_size, struct sd_markdown *md);
+
 extern void
-sd_markdown(struct buf *ob, const struct buf *ib, unsigned int extensions, const struct sd_callbacks *rndr, void *opaque);
+sd_markdown_free(struct sd_markdown *md);
 
-/* sd_version * returns the library version as major.minor.rev */
 extern void
 sd_version(int *major, int *minor, int *revision);
 

data/ext/redcarpet/rc_markdown.c

@@ -20,82 +20,108 @@ VALUE rb_cMarkdown;
 
 extern VALUE rb_cRenderBase;
 
-static void rb_redcarpet_md_flags(VALUE ruby_obj, unsigned int *enabled_extensions_p)
+static void rb_redcarpet_md_flags(VALUE hash, unsigned int *enabled_extensions_p)
 {
 	unsigned int extensions = 0;
 
 	/**
-	 * Markdown extensions -- all disabled by default 
+	 * Markdown extensions -- all disabled by default
 	 */
-	if (rb_funcall(ruby_obj, rb_intern("no_intra_emphasis"), 0) == Qtrue)
+	if (rb_hash_lookup(hash, CSTR2SYM("no_intra_emphasis")) == Qtrue)
 		extensions |= MKDEXT_NO_INTRA_EMPHASIS;
 
-	if (rb_funcall(ruby_obj, rb_intern("tables"), 0) == Qtrue)
+	if (rb_hash_lookup(hash, CSTR2SYM("tables")) == Qtrue)
 		extensions |= MKDEXT_TABLES;
 
-	if (rb_funcall(ruby_obj, rb_intern("fenced_code_blocks"), 0) == Qtrue)
+	if (rb_hash_lookup(hash, CSTR2SYM("fenced_code_blocks")) == Qtrue)
 		extensions |= MKDEXT_FENCED_CODE;
 
-	if (rb_funcall(ruby_obj, rb_intern("autolink"), 0) == Qtrue)
+	if (rb_hash_lookup(hash, CSTR2SYM("autolink")) == Qtrue)
 		extensions |= MKDEXT_AUTOLINK;
 
-	if (rb_funcall(ruby_obj, rb_intern("strikethrough"), 0) == Qtrue)
+	if (rb_hash_lookup(hash, CSTR2SYM("strikethrough")) == Qtrue)
 		extensions |= MKDEXT_STRIKETHROUGH;
 
-	if (rb_funcall(ruby_obj, rb_intern("lax_html_blocks"), 0) == Qtrue)
+	if (rb_hash_lookup(hash, CSTR2SYM("lax_html_blocks")) == Qtrue)
 		extensions |= MKDEXT_LAX_HTML_BLOCKS;
 
-	if (rb_funcall(ruby_obj, rb_intern("space_after_headers"), 0) == Qtrue)
+	if (rb_hash_lookup(hash, CSTR2SYM("space_after_headers")) == Qtrue)
 		extensions |= MKDEXT_SPACE_HEADERS;
 
-	if (rb_funcall(ruby_obj, rb_intern("superscript"), 0) == Qtrue)
+	if (rb_hash_lookup(hash, CSTR2SYM("superscript")) == Qtrue)
 		extensions |= MKDEXT_SUPERSCRIPT;
 
 	*enabled_extensions_p = extensions;
 }
 
-static VALUE rb_redcarpet_md_render_with(VALUE self, VALUE rb_rndr, VALUE text)
+static void
+rb_redcarpet_md__free(void *markdown)
 {
-	VALUE result;
+	sd_markdown_free((struct sd_markdown *)markdown);
+}
+
+static VALUE rb_redcarpet_md__new(int argc, VALUE *argv, VALUE klass)
+{
+	VALUE rb_markdown, rb_rndr, hash;
+	unsigned int extensions = 0;
 
 	struct rb_redcarpet_rndr *rndr;
-	struct buf input_buf, *output_buf;
-	unsigned int enabled_extensions = 0;
+	struct sd_markdown *markdown;
 
-	Check_Type(text, T_STRING);
+	if (rb_scan_args(argc, argv, "11", &rb_rndr, &hash) == 2)
+		rb_redcarpet_md_flags(hash, &extensions);
+
+	if (rb_obj_is_kind_of(rb_rndr, rb_cClass))
+		rb_rndr = rb_funcall(rb_rndr, rb_intern("new"), 0);
 
 	if (!rb_obj_is_kind_of(rb_rndr, rb_cRenderBase))
-		rb_raise(rb_eTypeError, "Invalid Renderer instance");
+		rb_raise(rb_eTypeError, "Invalid Renderer instance given");
+
+	Data_Get_Struct(rb_rndr, struct rb_redcarpet_rndr, rndr);
+
+	markdown = sd_markdown_new(extensions, 16, &rndr->callbacks, &rndr->options);
+	if (!markdown)
+		rb_raise(rb_eRuntimeError, "Failed to create new Renderer class");
+
+	rb_markdown = Data_Wrap_Struct(klass, NULL, rb_redcarpet_md__free, markdown);
+	rb_iv_set(rb_markdown, "@renderer", rb_rndr);
+
+	return rb_markdown;
+}
+
+static VALUE rb_redcarpet_md_render(VALUE self, VALUE text)
+{
+	VALUE rb_rndr;
+	struct buf *output_buf;
+	struct sd_markdown *markdown;
+
+	Check_Type(text, T_STRING);
+
+	rb_rndr = rb_iv_get(self, "@renderer");
+	Data_Get_Struct(self, struct sd_markdown, markdown);
 
 	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);
 
 	/* render the magic */
-	rb_redcarpet_md_flags(self, &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);
+	sd_markdown_render(
+		output_buf,
+		RSTRING_PTR(text),
+		RSTRING_LEN(text),
+		markdown);
+
+	/* build the Ruby string */
+	text = redcarpet_str_new(output_buf->data, output_buf->size);
 
 	bufrelease(output_buf);
 
 	if (rb_respond_to(rb_rndr, rb_intern("postprocess")))
-		result = rb_funcall(rb_rndr, rb_intern("postprocess"), 1, result);
-
-	return result;
-}
+		text = rb_funcall(rb_rndr, rb_intern("postprocess"), 1, text);
 
-static VALUE rb_redcarpet_md_render(VALUE self, VALUE text)
-{
-	return rb_redcarpet_md_render_with(self, rb_iv_get(self, "@renderer"), text);
+	return text;
 }
 
 void Init_redcarpet()
@@ -103,8 +129,8 @@ void Init_redcarpet()
     rb_mRedcarpet = rb_define_module("Redcarpet");
 
 	rb_cMarkdown = rb_define_class_under(rb_mRedcarpet, "Markdown", rb_cObject);
+    rb_define_singleton_method(rb_cMarkdown, "new", rb_redcarpet_md__new, -1);
     rb_define_method(rb_cMarkdown, "render", rb_redcarpet_md_render, 1);
-    rb_define_method(rb_cMarkdown, "render_with", rb_redcarpet_md_render_with, 2);
 
 	Init_redcarpet_rndr();
 }

data/ext/redcarpet/rc_render.c

@@ -41,33 +41,33 @@ VALUE rb_cRenderHTML_TOC;
 VALUE rb_mSmartyPants;
 
 static inline VALUE
-buf2str(struct buf *text)
+buf2str(const struct buf *text)
 {
 	if (!text || !text->size) return Qnil;
-	return rb_str_new(text->data, text->size);
+	return redcarpet_str_new(text->data, text->size);
 }
 
 
 static void
-rndr_blockcode(struct buf *ob, struct buf *text, struct buf *lang, void *opaque)
+rndr_blockcode(struct buf *ob, const struct buf *text, const struct buf *lang, void *opaque)
 {
 	BLOCK_CALLBACK("block_code", 2, buf2str(text), buf2str(lang));
 }
 
 static void
-rndr_blockquote(struct buf *ob, struct buf *text, void *opaque)
+rndr_blockquote(struct buf *ob, const struct buf *text, void *opaque)
 {
 	BLOCK_CALLBACK("block_quote", 1, buf2str(text));
 }
 
 static void
-rndr_raw_block(struct buf *ob, struct buf *text, void *opaque)
+rndr_raw_block(struct buf *ob, const struct buf *text, void *opaque)
 {
 	BLOCK_CALLBACK("block_html", 1, buf2str(text));
 }
 
 static void
-rndr_header(struct buf *ob, struct buf *text, int level, void *opaque)
+rndr_header(struct buf *ob, const struct buf *text, int level, void *opaque)
 {
 	BLOCK_CALLBACK("header", 2, buf2str(text), INT2FIX(level));
 }
@@ -79,39 +79,39 @@ rndr_hrule(struct buf *ob, void *opaque)
 }
 
 static void
-rndr_list(struct buf *ob, struct buf *text, int flags, void *opaque)
+rndr_list(struct buf *ob, const struct buf *text, int flags, void *opaque)
 {
 	BLOCK_CALLBACK("list", 2, buf2str(text),
 			(flags & MKD_LIST_ORDERED) ? CSTR2SYM("ordered") : CSTR2SYM("unordered"));
 }
 
 static void
-rndr_listitem(struct buf *ob, struct buf *text, int flags, void *opaque)
+rndr_listitem(struct buf *ob, const struct buf *text, int flags, void *opaque)
 {
 	BLOCK_CALLBACK("list_item", 2, buf2str(text),
 			(flags & MKD_LIST_ORDERED) ? CSTR2SYM("ordered") : CSTR2SYM("unordered"));
 }
 
 static void
-rndr_paragraph(struct buf *ob, struct buf *text, void *opaque)
+rndr_paragraph(struct buf *ob, const struct buf *text, void *opaque)
 {
 	BLOCK_CALLBACK("paragraph", 1, buf2str(text));
 }
 
 static void
-rndr_table(struct buf *ob, struct buf *header, struct buf *body, void *opaque)
+rndr_table(struct buf *ob, const struct buf *header, const struct buf *body, void *opaque)
 {
 	BLOCK_CALLBACK("table", 2, buf2str(header), buf2str(body));
 }
 
 static void
-rndr_tablerow(struct buf *ob, struct buf *text, void *opaque)
+rndr_tablerow(struct buf *ob, const struct buf *text, void *opaque)
 {
 	BLOCK_CALLBACK("table_row", 1, buf2str(text));
 }
 
 static void
-rndr_tablecell(struct buf *ob, struct buf *text, int align, void *opaque)
+rndr_tablecell(struct buf *ob, const struct buf *text, int align, void *opaque)
 {
 	VALUE rb_align;
 
@@ -143,32 +143,32 @@ rndr_tablecell(struct buf *ob, struct buf *text, int align, void *opaque)
  * SPAN LEVEL
  */
 static int
-rndr_autolink(struct buf *ob, struct buf *link, enum mkd_autolink type, void *opaque)
+rndr_autolink(struct buf *ob, const struct buf *link, enum mkd_autolink type, void *opaque)
 {
 	SPAN_CALLBACK("autolink", 2, buf2str(link),
 		type == MKDA_NORMAL ? CSTR2SYM("url") : CSTR2SYM("email"));
 }
 
 static int
-rndr_codespan(struct buf *ob, struct buf *text, void *opaque)
+rndr_codespan(struct buf *ob, const struct buf *text, void *opaque)
 {
 	SPAN_CALLBACK("codespan", 1, buf2str(text));
 }
 
 static int
-rndr_double_emphasis(struct buf *ob, struct buf *text, void *opaque)
+rndr_double_emphasis(struct buf *ob, const struct buf *text, void *opaque)
 {
 	SPAN_CALLBACK("double_emphasis", 1, buf2str(text));
 }
 
 static int
-rndr_emphasis(struct buf *ob, struct buf *text, void *opaque)
+rndr_emphasis(struct buf *ob, const struct buf *text, void *opaque)
 {
 	SPAN_CALLBACK("emphasis", 1, buf2str(text));
 }
 
 static int
-rndr_image(struct buf *ob, struct buf *link, struct buf *title, struct buf *alt, void *opaque)
+rndr_image(struct buf *ob, const struct buf *link, const struct buf *title, const struct buf *alt, void *opaque)
 {
 	SPAN_CALLBACK("image", 3, buf2str(link), buf2str(title), buf2str(alt));
 }
@@ -180,31 +180,31 @@ rndr_linebreak(struct buf *ob, void *opaque)
 }
 
 static int
-rndr_link(struct buf *ob, struct buf *link, struct buf *title, struct buf *content, void *opaque)
+rndr_link(struct buf *ob, const struct buf *link, const struct buf *title, const struct buf *content, void *opaque)
 {
 	SPAN_CALLBACK("link", 3, buf2str(link), buf2str(title), buf2str(content));
 }
 
 static int
-rndr_raw_html(struct buf *ob, struct buf *text, void *opaque)
+rndr_raw_html(struct buf *ob, const struct buf *text, void *opaque)
 {
 	SPAN_CALLBACK("raw_html", 1, buf2str(text));
 }
 
 static int
-rndr_triple_emphasis(struct buf *ob, struct buf *text, void *opaque)
+rndr_triple_emphasis(struct buf *ob, const struct buf *text, void *opaque)
 {
 	SPAN_CALLBACK("triple_emphasis", 1, buf2str(text));
 }
 
 static int
-rndr_strikethrough(struct buf *ob, struct buf *text, void *opaque)
+rndr_strikethrough(struct buf *ob, const struct buf *text, void *opaque)
 {
 	SPAN_CALLBACK("strikethrough", 1, buf2str(text));
 }
 
 static int
-rndr_superscript(struct buf *ob, struct buf *text, void *opaque)
+rndr_superscript(struct buf *ob, const struct buf *text, void *opaque)
 {
 	SPAN_CALLBACK("superscript", 1, buf2str(text));
 }
@@ -213,13 +213,13 @@ rndr_superscript(struct buf *ob, struct buf *text, void *opaque)
  * direct writes
  */
 static void
-rndr_entity(struct buf *ob, struct buf *text, void *opaque)
+rndr_entity(struct buf *ob, const struct buf *text, void *opaque)
 {
 	BLOCK_CALLBACK("entity", 1, buf2str(text));
 }
 
 static void
-rndr_normal_text(struct buf *ob, struct buf *text, void *opaque)
+rndr_normal_text(struct buf *ob, const struct buf *text, void *opaque)
 {
 	BLOCK_CALLBACK("normal_text", 1, buf2str(text));
 }
@@ -357,7 +357,7 @@ static VALUE rb_redcarpet_html_init(int argc, VALUE *argv, VALUE self)
 			render_flags |= HTML_SKIP_HTML;
 
 		/* no_image */
-		if (rb_hash_aref(hash, CSTR2SYM("no_image")) == Qtrue)
+		if (rb_hash_aref(hash, CSTR2SYM("no_images")) == Qtrue)
 			render_flags |= HTML_SKIP_IMAGES;
 
 		/* no_links */
@@ -379,7 +379,7 @@ static VALUE rb_redcarpet_html_init(int argc, VALUE *argv, VALUE self)
 			render_flags |= HTML_HARD_WRAP;
 
 		if (rb_hash_aref(hash, CSTR2SYM("xhtml")) == Qtrue)
-			render_flags |= HTML_USE_XHTML;	
+			render_flags |= HTML_USE_XHTML;
 	}
 
 	sdhtml_renderer(&rndr->callbacks, (struct html_renderopt *)&rndr->options.html, render_flags);
@@ -402,20 +402,14 @@ static VALUE rb_redcarpet_htmltoc_init(VALUE self)
 static VALUE rb_redcarpet_smartypants_render(VALUE self, VALUE text)
 {
 	VALUE result;
-	struct buf input_buf, *output_buf;
+	struct buf *output_buf;
 
 	Check_Type(text, T_STRING);
 
-	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.1f);
 
-	sdhtml_smartypants(output_buf, &input_buf);
-	result = rb_str_new(output_buf->data, output_buf->size);
-	rb_enc_copy(result, text);
+	sdhtml_smartypants(output_buf, RSTRING_PTR(text), RSTRING_LEN(text));
+	result = redcarpet_str_new(output_buf->data, output_buf->size);
 
 	bufrelease(output_buf);
 	return result;