redcarpet 2.2.2 → 2.3.0

data/ext/redcarpet/buffer.h

@@ -1,4 +1,4 @@
-/*
+/* 
  * Copyright (c) 2008, Natacha Porté
  * Copyright (c) 2011, Vicent Martí
  *
@@ -44,15 +44,7 @@ struct buf {
 	size_t unit;	/* reallocation unit size (0 = read-only buffer) */
 };
 
-/* CONST_BUF: global buffer from a string litteral */
-#define BUF_STATIC(string) \
-	{ (uint8_t *)string, sizeof string -1, sizeof string, 0, 0 }
-
-/* VOLATILE_BUF: macro for creating a volatile buffer on the stack */
-#define BUF_VOLATILE(strname) \
-	{ (uint8_t *)strname, strlen(strname), 0, 0, 0 }
-
-/* BUFPUTSL: optimized bufputs of a string litteral */
+/* BUFPUTSL: optimized bufputs of a string literal */
 #define BUFPUTSL(output, literal) \
 	bufput(output, literal, sizeof literal - 1)
 
@@ -94,3 +86,4 @@ void bufprintf(struct buf *, const char *, ...) __attribute__ ((format (printf,
 #endif
 
 #endif
+

data/ext/redcarpet/extconf.rb

@@ -1,4 +1,6 @@
 require 'mkmf'
 
+$CFLAGS << ' -fvisibility=hidden'
+
 dir_config('redcarpet')
 create_makefile('redcarpet')

data/ext/redcarpet/html.c

@@ -118,11 +118,18 @@ rndr_autolink(struct buf *ob, const struct buf *link, enum mkd_autolink type, vo
 static void
 rndr_blockcode(struct buf *ob, const struct buf *text, const struct buf *lang, void *opaque)
 {
+	struct html_renderopt *options = opaque;
+
 	if (ob->size) bufputc(ob, '\n');
 
 	if (lang && lang->size) {
 		size_t i, cls;
-		BUFPUTSL(ob, "<pre><code class=\"");
+		if (options->flags & HTML_PRETTIFY) {
+			BUFPUTSL(ob, "<pre><code class=\"prettyprint");
+			cls++;
+		} else {
+			BUFPUTSL(ob, "<pre><code class=\"");
+		}
 
 		for (i = 0, cls = 0; i < lang->size; ++i, ++cls) {
 			while (i < lang->size && isspace(lang->data[i]))
@@ -142,8 +149,11 @@ rndr_blockcode(struct buf *ob, const struct buf *text, const struct buf *lang, v
 		}
 
 		BUFPUTSL(ob, "\">");
-	} else
+	} else if (options->flags & HTML_PRETTIFY) {
+		BUFPUTSL(ob, "<pre><code class=\"prettyprint\">");
+	} else {
 		BUFPUTSL(ob, "<pre><code>");
+	}
 
 	if (text)
 		escape_html(ob, text->data, text->size);
@@ -163,7 +173,11 @@ rndr_blockquote(struct buf *ob, const struct buf *text, void *opaque)
 static int
 rndr_codespan(struct buf *ob, const struct buf *text, void *opaque)
 {
-	BUFPUTSL(ob, "<code>");
+	struct html_renderopt *options = opaque;
+	if (options->flags & HTML_PRETTIFY)
+		BUFPUTSL(ob, "<code class=\"prettyprint\">");
+	else
+		BUFPUTSL(ob, "<code>");
 	if (text) escape_html(ob, text->data, text->size);
 	BUFPUTSL(ob, "</code>");
 	return 1;
@@ -204,6 +218,19 @@ rndr_emphasis(struct buf *ob, const struct buf *text, void *opaque)
 	return 1;
 }
 
+static int
+rndr_underline(struct buf *ob, const struct buf *text, void *opaque)
+{
+	if (!text || !text->size)
+		return 0;
+
+	BUFPUTSL(ob, "<u>");
+	bufput(ob, text->data, text->size);
+	BUFPUTSL(ob, "</u>");
+
+	return 1;
+}
+
 static int
 rndr_linebreak(struct buf *ob, void *opaque)
 {
@@ -559,6 +586,7 @@ sdhtml_toc_renderer(struct sd_callbacks *callbacks, struct html_renderopt *optio
 		rndr_codespan,
 		rndr_double_emphasis,
 		rndr_emphasis,
+		rndr_underline,
 		NULL,
 		NULL,
 		toc_link,
@@ -600,6 +628,7 @@ sdhtml_renderer(struct sd_callbacks *callbacks, struct html_renderopt *options,
 		rndr_codespan,
 		rndr_double_emphasis,
 		rndr_emphasis,
+		rndr_underline,
 		rndr_image,
 		rndr_linebreak,
 		rndr_link,

data/ext/redcarpet/html.h

@@ -49,6 +49,7 @@ typedef enum {
 	HTML_HARD_WRAP = (1 << 7),
 	HTML_USE_XHTML = (1 << 8),
 	HTML_ESCAPE = (1 << 9),
+	HTML_PRETTIFY = (1 << 10),
 } html_render_mode;
 
 typedef enum {

data/ext/redcarpet/html_smartypants.c

@@ -83,6 +83,26 @@ word_boundary(uint8_t c)
 	return c == 0 || isspace(c) || ispunct(c);
 }
 
+// If 'text' begins with any kind of single quote (e.g. "'" or "'" etc.),
+// returns the length of the sequence of characters that makes up the single-
+// quote.  Otherwise, returns zero.
+static size_t
+squote_len(const uint8_t *text, size_t size)
+{
+	static char* single_quote_list[] = { "'", "'", "'", "'", NULL };
+	char** p;
+
+	for (p = single_quote_list; *p; ++p) {
+		size_t len = strlen(*p);
+		if (size >= len && memcmp(text, *p, len) == 0) {
+			return len;
+		}
+	}
+
+	return 0;
+}
+
+// Converts " or ' at very beginning or end of a word to left or right quote
 static int
 smartypants_quotes(struct buf *ob, uint8_t previous_char, uint8_t next_char, uint8_t quote, int *is_open)
 {
@@ -100,23 +120,33 @@ smartypants_quotes(struct buf *ob, uint8_t previous_char, uint8_t next_char, uin
 	return 1;
 }
 
+// Converts ' to left or right single quote; but the initial ' might be in
+// different forms, e.g. ' or ' or '.
+// 'squote_text' points to the original single quote, and 'squote_size' is its length.
+// 'text' points at the last character of the single-quote, e.g. ' or ;
 static size_t
-smartypants_cb__squote(struct buf *ob, struct smartypants_data *smrt, uint8_t previous_char, const uint8_t *text, size_t size)
+smartypants_squote(struct buf *ob, struct smartypants_data *smrt, uint8_t previous_char, const uint8_t *text, size_t size,
+				   const uint8_t *squote_text, size_t squote_size)
 {
 	if (size >= 2) {
 		uint8_t t1 = tolower(text[1]);
+		int next_squote_len = squote_len(text+1, size-1);
 
-		if (t1 == '\'') {
-			if (smartypants_quotes(ob, previous_char, size >= 3 ? text[2] : 0, 'd', &smrt->in_dquote))
-				return 1;
+		// convert '' to “ or ”
+		if (next_squote_len > 0) {
+			uint8_t next_char = (size > 1+next_squote_len) ? text[1+next_squote_len] : 0;
+			if (smartypants_quotes(ob, previous_char, next_char, 'd', &smrt->in_dquote))
+				return next_squote_len;
 		}
 
+		// Tom's, isn't, I'm, I'd
 		if ((t1 == 's' || t1 == 't' || t1 == 'm' || t1 == 'd') &&
 			(size == 3 || word_boundary(text[2]))) {
 			BUFPUTSL(ob, "’");
 			return 0;
 		}
 
+		// you're, you'll, you've
 		if (size >= 3) {
 			uint8_t t2 = tolower(text[2]);
 
@@ -133,10 +163,18 @@ smartypants_cb__squote(struct buf *ob, struct smartypants_data *smrt, uint8_t pr
 	if (smartypants_quotes(ob, previous_char, size > 0 ? text[1] : 0, 's', &smrt->in_squote))
 		return 0;
 
-	bufputc(ob, text[0]);
+	bufput(ob, squote_text, squote_size);
 	return 0;
 }
 
+// Converts ' to left or right single quote.
+static size_t
+smartypants_cb__squote(struct buf *ob, struct smartypants_data *smrt, uint8_t previous_char, const uint8_t *text, size_t size)
+{
+	return smartypants_squote(ob, smrt, previous_char, text, size, text, 1);
+}
+
+// Converts (c), (r), (tm)
 static size_t
 smartypants_cb__parens(struct buf *ob, struct smartypants_data *smrt, uint8_t previous_char, const uint8_t *text, size_t size)
 {
@@ -164,6 +202,7 @@ smartypants_cb__parens(struct buf *ob, struct smartypants_data *smrt, uint8_t pr
 	return 0;
 }
 
+// Converts "--" to em-dash, etc.
 static size_t
 smartypants_cb__dash(struct buf *ob, struct smartypants_data *smrt, uint8_t previous_char, const uint8_t *text, size_t size)
 {
@@ -181,6 +220,7 @@ smartypants_cb__dash(struct buf *ob, struct smartypants_data *smrt, uint8_t prev
 	return 0;
 }
 
+// Converts " etc.
 static size_t
 smartypants_cb__amp(struct buf *ob, struct smartypants_data *smrt, uint8_t previous_char, const uint8_t *text, size_t size)
 {
@@ -189,6 +229,11 @@ smartypants_cb__amp(struct buf *ob, struct smartypants_data *smrt, uint8_t previ
 			return 5;
 	}
 
+	int len = squote_len(text, size);
+	if (len > 0) {
+		return (len-1) + smartypants_squote(ob, smrt, previous_char, text+(len-1), size-(len-1), text, len);
+	}
+
 	if (size >= 4 && memcmp(text, "�", 4) == 0)
 		return 3;
 
@@ -196,6 +241,7 @@ smartypants_cb__amp(struct buf *ob, struct smartypants_data *smrt, uint8_t previ
 	return 0;
 }
 
+// Converts "..." to ellipsis
 static size_t
 smartypants_cb__period(struct buf *ob, struct smartypants_data *smrt, uint8_t previous_char, const uint8_t *text, size_t size)
 {
@@ -213,6 +259,7 @@ smartypants_cb__period(struct buf *ob, struct smartypants_data *smrt, uint8_t pr
 	return 0;
 }
 
+// Converts `` to opening double quote
 static size_t
 smartypants_cb__backtick(struct buf *ob, struct smartypants_data *smrt, uint8_t previous_char, const uint8_t *text, size_t size)
 {
@@ -221,9 +268,11 @@ smartypants_cb__backtick(struct buf *ob, struct smartypants_data *smrt, uint8_t
 			return 1;
 	}
 
+	bufputc(ob, text[0]);
 	return 0;
 }
 
+// Converts 1/2, 1/4, 3/4
 static size_t
 smartypants_cb__number(struct buf *ob, struct smartypants_data *smrt, uint8_t previous_char, const uint8_t *text, size_t size)
 {
@@ -256,6 +305,7 @@ smartypants_cb__number(struct buf *ob, struct smartypants_data *smrt, uint8_t pr
 	return 0;
 }
 
+// Converts " to left or right double quote
 static size_t
 smartypants_cb__dquote(struct buf *ob, struct smartypants_data *smrt, uint8_t previous_char, const uint8_t *text, size_t size)
 {

data/ext/redcarpet/markdown.c

@@ -64,6 +64,7 @@ typedef size_t
 (*char_trigger)(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t offset, size_t size);
 
 static size_t char_emphasis(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t offset, size_t size);
+static size_t char_underline(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t offset, size_t size);
 static size_t char_linebreak(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t offset, size_t size);
 static size_t char_codespan(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t offset, size_t size);
 static size_t char_escape(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t offset, size_t size);
@@ -135,7 +136,7 @@ rndr_newbuf(struct sd_markdown *rndr, int type)
 		work->size = 0;
 	} else {
 		work = bufnew(buf_size[type]);
-		stack_push(pool, work);
+		redcarpet_stack_push(pool, work);
 	}
 
 	return work;
@@ -487,8 +488,6 @@ parse_emph1(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t size
 	struct buf *work = 0;
 	int r;
 
-	if (!rndr->cb.emphasis) return 0;
-
 	/* skipping one symbol if coming from emph3 */
 	if (size > 1 && data[0] == c && data[1] == c) i = 1;
 
@@ -507,7 +506,12 @@ parse_emph1(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t size
 
 			work = rndr_newbuf(rndr, BUFFER_SPAN);
 			parse_inline(work, rndr, data, i);
-			r = rndr->cb.emphasis(ob, work, rndr->opaque);
+
+			if (rndr->ext_flags & MKDEXT_UNDERLINE && c == '_')
+				r = rndr->cb.underline(ob, work, rndr->opaque);
+			else
+				r = rndr->cb.emphasis(ob, work, rndr->opaque);
+
 			rndr_popbuf(rndr, BUFFER_SPAN);
 			return r ? i + 1 : 0;
 		}
@@ -520,16 +524,10 @@ parse_emph1(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t size
 static size_t
 parse_emph2(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t size, uint8_t c)
 {
-	int (*render_method)(struct buf *ob, const struct buf *text, void *opaque);
 	size_t i = 0, len;
 	struct buf *work = 0;
 	int r;
 
-	render_method = (c == '~') ? rndr->cb.strikethrough : rndr->cb.double_emphasis;
-
-	if (!render_method)
-		return 0;
-
 	while (i < size) {
 		len = find_emph_char(data + i, size - i, c);
 		if (!len) return 0;
@@ -538,7 +536,12 @@ parse_emph2(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t size
 		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->opaque);
+
+			if (c == '~')
+				r = rndr->cb.strikethrough(ob, work, rndr->opaque);
+			else
+				r = rndr->cb.double_emphasis(ob, work, rndr->opaque);
+
 			rndr_popbuf(rndr, BUFFER_SPAN);
 			return r ? i + 2 : 0;
 		}
@@ -2102,7 +2105,7 @@ parse_table_header(
 		while (i < under_end && data[i] == ' ')
 			i++;
 
-		if (i < under_end && data[i] != '|')
+		if (i < under_end && data[i] != '|' && data[i] != '+')
 			break;
 
 		if (dashes < 3)
@@ -2230,7 +2233,7 @@ parse_block(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t size
 		else if (prefix_quote(txt_data, end))
 			beg += parse_blockquote(ob, rndr, txt_data, end);
 
-		else if (prefix_code(txt_data, end))
+		else if (!(rndr->ext_flags & MKDEXT_DISABLE_INDENTED_CODE) && prefix_code(txt_data, end))
 			beg += parse_blockcode(ob, rndr, txt_data, end);
 
 		else if (prefix_uli(txt_data, end))
@@ -2410,8 +2413,8 @@ sd_markdown_new(
 
 	memcpy(&md->cb, callbacks, sizeof(struct sd_callbacks));
 
-	stack_init(&md->work_bufs[BUFFER_BLOCK], 4);
-	stack_init(&md->work_bufs[BUFFER_SPAN], 8);
+	redcarpet_stack_init(&md->work_bufs[BUFFER_BLOCK], 4);
+	redcarpet_stack_init(&md->work_bufs[BUFFER_SPAN], 8);
 
 	memset(md->active_char, 0x0, 256);
 
@@ -2539,8 +2542,8 @@ sd_markdown_free(struct sd_markdown *md)
 	for (i = 0; i < (size_t)md->work_bufs[BUFFER_BLOCK].asize; ++i)
 		bufrelease(md->work_bufs[BUFFER_BLOCK].item[i]);
 
-	stack_free(&md->work_bufs[BUFFER_SPAN]);
-	stack_free(&md->work_bufs[BUFFER_BLOCK]);
+	redcarpet_stack_free(&md->work_bufs[BUFFER_SPAN]);
+	redcarpet_stack_free(&md->work_bufs[BUFFER_BLOCK]);
 
 	free(md);
 }

data/ext/redcarpet/markdown.h

@@ -56,9 +56,11 @@ enum mkd_extensions {
 	MKDEXT_FENCED_CODE = (1 << 2),
 	MKDEXT_AUTOLINK = (1 << 3),
 	MKDEXT_STRIKETHROUGH = (1 << 4),
+	MKDEXT_UNDERLINE = (1 << 5),
 	MKDEXT_SPACE_HEADERS = (1 << 6),
 	MKDEXT_SUPERSCRIPT = (1 << 7),
 	MKDEXT_LAX_SPACING = (1 << 8),
+	MKDEXT_DISABLE_INDENTED_CODE = (1 << 9),
 };
 
 /* sd_callbacks - functions for rendering parsed data */
@@ -82,6 +84,7 @@ struct sd_callbacks {
 	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 (*underline)(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, const struct buf *link, const struct buf *title, const struct buf *content, void *opaque);

data/ext/redcarpet/rc_markdown.c

@@ -38,12 +38,18 @@ static void rb_redcarpet_md_flags(VALUE hash, unsigned int *enabled_extensions_p
 	if (rb_hash_lookup(hash, CSTR2SYM("fenced_code_blocks")) == Qtrue)
 		extensions |= MKDEXT_FENCED_CODE;
 
+	if (rb_hash_lookup(hash, CSTR2SYM("disable_indented_code_blocks")) == Qtrue)
+		extensions |= MKDEXT_DISABLE_INDENTED_CODE;
+
 	if (rb_hash_lookup(hash, CSTR2SYM("autolink")) == Qtrue)
 		extensions |= MKDEXT_AUTOLINK;
 
 	if (rb_hash_lookup(hash, CSTR2SYM("strikethrough")) == Qtrue)
 		extensions |= MKDEXT_STRIKETHROUGH;
 
+	if (rb_hash_lookup(hash, CSTR2SYM("underline")) == Qtrue)
+		extensions |= MKDEXT_UNDERLINE;
+
 	if (rb_hash_lookup(hash, CSTR2SYM("lax_spacing")) == Qtrue)
 		extensions |= MKDEXT_LAX_SPACING;
 
@@ -121,12 +127,12 @@ static VALUE rb_redcarpet_md_render(VALUE self, VALUE text)
 	/* render the magic */
 	sd_markdown_render(
 		output_buf,
-		RSTRING_PTR(text),
+		(const uint8_t*)RSTRING_PTR(text),
 		RSTRING_LEN(text),
 		markdown);
 
 	/* build the Ruby string */
-	text = redcarpet_str_new(output_buf->data, output_buf->size, rb_enc_get(text));
+	text = redcarpet_str_new((const char*)output_buf->data, output_buf->size, rb_enc_get(text));
 
 	bufrelease(output_buf);
 
@@ -136,6 +142,7 @@ static VALUE rb_redcarpet_md_render(VALUE self, VALUE text)
 	return text;
 }
 
+__attribute__((visibility("default")))
 void Init_redcarpet()
 {
     rb_mRedcarpet = rb_define_module("Redcarpet");

data/ext/redcarpet/rc_render.c

@@ -41,9 +41,9 @@ VALUE rb_cRenderHTML_TOC;
 VALUE rb_mSmartyPants;
 
 #ifdef HAVE_RUBY_ENCODING_H
-#define buf2str(t) ((t) ? redcarpet_str_new((t)->data, (t)->size, opt->active_enc) : Qnil)
+#define buf2str(t) ((t) ? redcarpet_str_new((const char*)(t)->data, (t)->size, opt->active_enc) : Qnil)
 #else
-#define buf2str(t) ((t) ? redcarpet_str_new((t)->data, (t)->size, NULL) : Qnil)
+#define buf2str(t) ((t) ? redcarpet_str_new((const char*)(t)->data, (t)->size, NULL) : Qnil)
 #endif
 
 static void
@@ -165,6 +165,12 @@ rndr_emphasis(struct buf *ob, const struct buf *text, void *opaque)
 	SPAN_CALLBACK("emphasis", 1, buf2str(text));
 }
 
+static int
+rndr_underline(struct buf *ob, const struct buf *text, void *opaque)
+{
+	SPAN_CALLBACK("underline", 1, buf2str(text));
+}
+
 static int
 rndr_image(struct buf *ob, const struct buf *link, const struct buf *title, const struct buf *alt, void *opaque)
 {
@@ -272,6 +278,7 @@ static struct sd_callbacks rb_redcarpet_callbacks = {
 	rndr_codespan,
 	rndr_double_emphasis,
 	rndr_emphasis,
+	rndr_underline,
 	rndr_image,
 	rndr_linebreak,
 	rndr_link,
@@ -304,6 +311,7 @@ static const char *rb_redcarpet_method_names[] = {
 	"codespan",
 	"double_emphasis",
 	"emphasis",
+	"underline",
 	"image",
 	"linebreak",
 	"link",
@@ -321,11 +329,17 @@ 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_mark(struct rb_redcarpet_rndr *rndr)
+{
+	if (rndr->options.link_attributes)
+		rb_gc_mark(rndr->options.link_attributes);
+}
+
 static VALUE rb_redcarpet_rbase_alloc(VALUE klass)
 {
 	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);
+	return Data_Wrap_Struct(klass, rb_redcarpet_rbase_mark, NULL, rndr);
 }
 
 static void rb_redcarpet__overload(VALUE self, VALUE base_class)
@@ -386,6 +400,10 @@ static VALUE rb_redcarpet_html_init(int argc, VALUE *argv, VALUE self)
 		if (rb_hash_aref(hash, CSTR2SYM("no_links")) == Qtrue)
 			render_flags |= HTML_SKIP_LINKS;
 
+		/* prettify */
+		if (rb_hash_aref(hash, CSTR2SYM("prettify")) == Qtrue)
+			render_flags |= HTML_PRETTIFY;
+
 		/* filter_style */
 		if (rb_hash_aref(hash, CSTR2SYM("no_styles")) == Qtrue)
 			render_flags |= HTML_SKIP_STYLE;
@@ -437,8 +455,8 @@ static VALUE rb_redcarpet_smartypants_render(VALUE self, VALUE text)
 
 	output_buf = bufnew(128);
 
-	sdhtml_smartypants(output_buf, RSTRING_PTR(text), RSTRING_LEN(text));
-	result = redcarpet_str_new(output_buf->data, output_buf->size, rb_enc_get(text));
+	sdhtml_smartypants(output_buf, (const uint8_t*)RSTRING_PTR(text), RSTRING_LEN(text));
+	result = redcarpet_str_new((const char*)output_buf->data, output_buf->size, rb_enc_get(text));
 
 	bufrelease(output_buf);
 	return result;