redcarpet 1.2.2 → 1.3.0

data/ext/array.c

@@ -211,7 +211,7 @@ int
 parr_insert(struct parray *parr, int nb, int n) {
 	char *src, *dst;
 	size_t len, i;
-	if (!parr || nb == 0 || n < 0
+	if (!parr || nb <= 0 || n < 0
 	|| !parr_grow(parr, parr->size + nb))
 		return 0;
 	if (n < parr->size) {

data/ext/buffer.c

@@ -302,10 +302,11 @@ vbufprintf(struct buf *buf, const char *fmt, va_list ap) {
 	n = vsnprintf(buf->data + buf->size, buf->asize - buf->size, fmt, ap);
 
 	if (n < 0 || (size_t)n >= buf->asize - buf->size) {
-		if (!bufgrow (buf, buf->size + n + 1))
+		size_t new_size = (n > 0) ? n : buf->size;
+		if (!bufgrow (buf, buf->size + new_size + 1))
 			return;
 
-		n = vsnprintf (buf->data + buf->size, buf->asize - buf->size, fmt, ap_save);
+		n = vsnprintf(buf->data + buf->size, buf->asize - buf->size, fmt, ap_save);
 	}
 	va_end(ap_save);
 

data/ext/markdown.c

@@ -47,7 +47,7 @@ struct link_ref {
 /*   offset is the number of valid chars before data */
 struct render;
 typedef size_t
-(*char_trigger)(struct buf *ob, struct render *rndr, char *data, size_t offset, size_t size, int depth);
+(*char_trigger)(struct buf *ob, struct render *rndr, char *data, size_t offset, size_t size);
 
 
 /* render • structure containing one particular render */
@@ -56,7 +56,6 @@ struct render {
 	struct array refs;
 	char_trigger active_char[256];
 	struct parray work;
-	int header_count;
 };
 
 /* html_tag • structure for quick HTML tag search (inspired from discount) */
@@ -233,13 +232,13 @@ tag_length(char *data, size_t size, enum mkd_autolink *autolink)
 
 /* parse_inline • parses inline markdown elements */
 static void
-parse_inline(struct buf *ob, struct render *rndr, char *data, size_t size, int depth)
+parse_inline(struct buf *ob, struct render *rndr, char *data, size_t size)
 {
 	size_t i = 0, end = 0;
 	char_trigger action = 0;
 	struct buf work = { 0, 0, 0, 0, 0 };
 
-	if (depth >= rndr->make.parser_options.recursion_depth)
+	if (rndr->work.size > rndr->make.parser_options.recursion_depth)
 		return;
 
 	while (i < size) {
@@ -259,7 +258,7 @@ parse_inline(struct buf *ob, struct render *rndr, char *data, size_t size, int d
 		i = end;
 
 		/* calling the trigger */
-		end = action(ob, rndr, data + i, i, size - i, depth + 1);
+		end = action(ob, rndr, data + i, i, size - i);
 		if (!end) /* no action from the callback */
 			end = i + 1;
 		else { 
@@ -323,7 +322,7 @@ find_emph_char(char *data, size_t size, char c)
 /* parse_emph1 • parsing single emphase */
 /* closed by a symbol not preceded by whitespace and not followed by symbol */
 static size_t
-parse_emph1(struct buf *ob, struct render *rndr, char *data, size_t size, char c, int depth)
+parse_emph1(struct buf *ob, struct render *rndr, char *data, size_t size, char c)
 {
 	size_t i = 0, len;
 	struct buf *work = 0;
@@ -347,7 +346,7 @@ parse_emph1(struct buf *ob, struct render *rndr, char *data, size_t size, char c
 
 		if (data[i] == c && !isspace(data[i - 1])) {
 
-			if ((rndr->make.parser_options.flags & PARSER_STRICT) == 0) {
+			if ((rndr->make.parser_options.flags & MKD_LAX_EMPHASIS) == 0) {
 				if (!(i + 1 == size || isspace(data[i + 1]) || ispunct(data[i + 1])))
 					continue;
 			}
@@ -360,7 +359,7 @@ parse_emph1(struct buf *ob, struct render *rndr, char *data, size_t size, char c
 				parr_push(&rndr->work, work);
 			}
 
-			parse_inline(work, rndr, data, i, depth + 1);
+			parse_inline(work, rndr, data, i);
 			r = rndr->make.emphasis(ob, work, c, &rndr->make.render_options);
 			rndr->work.size -= 1;
 			return r ? i + 1 : 0;
@@ -372,13 +371,14 @@ parse_emph1(struct buf *ob, struct render *rndr, char *data, size_t size, char c
 
 /* parse_emph2 • parsing single emphase */
 static size_t
-parse_emph2(struct buf *ob, struct render *rndr, char *data, size_t size, char c, int depth)
+parse_emph2(struct buf *ob, struct render *rndr, char *data, size_t size, char c)
 {
 	size_t i = 0, len;
 	struct buf *work = 0;
 	int r;
 
-	if (!rndr->make.double_emphasis) return 0;
+	if (!rndr->make.double_emphasis)
+		return 0;
 	
 	while (i < size) {
 		len = find_emph_char(data + i, size - i, c);
@@ -394,7 +394,7 @@ parse_emph2(struct buf *ob, struct render *rndr, char *data, size_t size, char c
 				parr_push(&rndr->work, work);
 			}
 
-			parse_inline(work, rndr, data, i, depth + 1);
+			parse_inline(work, rndr, data, i);
 			r = rndr->make.double_emphasis(ob, work, c, &rndr->make.render_options);
 			rndr->work.size -= 1;
 			return r ? i + 2 : 0;
@@ -407,7 +407,7 @@ parse_emph2(struct buf *ob, struct render *rndr, char *data, size_t size, char c
 /* parse_emph3 • parsing single emphase */
 /* finds the first closing tag, and delegates to the other emph */
 static size_t
-parse_emph3(struct buf *ob, struct render *rndr, char *data, size_t size, char c, int depth)
+parse_emph3(struct buf *ob, struct render *rndr, char *data, size_t size, char c)
 {
 	size_t i = 0, len;
 	int r;
@@ -432,20 +432,20 @@ parse_emph3(struct buf *ob, struct render *rndr, char *data, size_t size, char c
 				parr_push(&rndr->work, work);
 			}
 
-			parse_inline(work, rndr, data, i, depth + 1);
+			parse_inline(work, rndr, data, i);
 			r = rndr->make.triple_emphasis(ob, work, c, &rndr->make.render_options);
 			rndr->work.size -= 1;
 			return r ? i + 3 : 0;
 
 		} else if (i + 1 < size && data[i + 1] == c) {
 			/* double symbol found, handing over to emph1 */
-			len = parse_emph1(ob, rndr, data - 2, size + 2, c, depth + 1);
+			len = parse_emph1(ob, rndr, data - 2, size + 2, c);
 			if (!len) return 0;
 			else return len - 2;
 
 		} else {
 			/* single symbol found, handing over to emph2 */
-			len = parse_emph2(ob, rndr, data - 1, size + 1, c, depth + 1);
+			len = parse_emph2(ob, rndr, data - 1, size + 1, c);
 			if (!len) return 0;
 			else return len - 1;
 		}
@@ -455,28 +455,28 @@ parse_emph3(struct buf *ob, struct render *rndr, char *data, size_t size, char c
 
 /* char_emphasis • single and double emphasis parsing */
 static size_t
-char_emphasis(struct buf *ob, struct render *rndr, char *data, size_t offset, size_t size, int depth)
+char_emphasis(struct buf *ob, struct render *rndr, char *data, size_t offset, size_t size)
 {
 	char c = data[0];
 	size_t ret;
 
 	if (size > 2 && data[1] != c) {
 		/* whitespace cannot follow an opening emphasis */
-		if (isspace(data[1]) || (ret = parse_emph1(ob, rndr, data + 1, size - 1, c, depth + 1)) == 0)
+		if (isspace(data[1]) || (ret = parse_emph1(ob, rndr, data + 1, size - 1, c)) == 0)
 			return 0;
 
 		return ret + 1;
 	}
 
 	if (size > 3 && data[1] == c && data[2] != c) {
-		if (isspace(data[2]) || (ret = parse_emph2(ob, rndr, data + 2, size - 2, c, depth + 1)) == 0)
+		if (isspace(data[2]) || (ret = parse_emph2(ob, rndr, data + 2, size - 2, c)) == 0)
 			return 0;
 
 		return ret + 2;
 	}
 
 	if (size > 4 && data[1] == c && data[2] == c && data[3] != c) {
-		if (isspace(data[3]) || (ret = parse_emph3(ob, rndr, data + 3, size - 3, c, depth + 1)) == 0)
+		if (isspace(data[3]) || (ret = parse_emph3(ob, rndr, data + 3, size - 3, c)) == 0)
 			return 0;
 
 		return ret + 3;
@@ -488,7 +488,7 @@ char_emphasis(struct buf *ob, struct render *rndr, char *data, size_t offset, si
 
 /* char_linebreak • '\n' preceded by two spaces (assuming linebreak != 0) */
 static size_t
-char_linebreak(struct buf *ob, struct render *rndr, char *data, size_t offset, size_t size, int depth)
+char_linebreak(struct buf *ob, struct render *rndr, char *data, size_t offset, size_t size)
 {
 	if (offset < 2 || data[-1] != ' ' || data[-2] != ' ')
 		return 0;
@@ -503,7 +503,7 @@ char_linebreak(struct buf *ob, struct render *rndr, char *data, size_t offset, s
 
 /* char_codespan • '`' parsing a code span (assuming codespan != 0) */
 static size_t
-char_codespan(struct buf *ob, struct render *rndr, char *data, size_t offset, size_t size, int depth)
+char_codespan(struct buf *ob, struct render *rndr, char *data, size_t offset, size_t size)
 {
 	size_t end, nb = 0, i, f_begin, f_end;
 
@@ -546,7 +546,7 @@ char_codespan(struct buf *ob, struct render *rndr, char *data, size_t offset, si
 
 /* char_escape • '\\' backslash escape */
 static size_t
-char_escape(struct buf *ob, struct render *rndr, char *data, size_t offset, size_t size, int depth)
+char_escape(struct buf *ob, struct render *rndr, char *data, size_t offset, size_t size)
 {
 	struct buf work = { 0, 0, 0, 0, 0 };
 
@@ -565,7 +565,7 @@ char_escape(struct buf *ob, struct render *rndr, char *data, size_t offset, size
 /* char_entity • '&' escaped when it doesn't belong to an entity */
 /* valid entities are assumed to be anything mathing &#?[A-Za-z0-9]+; */
 static size_t
-char_entity(struct buf *ob, struct render *rndr, char *data, size_t offset, size_t size, int depth)
+char_entity(struct buf *ob, struct render *rndr, char *data, size_t offset, size_t size)
 {
 	size_t end = 1;
 	struct buf work;
@@ -593,7 +593,7 @@ char_entity(struct buf *ob, struct render *rndr, char *data, size_t offset, size
 
 /* char_langle_tag • '<' when tags or autolinks are allowed */
 static size_t
-char_langle_tag(struct buf *ob, struct render *rndr, char *data, size_t offset, size_t size, int depth)
+char_langle_tag(struct buf *ob, struct render *rndr, char *data, size_t offset, size_t size)
 {
 	enum mkd_autolink altype = MKDA_NOT_AUTOLINK;
 	size_t end = tag_length(data, size, &altype);
@@ -617,7 +617,7 @@ char_langle_tag(struct buf *ob, struct render *rndr, char *data, size_t offset,
 
 /* char_link • '[': parsing a link or an image */
 static size_t
-char_link(struct buf *ob, struct render *rndr, char *data, size_t offset, size_t size, int depth)
+char_link(struct buf *ob, struct render *rndr, char *data, size_t offset, size_t size)
 {
 	int is_img = (offset && data[-1] == '!'), level;
 	size_t i = 1, txt_e, link_b = 0, link_e = 0, title_b = 0, title_e = 0;
@@ -802,7 +802,7 @@ char_link(struct buf *ob, struct render *rndr, char *data, size_t offset, size_t
 		}
 
 		if (is_img) bufput(content, data + 1, txt_e - 1);
-		else parse_inline(content, rndr, data + 1, txt_e - 1, depth + 1);
+		else parse_inline(content, rndr, data + 1, txt_e - 1);
 	}
 
 	/* calling the relevant rendering function */
@@ -944,12 +944,12 @@ prefix_uli(char *data, size_t size)
 
 /* parse_block • parsing of one block, returning next char to parse */
 static void parse_block(struct buf *ob, struct render *rndr,
-			char *data, size_t size, int depth);
+			char *data, size_t size);
 
 
 /* parse_blockquote • hanldes parsing of a blockquote fragment */
 static size_t
-parse_blockquote(struct buf *ob, struct render *rndr, char *data, size_t size, int depth)
+parse_blockquote(struct buf *ob, struct render *rndr, char *data, size_t size)
 {
 	size_t beg, end = 0, pre, work_size = 0;
 	char *work_data = 0;
@@ -964,8 +964,7 @@ parse_blockquote(struct buf *ob, struct render *rndr, char *data, size_t size, i
 
 	beg = 0;
 	while (beg < size) {
-		for (end = beg + 1; end < size && data[end - 1] != '\n';
-							end += 1);
+		for (end = beg + 1; end < size && data[end - 1] != '\n'; end += 1);
 		pre = prefix_quote(data + beg, end - beg);
 		if (pre) beg += pre; /* skipping prefix */
 		else if (is_empty(data + beg, end - beg)
@@ -983,7 +982,7 @@ parse_blockquote(struct buf *ob, struct render *rndr, char *data, size_t size, i
 			work_size += end - beg; }
 		beg = end; }
 
-	parse_block(out, rndr, work_data, work_size, depth + 1);
+	parse_block(out, rndr, work_data, work_size);
 	if (rndr->make.blockquote)
 		rndr->make.blockquote(ob, out, &rndr->make.render_options);
 	rndr->work.size -= 1;
@@ -995,7 +994,7 @@ parse_htmlblock(struct buf *ob, struct render *rndr, char *data, size_t size, in
 
 /* parse_blockquote • hanldes parsing of a regular paragraph */
 static size_t
-parse_paragraph(struct buf *ob, struct render *rndr, char *data, size_t size, int depth)
+parse_paragraph(struct buf *ob, struct render *rndr, char *data, size_t size)
 {
 	size_t i = 0, end = 0;
 	int level = 0;
@@ -1037,7 +1036,7 @@ parse_paragraph(struct buf *ob, struct render *rndr, char *data, size_t size, in
 		else {
 			tmp = bufnew(WORK_UNIT);
 			parr_push(&rndr->work, tmp); }
-		parse_inline(tmp, rndr, work.data, work.size, depth + 1);
+		parse_inline(tmp, rndr, work.data, work.size);
 		if (rndr->make.paragraph)
 			rndr->make.paragraph(ob, tmp, &rndr->make.render_options);
 		rndr->work.size -= 1; }
@@ -1059,16 +1058,15 @@ parse_paragraph(struct buf *ob, struct render *rndr, char *data, size_t size, in
 				else {
 					tmp = bufnew(WORK_UNIT);
 					parr_push(&rndr->work, tmp); }
-				parse_inline(tmp, rndr, work.data, work.size, depth + 1);
+				parse_inline(tmp, rndr, work.data, work.size);
 				if (rndr->make.paragraph)
-					rndr->make.paragraph(ob, tmp,
-							&rndr->make.render_options);
+					rndr->make.paragraph(ob, tmp, &rndr->make.render_options);
 				rndr->work.size -= 1;
 				work.data += beg;
 				work.size = i - beg; }
 			else work.size = i; }
 		if (rndr->make.header)
-			rndr->make.header(ob, &work, level, rndr->header_count++, &rndr->make.render_options);}
+			rndr->make.header(ob, &work, level, &rndr->make.render_options);}
 	return end;
 }
 
@@ -1115,7 +1113,7 @@ parse_blockcode(struct buf *ob, struct render *rndr, char *data, size_t size)
 /* parse_listitem • parsing of a single list item */
 /*	assuming initial prefix is already removed */
 static size_t
-parse_listitem(struct buf *ob, struct render *rndr, char *data, size_t size, int *flags, int depth)
+parse_listitem(struct buf *ob, struct render *rndr, char *data, size_t size, int *flags)
 {
 	struct buf *work = 0, *inter = 0;
 	size_t beg = 0, end, pre, sublist = 0, orgpre = 0, i;
@@ -1215,19 +1213,19 @@ parse_listitem(struct buf *ob, struct render *rndr, char *data, size_t size, int
 	if (*flags & MKD_LI_BLOCK) {
 		/* intermediate render of block li */
 		if (sublist && sublist < work->size) {
-			parse_block(inter, rndr, work->data, sublist, depth + 1);
-			parse_block(inter, rndr, work->data + sublist, work->size - sublist, depth + 1); 
+			parse_block(inter, rndr, work->data, sublist);
+			parse_block(inter, rndr, work->data + sublist, work->size - sublist); 
 		}
 		else
-			parse_block(inter, rndr, work->data, work->size, depth + 1);
+			parse_block(inter, rndr, work->data, work->size);
 	} else {
 		/* intermediate render of inline li */
 		if (sublist && sublist < work->size) {
-			parse_inline(inter, rndr, work->data, sublist, depth + 1);
-			parse_block(inter, rndr, work->data + sublist, work->size - sublist, depth + 1);
+			parse_inline(inter, rndr, work->data, sublist);
+			parse_block(inter, rndr, work->data + sublist, work->size - sublist);
 		}
 		else
-			parse_inline(inter, rndr, work->data, work->size, depth + 1);
+			parse_inline(inter, rndr, work->data, work->size);
 	}
 
 	/* render of li itself */
@@ -1241,7 +1239,7 @@ parse_listitem(struct buf *ob, struct render *rndr, char *data, size_t size, int
 
 /* parse_list • parsing ordered or unordered list block */
 static size_t
-parse_list(struct buf *ob, struct render *rndr, char *data, size_t size, int flags, int depth)
+parse_list(struct buf *ob, struct render *rndr, char *data, size_t size, int flags)
 {
 	struct buf *work = 0;
 	size_t i = 0, j;
@@ -1254,7 +1252,7 @@ parse_list(struct buf *ob, struct render *rndr, char *data, size_t size, int fla
 		parr_push(&rndr->work, work); }
 
 	while (i < size) {
-		j = parse_listitem(work, rndr, data + i, size - i, &flags, depth + 1);
+		j = parse_listitem(work, rndr, data + i, size - i, &flags);
 		i += j;
 
 		if (!j || (flags & MKD_LI_END))
@@ -1287,7 +1285,7 @@ parse_atxheader(struct buf *ob, struct render *rndr, char *data, size_t size)
 	while (end && (data[end - 1] == ' ' || data[end - 1] == '\t')) end -= 1;
 	work.size = end - i;
 	if (rndr->make.header)
-		rndr->make.header(ob, &work, (int)level, rndr->header_count++, &rndr->make.render_options);
+		rndr->make.header(ob, &work, (int)level, &rndr->make.render_options);
 	return skip;
 }
 
@@ -1439,40 +1437,52 @@ parse_htmlblock(struct buf *ob, struct render *rndr, char *data, size_t size, in
 
 /* parse_block • parsing of one block, returning next char to parse */
 static void
-parse_block(struct buf *ob, struct render *rndr, char *data, size_t size, int depth)
+parse_block(struct buf *ob, struct render *rndr, char *data, size_t size)
 {
 	size_t beg, end, i;
 	char *txt_data;
 	beg = 0;
 
-	if (depth >= rndr->make.parser_options.recursion_depth)
+	if (rndr->work.size > rndr->make.parser_options.recursion_depth)
 		return;
 
 	while (beg < size) {
 		txt_data = data + beg;
 		end = size - beg;
+
 		if (data[beg] == '#')
 			beg += parse_atxheader(ob, rndr, txt_data, end);
-		else if (data[beg] == '<' && rndr->make.blockhtml
-			&& (i = parse_htmlblock(ob, rndr, txt_data, end, 1)) != 0)
+
+		else if (data[beg] == '<' && rndr->make.blockhtml && (i = parse_htmlblock(ob, rndr, txt_data, end, 1)) != 0)
 			beg += i;
+
 		else if ((i = is_empty(txt_data, end)) != 0)
 			beg += i;
+
 		else if (is_hrule(txt_data, end)) {
 			if (rndr->make.hrule)
 				rndr->make.hrule(ob, &rndr->make.render_options);
-			while (beg < size && data[beg] != '\n') beg += 1;
-			beg += 1; }
+
+			while (beg < size && data[beg] != '\n')
+				beg++;
+
+			beg++;
+		}
+
 		else if (prefix_quote(txt_data, end))
-			beg += parse_blockquote(ob, rndr, txt_data, end, depth + 1);
+			beg += parse_blockquote(ob, rndr, txt_data, end);
+
 		else if (prefix_code(txt_data, end))
 			beg += parse_blockcode(ob, rndr, txt_data, end);
+
 		else if (prefix_uli(txt_data, end))
-			beg += parse_list(ob, rndr, txt_data, end, 0, depth + 1);
+			beg += parse_list(ob, rndr, txt_data, end, 0);
+
 		else if (prefix_oli(txt_data, end))
-			beg += parse_list(ob, rndr, txt_data, end, MKD_LIST_ORDERED, depth + 1);
+			beg += parse_list(ob, rndr, txt_data, end, MKD_LIST_ORDERED);
+
 		else
-			beg += parse_paragraph(ob, rndr, txt_data, end, depth + 1);
+			beg += parse_paragraph(ob, rndr, txt_data, end);
 	}
 }
 
@@ -1652,8 +1662,6 @@ markdown(struct buf *ob, struct buf *ib, const struct mkd_renderer *rndrer) {
 	rndr.active_char['\\'] = char_escape;
 	rndr.active_char['&'] = char_entity;
 
-	rndr.header_count = 1;
-
 	/* first pass: looking for references, copying everything else */
 	beg = 0;
 	while (beg < ib->size) /* iterating over lines */
@@ -1690,9 +1698,13 @@ markdown(struct buf *ob, struct buf *ib, const struct mkd_renderer *rndrer) {
 		bufputc(text, '\n');
 
 	/* second pass: actual rendering */
-	parse_block(ob, &rndr, text->data, text->size, 0 /* initial depth */);
-	if (rndr.make.finalize)
-		rndr.make.finalize(ob, &rndr.make.render_options);
+	if (rndr.make.doc_header)
+		rndr.make.doc_header(ob, &rndr.make.render_options);
+
+	parse_block(ob, &rndr, text->data, text->size);
+
+	if (rndr.make.doc_footer)
+		rndr.make.doc_footer(ob, &rndr.make.render_options);
 
 	/* clean-up */
 	bufrelease(text);
@@ -1705,10 +1717,7 @@ markdown(struct buf *ob, struct buf *ib, const struct mkd_renderer *rndrer) {
 
 	arr_free(&rndr.refs);
 
-	/* Do not assert this; a malformed Markdown
-	 * file will result in parts of the work queue not being
-	 * printed. We cannot crash the library in that case. Duh. */
-	//assert(rndr.work.size == 0);
+	assert(rndr.work.size == 0);
 
 	for (i = 0; i < (size_t)rndr.work.asize; i += 1)
 		bufrelease(rndr.work.item[i]);

data/ext/markdown.h

@@ -16,8 +16,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef LITHIUM_MARKDOWN_H
-#define LITHIUM_MARKDOWN_H
+#ifndef UPSKIRT_MARKDOWN_H
+#define UPSKIRT_MARKDOWN_H
 
 #include "buffer.h"
 
@@ -36,12 +36,12 @@ enum mkd_autolink {
 	MKDA_IMPLICIT_EMAIL	/* e-mail link without mailto: */
 };
 
-struct mkd_renderopt {
-	union {
-		int data;
-		void *ptr;
-	} opaque;
+typedef enum {
+	MKD_LAX_EMPHASIS = (1 << 0),
+} mkd_parser_mode;
 
+struct mkd_renderopt {
+	void *opaque;
 	unsigned int flags;
 };
 
@@ -56,7 +56,7 @@ struct mkd_renderer {
 	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, int header_count, 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);
@@ -77,8 +77,9 @@ struct mkd_renderer {
 	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);
 
-	/* finalizer */
-	void (*finalize)(struct buf *ob, struct mkd_renderopt *opaque);
+	/* header and footer */
+	void (*doc_header)(struct buf *ob, struct mkd_renderopt *opaque);
+	void (*doc_footer)(struct buf *ob, struct mkd_renderopt *opaque);
 
 	/* renderer data */
 	const char *emph_chars; /* chars that trigger emphasis rendering */
@@ -87,8 +88,6 @@ struct mkd_renderer {
 	struct mkd_parseropt parser_options;
 };
 
-
-
 /*********
  * FLAGS *
  *********/
@@ -97,22 +96,6 @@ struct mkd_renderer {
 #define MKD_LIST_ORDERED	1
 #define MKD_LI_BLOCK		2  /* <li> containing block data */
 
-typedef enum {
-	RENDER_SKIP_HTML = (1 << 0),
-	RENDER_SKIP_STYLE = (1 << 1),
-	RENDER_SKIP_IMAGES = (1 << 2),
-	RENDER_SKIP_LINKS = (1 << 3),
-	RENDER_SMARTYPANTS = (1 << 4),
-	RENDER_EXPAND_TABS = (1 << 5),
-	RENDER_AUTOLINK = (1 << 6),
-	RENDER_SAFELINK = (1 << 7),
-	RENDER_TOC = (1 << 8),
-} render_mode;
-
-typedef enum {
-	PARSER_STRICT = (1 << 0),
-} parser_mode;
-
 /**********************
  * EXPORTED FUNCTIONS *
  **********************/
@@ -121,14 +104,6 @@ typedef enum {
 void
 markdown(struct buf *ob, struct buf *ib, const struct mkd_renderer *rndr);
 
-void
-init_xhtml_renderer(struct mkd_renderer *renderer,
-		unsigned int render_flags,
-		unsigned int parser_flags, int recursion_depth);
-
-void
-init_toc_renderer(struct mkd_renderer *renderer, int recursion_depth);
-
-#endif /* ndef LITHIUM_MARKDOWN_H */
+#endif
 
 /* vim: set filetype=c: */

data/ext/redcarpet.c

@@ -2,6 +2,7 @@
 #include "ruby.h"
 
 #include "markdown.h"
+#include "xhtml.h"
 
 #define REDCARPET_RECURSION_LIMIT 16
 
@@ -49,9 +50,13 @@ static void rb_redcarpet__setup_xhtml(struct mkd_renderer *rnd, VALUE ruby_obj)
 	if (rb_funcall(ruby_obj, rb_intern("generate_toc"), 0) == Qtrue)
 		render_flags |= RENDER_TOC;
 
-	/* parser - strict */
+	/* parser - strict
+	 * This is fucking stupid; what the 'strict' flag actually
+	 * enforces is laxer emphasis parsing. So we use a properly
+	 * 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 |= PARSER_STRICT;
+		parser_flags |= MKD_LAX_EMPHASIS;
 
 	init_xhtml_renderer(rnd, render_flags, parser_flags, REDCARPET_RECURSION_LIMIT);
 }
@@ -90,6 +95,7 @@ static VALUE rb_redcarpet__render(VALUE self, RendererType render_type)
 
 	result = rb_str_new(output_buf->data, output_buf->size);
 	bufrelease(output_buf);
+	free_renderer(&renderer);
 
 	/* force the input encoding */
 	if (rb_respond_to(text, rb_intern("encoding"))) {

data/ext/{render.c → xhtml.c}

@@ -16,11 +16,16 @@
  */
 
 #include "markdown.h"
+#include "xhtml.h"
 
 #include <strings.h>
 #include <stdlib.h>
 #include <stdio.h>
 
+struct toc_data {
+	int header_count;
+	int current_level;
+};
 
 static int
 is_safe_link(const char *link, size_t link_len)
@@ -48,7 +53,7 @@ is_uri_char(char c)
 	return isalnum(c) || strchr("/:$-_.+!*'(),", c) != NULL;
 }
 
-static int
+static inline int
 put_scaped_char(struct buf *ob, char c)
 {
 	switch (c) {
@@ -174,13 +179,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, int header_count, struct mkd_renderopt *options)
+rndr_header(struct buf *ob, struct buf *text, int level, struct mkd_renderopt *options)
 {
 	if (ob->size)
 		bufputc(ob, '\n');
 
-	if (options->flags & RENDER_TOC)
-		bufprintf(ob, "<a name=\"toc_%d\"></a>", header_count);
+	if (options->flags & RENDER_TOC) {
+		struct toc_data *data = options->opaque;
+		bufprintf(ob, "<a name=\"toc_%d\"></a>", data->header_count++);
+	}
 
 	bufprintf(ob, "<h%d>", level);
 	if (text) bufput(ob, text->data, text->size);
@@ -561,6 +568,87 @@ 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)
+{
+	struct toc_data *data = (struct toc_data *)options->opaque;
+
+	if (level > data->current_level) {
+		if (level > 1)
+			BUFPUTSL(ob, "<li>");
+		BUFPUTSL(ob, "<ul>\n");
+	}
+	
+	if (level < data->current_level) {
+		BUFPUTSL(ob, "</ul>");
+		if (data->current_level > 1)
+			BUFPUTSL(ob, "</li>\n");
+	}
+
+	data->current_level = level;
+
+	bufprintf(ob, "<li><a href=\"#toc_%d\">", 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)
+{
+	struct toc_data *data = (struct toc_data *)options->opaque;
+
+	while (data->current_level > 1) {
+		BUFPUTSL(ob, "</ul></li>\n");
+		data->current_level--;
+	}
+
+	if (data->current_level)
+		BUFPUTSL(ob, "</ul>\n");
+}
+
+void
+init_toc_renderer(struct mkd_renderer *renderer, int recursion_depth)
+{
+	static const struct mkd_renderer toc_render = {
+		NULL,
+		NULL,
+		NULL,
+		toc_header,
+		NULL,
+		NULL,
+		NULL,
+		NULL,
+
+		rndr_autolink,
+		rndr_codespan,
+		rndr_double_emphasis,
+		rndr_emphasis,
+		rndr_image,
+		rndr_linebreak,
+		rndr_link,
+		rndr_raw_html,
+		rndr_triple_emphasis,
+
+		NULL,
+		NULL,
+
+		NULL,
+		toc_finalize,
+
+		NULL,
+
+		{ 0, 0 },
+		{ 0, 0 },
+	};
+
+	memcpy(renderer, &toc_render, sizeof(struct mkd_renderer));
+
+	renderer->parser_options.recursion_depth = recursion_depth;
+	renderer->render_options.flags = RENDER_TOC;
+	renderer->render_options.opaque = calloc(1, sizeof(struct toc_data));
+}
+
 void
 init_xhtml_renderer(struct mkd_renderer *renderer,
 		unsigned int render_flags,
@@ -588,6 +676,8 @@ init_xhtml_renderer(struct mkd_renderer *renderer,
 
 		NULL,
 		rndr_normal_text,
+
+		NULL,
 		NULL,
 
 		"*_",
@@ -608,6 +698,15 @@ init_xhtml_renderer(struct mkd_renderer *renderer,
 
 	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);
 }
 

data/ext/xhtml.h

@@ -0,0 +1,43 @@
+/*
+ * 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.
+ */
+
+#ifndef UPSKIRT_XHTML_H
+#define UPSKIRT_XHTML_H
+typedef enum {
+	RENDER_SKIP_HTML = (1 << 0),
+	RENDER_SKIP_STYLE = (1 << 1),
+	RENDER_SKIP_IMAGES = (1 << 2),
+	RENDER_SKIP_LINKS = (1 << 3),
+	RENDER_SMARTYPANTS = (1 << 4),
+	RENDER_EXPAND_TABS = (1 << 5),
+	RENDER_AUTOLINK = (1 << 6),
+	RENDER_SAFELINK = (1 << 7),
+	RENDER_TOC = (1 << 8),
+} render_mode;
+
+void
+init_xhtml_renderer(struct mkd_renderer *renderer,
+		unsigned int render_flags,
+		unsigned int parser_flags, int recursion_depth);
+
+void
+init_toc_renderer(struct mkd_renderer *renderer, int recursion_depth);
+
+void
+free_renderer(struct mkd_renderer *renderer);
+
+#endif
+

data/lib/redcarpet.rb

@@ -26,7 +26,7 @@
 #   end
 #
 class Redcarpet
-  VERSION = '1.2.2'
+  VERSION = '1.3.0'
 
   # Original Markdown formatted text.
   attr_reader :text

data/redcarpet.gemspec

@@ -1,8 +1,8 @@
 Gem::Specification.new do |s|
   s.name = 'redcarpet'
-  s.version = '1.2.2'
+  s.version = '1.3.0'
   s.summary = "Ruby bindings for libupskirt"
-  s.date = '2011-04-04'
+  s.date = '2011-04-05'
   s.email = 'vicent@github.com'
   s.homepage = 'http://github.com/tanoku/redcarpet'
   s.has_rdoc = true
@@ -21,8 +21,8 @@ Gem::Specification.new do |s|
     ext/markdown.c
     ext/markdown.h
     ext/redcarpet.c
-    ext/render.c
-    ext/toc.c
+    ext/xhtml.c
+    ext/xhtml.h
     lib/markdown.rb
     lib/redcarpet.rb
     redcarpet.gemspec

data/test/redcarpet_test.rb

@@ -113,12 +113,12 @@ class RedcarpetTest < Test::Unit::TestCase
   def test_that_generate_toc_sets_toc_ids
     rd = Redcarpet.new("# Level 1\n\n## Level 2", :generate_toc)
     assert rd.generate_toc
-    assert_equal %(<a name="toc_1"></a><h1>Level 1</h1>\n\n<a name="toc_2"></a><h2>Level 2</h2>\n), rd.to_html
+    assert_equal %(<a name="toc_0"></a><h1>Level 1</h1>\n\n<a name="toc_1"></a><h2>Level 2</h2>\n), rd.to_html
   end
 
   def test_should_get_the_generated_toc
     rd = Redcarpet.new("# Level 1\n\n## Level 2", :generate_toc)
-    exp = %(<ul>\n<li><a href="#toc_1">Level 1</a></li>\n<li><ul>\n<li><a href="#toc_2">Level 2</a></li>\n</ul></li>\n</ul>)
+    exp = %(<ul>\n<li><a href="#toc_0">Level 1</a></li>\n<li><ul>\n<li><a href="#toc_1">Level 2</a></li>\n</ul></li>\n</ul>)
     assert_equal exp, rd.toc_content.strip
   end
 

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 2
-  - 2
-  version: 1.2.2
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - "Natacha Port\xC3\xA9"
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-04 00:00:00 +03:00
+date: 2011-04-05 00:00:00 +03:00
 default_executable: 
 dependencies: []
 
@@ -41,8 +41,8 @@ files:
 - ext/markdown.c
 - ext/markdown.h
 - ext/redcarpet.c
-- ext/render.c
-- ext/toc.c
+- ext/xhtml.c
+- ext/xhtml.h
 - lib/markdown.rb
 - lib/redcarpet.rb
 - redcarpet.gemspec

data/ext/toc.c

@@ -1,101 +0,0 @@
-/*
- * 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 "markdown.h"
-
-#include <strings.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-static void
-toc_header(struct buf *ob, struct buf *text, int level, int header_id, struct mkd_renderopt *options)
-{
-	int current_level = (int)options->opaque.data;
-
-	if (level > current_level) {
-		if (level > 1)
-			BUFPUTSL(ob, "<li>");
-		BUFPUTSL(ob, "<ul>\n");
-	}
-	
-	if (level < current_level) {
-		BUFPUTSL(ob, "</ul>");
-		if (current_level > 1)
-			BUFPUTSL(ob, "</li>\n");
-	}
-
-	options->opaque.data = level;
-
-	bufprintf(ob, "<li><a href=\"#toc_%d\">", header_id);
-	if (text)
-		bufput(ob, text->data, text->size);
-	BUFPUTSL(ob, "</a></li>\n");
-}
-
-static void
-toc_finalize(struct buf *ob, struct mkd_renderopt *options)
-{
-	int current_level = (int)options->opaque.data;
-
-	while (current_level > 1) {
-		BUFPUTSL(ob, "</ul></li>\n");
-		current_level--;
-	}
-
-	if (current_level)
-		BUFPUTSL(ob, "</ul>\n");
-}
-
-void
-init_toc_renderer(struct mkd_renderer *renderer, int recursion_depth)
-{
-	static const struct mkd_renderer toc_render = {
-		NULL,
-		NULL,
-		NULL,
-		toc_header,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-		NULL,
-
-		NULL,
-		NULL,
-		toc_finalize,
-
-		NULL,
-
-		{ 0, 0 },
-		{ 0, 0 },
-	};
-
-	memcpy(renderer, &toc_render, sizeof(struct mkd_renderer));
-
-	renderer->parser_options.recursion_depth = recursion_depth;
-	renderer->render_options.flags = RENDER_TOC;
-	renderer->render_options.opaque.data = 0;
-}
-