redcarpet 1.1.1 → 1.2.0

data/ext/markdown.c

@@ -2,6 +2,7 @@
 
 /*
  * Copyright (c) 2009, Natacha Porté
+ * 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
@@ -35,10 +36,10 @@
 
 /* link_ref • reference to a link */
 struct link_ref {
-	struct buf *	id;
-	struct buf *	link;
-	struct buf *	title; };
-
+	struct buf *id;
+	struct buf *link;
+	struct buf *title;
+};
 
 /* char_trigger • function pointer to render active chars */
 /*   returns the number of chars taken care of */
@@ -46,27 +47,24 @@ 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);
+(*char_trigger)(struct buf *ob, struct render *rndr, char *data, size_t offset, size_t size);
 
 
 /* render • structure containing one particular render */
 struct render {
 	struct mkd_renderer	make;
-	struct array		refs;
-	char_trigger		active_char[256];
-	struct parray		work;
+	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) */
 struct html_tag {
 	const char *text;
 	size_t size;
 };
 
-
-
 /********************
  * GLOBAL VARIABLES *
  ********************/
@@ -94,44 +92,48 @@ static struct html_tag block_tags[] = {
 	{ "script",	6 },
 	{ "fieldset",	8 },
 	{ "noscript",	8 },
-	{ "blockquote",	10 } };
+	{ "blockquote",	10 }
+};
 
 #define INS_TAG (block_tags + 12)
 #define DEL_TAG (block_tags + 10)
 
-
-
 /***************************
  * STATIC HELPER FUNCTIONS *
  ***************************/
 
 /* cmp_link_ref • comparison function for link_ref sorted arrays */
 static int
-cmp_link_ref(void *key, void *array_entry) {
+cmp_link_ref(void *key, void *array_entry)
+{
 	struct link_ref *lr = array_entry;
-	return bufcasecmp(key, lr->id); }
-
+	return bufcasecmp(key, lr->id);
+}
 
 /* cmp_link_ref_sort • comparison function for link_ref qsort */
 static int
-cmp_link_ref_sort(const void *a, const void *b) {
+cmp_link_ref_sort(const void *a, const void *b)
+{
 	const struct link_ref *lra = a;
 	const struct link_ref *lrb = b;
-	return bufcasecmp(lra->id, lrb->id); }
-
+	return bufcasecmp(lra->id, lrb->id);
+}
 
 /* cmp_html_tag • comparison function for bsearch() (stolen from discount) */
 static int
-cmp_html_tag(const void *a, const void *b) {
+cmp_html_tag(const void *a, const void *b)
+{
 	const struct html_tag *hta = a;
 	const struct html_tag *htb = b;
 	if (hta->size != htb->size) return (int)((ssize_t)hta->size - (ssize_t)htb->size);
-	return strncasecmp(hta->text, htb->text, hta->size); }
+	return strncasecmp(hta->text, htb->text, hta->size);
+}
 
 
 /* find_block_tag • returns the current block tag */
 static struct html_tag *
-find_block_tag(char *data, size_t size) {
+find_block_tag(char *data, size_t size)
+{
 	size_t i = 0;
 	struct html_tag key;
 
@@ -147,9 +149,8 @@ find_block_tag(char *data, size_t size) {
 	key.size = i;
 	return bsearch(&key, block_tags,
 				sizeof block_tags / sizeof block_tags[0],
-				sizeof block_tags[0], cmp_html_tag); }
-
-
+				sizeof block_tags[0], cmp_html_tag);
+}
 
 /****************************
  * INLINE PARSING FUNCTIONS *
@@ -158,7 +159,8 @@ find_block_tag(char *data, size_t size) {
 /* is_mail_autolink • looks for the address part of a mail autolink and '>' */
 /* this is less strict than the original markdown e-mail address matching */
 static size_t
-is_mail_autolink(char *data, size_t size) {
+is_mail_autolink(char *data, size_t size)
+{
 	size_t i = 0, nb = 0;
 	/* address is assumed to be: [-@._a-zA-Z0-9]+ with exactly one '@' */
 	while (i < size && (data[i] == '-' || data[i] == '.'
@@ -169,12 +171,13 @@ is_mail_autolink(char *data, size_t size) {
 		if (data[i] == '@') nb += 1;
 		i += 1; }
 	if (i >= size || data[i] != '>' || nb != 1) return 0;
-	return i + 1; }
-
+	return i + 1;
+}
 
 /* tag_length • returns the length of the given tag, or 0 is it's not valid */
 static size_t
-tag_length(char *data, size_t size, enum mkd_autolink *autolink) {
+tag_length(char *data, size_t size, enum mkd_autolink *autolink)
+{
 	size_t i, j;
 
 	/* a valid tag can't be shorter than 3 chars */
@@ -225,12 +228,13 @@ tag_length(char *data, size_t size, enum mkd_autolink *autolink) {
 	/* looking for sometinhg looking like a tag end */
 	while (i < size && data[i] != '>') i += 1;
 	if (i >= size) return 0;
-	return i + 1; }
-
+	return i + 1;
+}
 
 /* parse_inline • parses inline markdown elements */
 static void
-parse_inline(struct buf *ob, struct render *rndr, char *data, size_t size) {
+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 };
@@ -256,12 +260,13 @@ parse_inline(struct buf *ob, struct render *rndr, char *data, size_t size) {
 			end = i + 1;
 		else { 
 			i += end;
-			end = i; } } }
-
+			end = i; } }
+}
 
 /* find_emph_char • looks for the next emph char, skipping other constructs */
 static size_t
-find_emph_char(char *data, size_t size, char c) {
+find_emph_char(char *data, size_t size, char c)
+{
 	size_t i = 1;
 
 	while (i < size) {
@@ -306,14 +311,14 @@ find_emph_char(char *data, size_t size, char c) {
 				i += 1; }
 			if (i >= size) return tmp_i;
 			i += 1; } }
-	return 0; }
-
+	return 0;
+}
 
 /* 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) {
+parse_emph1(struct buf *ob, struct render *rndr, char *data, size_t size, char c)
+{
 	size_t i = 0, len;
 	struct buf *work = 0;
 	int r;
@@ -359,11 +364,10 @@ parse_emph1(struct buf *ob, struct render *rndr,
 	return 0;
 }
 
-
 /* parse_emph2 • parsing single emphase */
 static size_t
-parse_emph2(struct buf *ob, struct render *rndr,
-			char *data, size_t size, char c) {
+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;
@@ -389,14 +393,14 @@ parse_emph2(struct buf *ob, struct render *rndr,
 			rndr->work.size -= 1;
 			return r ? i + 2 : 0; }
 		i += 1; }
-	return 0; }
-
+	return 0;
+}
 
 /* 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) {
+parse_emph3(struct buf *ob, struct render *rndr, char *data, size_t size, char c)
+{
 	size_t i = 0, len;
 	int r;
 
@@ -435,13 +439,13 @@ parse_emph3(struct buf *ob, struct render *rndr,
 			len = parse_emph2(ob, rndr, data - 1, size + 1, c);
 			if (!len) return 0;
 			else return len - 1; } }
-	return 0; }
-
+	return 0; 
+}
 
 /* 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) {
+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) {
@@ -460,13 +464,14 @@ char_emphasis(struct buf *ob, struct render *rndr,
 		|| (ret = parse_emph3(ob, rndr, data + 3, size - 3, c)) == 0)
 			return 0;
 		return ret + 3; }
-	return 0; }
+	return 0; 
+}
 
 
 /* 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) {
-
+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;
 
@@ -516,8 +521,8 @@ 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) {
+char_escape(struct buf *ob, struct render *rndr, char *data, size_t offset, size_t size)
+{
 	struct buf work = { 0, 0, 0, 0, 0 };
 	if (size > 1) {
 		if (rndr->make.normal_text) {
@@ -525,14 +530,14 @@ char_escape(struct buf *ob, struct render *rndr,
 			work.size = 1;
 			rndr->make.normal_text(ob, &work, &rndr->make.render_options); }
 		else bufputc(ob, data[1]); }
-	return 2; }
-
+	return 2;
+}
 
 /* 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) {
+char_entity(struct buf *ob, struct render *rndr, char *data, size_t offset, size_t size)
+{
 	size_t end = 1;
 	struct buf work;
 	if (end < size && data[end] == '#') end += 1;
@@ -552,13 +557,13 @@ char_entity(struct buf *ob, struct render *rndr,
 		work.size = end;
 		rndr->make.entity(ob, &work, &rndr->make.render_options); }
 	else bufput(ob, data, end);
-	return end; }
-
+	return end;
+}
 
 /* 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) {
+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);
 	struct buf work = { data, end, 0, 0, 0 };
@@ -573,13 +578,14 @@ char_langle_tag(struct buf *ob, struct render *rndr,
 			ret = rndr->make.raw_html_tag(ob, &work,
 							&rndr->make.render_options); }
 	if (!ret) return 0;
-	else return end; }
+	else return end;
+}
 
 
 /* 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) {
+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;
 	struct buf *content = 0;
@@ -785,16 +791,18 @@ char_link(struct buf *ob, struct render *rndr,
 
 /* is_empty • returns the line length when it is empty, 0 otherwise */
 static size_t
-is_empty(char *data, size_t size) {
+is_empty(char *data, size_t size)
+{
 	size_t i;
 	for (i = 0; i < size && data[i] != '\n'; i += 1)
 		if (data[i] != ' ' && data[i] != '\t') return 0;
-	return i + 1; }
-
+	return i + 1;
+}
 
 /* is_hrule • returns whether a line is a horizontal rule */
 static int
-is_hrule(char *data, size_t size) {
+is_hrule(char *data, size_t size)
+{
 	size_t i = 0, n = 0;
 	char c;
 
@@ -817,12 +825,13 @@ is_hrule(char *data, size_t size) {
 			return 0;
 		i += 1; }
 
-	return n >= 3; }
-
+	return n >= 3;
+}
 
 /* is_headerline • returns whether the line is a setext-style hdr underline */
 static int
-is_headerline(char *data, size_t size) {
+is_headerline(char *data, size_t size)
+{
 	size_t i = 0;
 
 	/* test of level 1 header */
@@ -837,12 +846,13 @@ is_headerline(char *data, size_t size) {
 		while (i < size && (data[i] == ' ' || data[i] == '\t')) i += 1;
 		return (i >= size || data[i] == '\n') ? 2 : 0; }
 
-	return 0; }
-
+	return 0;
+}
 
 /* prefix_quote • returns blockquote prefix length */
 static size_t
-prefix_quote(char *data, size_t size) {
+prefix_quote(char *data, size_t size)
+{
 	size_t i = 0;
 	if (i < size && data[i] == ' ') i += 1;
 	if (i < size && data[i] == ' ') i += 1;
@@ -851,20 +861,23 @@ prefix_quote(char *data, size_t size) {
 		if (i + 1 < size && (data[i + 1] == ' ' || data[i+1] == '\t'))
 			return i + 2;
 		else return i + 1; }
-	else return 0; }
-
+	else return 0;
+}
 
 /* prefix_code • returns prefix length for block code*/
 static size_t
-prefix_code(char *data, size_t size) {
+prefix_code(char *data, size_t size)
+{
 	if (size > 0 && data[0] == '\t') return 1;
 	if (size > 3 && data[0] == ' ' && data[1] == ' '
 			&& data[2] == ' ' && data[3] == ' ') return 4;
-	return 0; }
+	return 0;
+}
 
 /* prefix_oli • returns ordered list item prefix */
 static size_t
-prefix_oli(char *data, size_t size) {
+prefix_oli(char *data, size_t size)
+{
 	size_t i = 0;
 	if (i < size && data[i] == ' ') i += 1;
 	if (i < size && data[i] == ' ') i += 1;
@@ -873,12 +886,13 @@ prefix_oli(char *data, size_t size) {
 	while (i < size && data[i] >= '0' && data[i] <= '9') i += 1;
 	if (i + 1 >= size || data[i] != '.'
 	|| (data[i + 1] != ' ' && data[i + 1] != '\t')) return 0;
-	return i + 2; }
-
+	return i + 2;
+}
 
 /* prefix_uli • returns ordered list item prefix */
 static size_t
-prefix_uli(char *data, size_t size) {
+prefix_uli(char *data, size_t size)
+{
 	size_t i = 0;
 	if (i < size && data[i] == ' ') i += 1;
 	if (i < size && data[i] == ' ') i += 1;
@@ -887,7 +901,8 @@ prefix_uli(char *data, size_t size) {
 	|| (data[i] != '*' && data[i] != '+' && data[i] != '-')
 	|| (data[i + 1] != ' ' && data[i + 1] != '\t'))
 		return 0;
-	return i + 2; }
+	return i + 2;
+}
 
 
 /* parse_block • parsing of one block, returning next char to parse */
@@ -897,7 +912,8 @@ static void parse_block(struct buf *ob, struct render *rndr,
 
 /* 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, int depth)
+{
 	size_t beg, end = 0, pre, work_size = 0;
 	char *work_data = 0;
 	struct buf *out = 0;
@@ -942,8 +958,8 @@ 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) {
+parse_paragraph(struct buf *ob, struct render *rndr, char *data, size_t size)
+{
 	size_t i = 0, end = 0;
 	int level = 0;
 	struct buf work = { data, 0, 0, 0, 0 }; /* volatile working buffer */
@@ -1015,14 +1031,14 @@ parse_paragraph(struct buf *ob, struct render *rndr,
 				work.size = i - beg; }
 			else work.size = i; }
 		if (rndr->make.header)
-			rndr->make.header(ob, &work, level, &rndr->make.render_options);}
-	return end; }
-
+			rndr->make.header(ob, &work, level, rndr->header_count++, &rndr->make.render_options);}
+	return end;
+}
 
 /* parse_blockquote • hanldes parsing of a block-level code fragment */
 static size_t
-parse_blockcode(struct buf *ob, struct render *rndr,
-			char *data, size_t size) {
+parse_blockcode(struct buf *ob, struct render *rndr, char *data, size_t size)
+{
 	size_t beg, end, pre;
 	struct buf *work = 0;
 
@@ -1056,8 +1072,8 @@ parse_blockcode(struct buf *ob, struct render *rndr,
 	if (rndr->make.blockcode)
 		rndr->make.blockcode(ob, work, &rndr->make.render_options);
 	rndr->work.size -= 1;
-	return beg; }
-
+	return beg;
+}
 
 /* parse_listitem • parsing of a single list item */
 /*	assuming initial prefix is already removed */
@@ -1188,7 +1204,8 @@ 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, int depth)
+{
 	struct buf *work = 0;
 	size_t i = 0, j;
 
@@ -1216,7 +1233,8 @@ parse_list(struct buf *ob, struct render *rndr, char *data, size_t size, int fla
 
 /* parse_atxheader • parsing of atx-style headers */
 static size_t
-parse_atxheader(struct buf *ob, struct render *rndr, char *data, size_t size) {
+parse_atxheader(struct buf *ob, struct render *rndr, char *data, size_t size)
+{
 	size_t level = 0;
 	size_t i, end, skip;
 	struct buf work = { data, 0, 0, 0, 0 };
@@ -1232,7 +1250,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->make.render_options);
+		rndr->make.header(ob, &work, (int)level, rndr->header_count++, &rndr->make.render_options);
 	return skip;
 }
 
@@ -1240,7 +1258,8 @@ parse_atxheader(struct buf *ob, struct render *rndr, char *data, size_t size) {
 /* htmlblock_end • checking end of HTML block : </tag>[ \t]*\n[ \t*]\n */
 /*	returns the length on match, 0 otherwise */
 static size_t
-htmlblock_end(struct html_tag *tag, char *data, size_t size) {
+htmlblock_end(struct html_tag *tag, char *data, size_t size)
+{
 	size_t i, w;
 
 	/* assuming data[0] == '<' && data[1] == '/' already tested */
@@ -1274,7 +1293,8 @@ htmlblock_end(struct html_tag *tag, char *data, size_t size) {
 
 /* parse_htmlblock • parsing of inline HTML block */
 static size_t
-parse_htmlblock(struct buf *ob, struct render *rndr, char *data, size_t size, int do_render) {
+parse_htmlblock(struct buf *ob, struct render *rndr, char *data, size_t size, int do_render)
+{
 	size_t i, j = 0;
 	struct html_tag *curtag;
 	int found;
@@ -1382,7 +1402,8 @@ 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, int depth)
+{
 	size_t beg, end, i;
 	char *txt_data;
 	beg = 0;
@@ -1426,7 +1447,8 @@ parse_block(struct buf *ob, struct render *rndr, char *data, size_t size, int de
 
 /* is_ref • returns whether a line is a reference or not */
 static int
-is_ref(char *data, size_t beg, size_t end, size_t *last, struct array *refs) {
+is_ref(char *data, size_t beg, size_t end, size_t *last, struct array *refs)
+{
 /*	int n; */
 	size_t i = 0;
 	size_t id_offset, id_end;
@@ -1523,13 +1545,9 @@ is_ref(char *data, size_t beg, size_t end, size_t *last, struct array *refs) {
 		bufput(lr->title, data + title_offset,
 					title_end - title_offset); }
 	else lr->title = 0;
-	return 1; }
-
-
+	return 1; 
+}
 
-/**********************
- * EXPORTED FUNCTIONS *
- **********************/
 static void expand_tabs(struct buf *ob, const char *line, size_t size)
 {
 	size_t  i = 0, tab = 0;
@@ -1555,6 +1573,10 @@ static void expand_tabs(struct buf *ob, const char *line, size_t size)
 	}
 }
 
+/**********************
+ * 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 *rndrer) {
@@ -1564,7 +1586,9 @@ markdown(struct buf *ob, struct buf *ib, const struct mkd_renderer *rndrer) {
 	struct render rndr;
 
 	/* filling the render structure */
-	if (!rndrer) return;
+	if (!rndrer)
+		return;
+
 	rndr.make = *rndrer;
 	arr_init(&rndr.refs, sizeof (struct link_ref));
 	parr_init(&rndr.work);
@@ -1591,6 +1615,8 @@ 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 */
@@ -1628,6 +1654,8 @@ markdown(struct buf *ob, struct buf *ib, const struct mkd_renderer *rndrer) {
 
 	/* 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);
 
 	/* clean-up */
 	bufrelease(text);

data/ext/markdown.h

@@ -37,7 +37,11 @@ enum mkd_autolink {
 };
 
 struct mkd_renderopt {
-	void *opaque;
+	union {
+		int data;
+		void *ptr;
+	} opaque;
+
 	unsigned int flags;
 };
 
@@ -52,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, struct mkd_renderopt *opaque);
+	void (*header)(struct buf *ob, struct buf *text, int level, int header_count, 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);
@@ -73,6 +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);
+
 	/* renderer data */
 	const char *emph_chars; /* chars that trigger emphasis rendering */
 
@@ -99,6 +106,7 @@ typedef enum {
 	RENDER_EXPAND_TABS = (1 << 5),
 	RENDER_AUTOLINK = (1 << 6),
 	RENDER_SAFELINK = (1 << 7),
+	RENDER_TOC = (1 << 8),
 } render_mode;
 
 typedef enum {
@@ -114,10 +122,12 @@ void
 markdown(struct buf *ob, struct buf *ib, const struct mkd_renderer *rndr);
 
 void
-init_renderer(struct mkd_renderer *renderer,
-		unsigned int render_flags, void *opaque,
+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 */
 

data/ext/redcarpet.c

@@ -3,9 +3,17 @@
 
 #include "markdown.h"
 
+#define REDCARPET_RECURSION_LIMIT 16
+
+typedef enum
+{
+	REDCARPET_RENDER_XHTML,
+	REDCARPET_RENDER_TOC
+} RendererType;
+
 static VALUE rb_cRedcarpet;
 
-static void rb_redcarpet__setup_render(VALUE ruby_obj, struct mkd_renderer *rnd)
+static void rb_redcarpet__setup_xhtml(struct mkd_renderer *rnd, VALUE ruby_obj)
 {
 	unsigned int render_flags = RENDER_EXPAND_TABS;
 	unsigned int parser_flags = 0;
@@ -38,22 +46,23 @@ static void rb_redcarpet__setup_render(VALUE ruby_obj, struct mkd_renderer *rnd)
 	if (rb_funcall(ruby_obj, rb_intern("safelink"), 0) == Qtrue)
 		render_flags |= RENDER_SAFELINK;
 
+	if (rb_funcall(ruby_obj, rb_intern("generate_toc"), 0) == Qtrue)
+		render_flags |= RENDER_TOC;
 
 	/* parser - strict */
 	if (rb_funcall(ruby_obj, rb_intern("strict"), 0) == Qtrue)
 		parser_flags |= PARSER_STRICT;
 
-
-	init_renderer(rnd, render_flags, NULL, parser_flags, 16);
+	init_xhtml_renderer(rnd, render_flags, parser_flags, REDCARPET_RECURSION_LIMIT);
 }
 
-static VALUE rb_redcarpet_to_html(int argc, VALUE *argv, VALUE self)
+static VALUE rb_redcarpet__render(VALUE self, RendererType render_type)
 {
 	VALUE text = rb_funcall(self, rb_intern("text"), 0);
 	VALUE result;
 
 	struct buf input_buf, *output_buf;
-	struct mkd_renderer redcarpet_render;
+	struct mkd_renderer renderer;
 
 	Check_Type(text, T_STRING);
 
@@ -63,8 +72,20 @@ static VALUE rb_redcarpet_to_html(int argc, VALUE *argv, VALUE self)
 
 	output_buf = bufnew(64);
 
-	rb_redcarpet__setup_render(self, &redcarpet_render);
-	markdown(output_buf, &input_buf, &redcarpet_render);
+	switch (render_type) {
+	case REDCARPET_RENDER_XHTML:
+		rb_redcarpet__setup_xhtml(&renderer, self);
+		break;
+
+	case REDCARPET_RENDER_TOC:
+		init_toc_renderer(&renderer, REDCARPET_RECURSION_LIMIT);
+		break;
+
+	default:
+		return Qnil;
+	}
+
+	markdown(output_buf, &input_buf, &renderer);
 
 	result = rb_str_new(output_buf->data, output_buf->size);
 	bufrelease(output_buf);
@@ -78,9 +99,22 @@ static VALUE rb_redcarpet_to_html(int argc, VALUE *argv, VALUE self)
 	return result;
 }
 
+static VALUE
+rb_redcarpet_toc(int argc, VALUE *argv, VALUE self)
+{
+	return rb_redcarpet__render(self, REDCARPET_RENDER_TOC);
+}
+
+static VALUE
+rb_redcarpet_to_html(int argc, VALUE *argv, VALUE self)
+{
+	return rb_redcarpet__render(self, REDCARPET_RENDER_XHTML);
+}
+
 void Init_redcarpet()
 {
     rb_cRedcarpet = rb_define_class("Redcarpet", rb_cObject);
     rb_define_method(rb_cRedcarpet, "to_html", rb_redcarpet_to_html, -1);
+    rb_define_method(rb_cRedcarpet, "toc_content", rb_redcarpet_toc, -1);
 }
 

data/ext/render.c

@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2011, Vicent Marti
  * Copyright (c) 2009, Natacha Porté
+ * 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
@@ -53,7 +53,6 @@ put_scaped_char(struct buf *ob, char c)
 	}
 }
 
-
 /* lus_attr_escape • copy the buffer entity-escaping '<', '>', '&' and '"' */
 static void
 lus_attr_escape(struct buf *ob, const char *src, size_t size)
@@ -168,9 +167,14 @@ 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, int header_count, struct mkd_renderopt *options)
 {
-	if (ob->size) bufputc(ob, '\n');
+	if (ob->size)
+		bufputc(ob, '\n');
+
+	if (options->flags & RENDER_TOC)
+		bufprintf(ob, "<a name=\"toc_%d\"></a>", header_count);
+
 	bufprintf(ob, "<h%d>", level);
 	if (text) bufput(ob, text->data, text->size);
 	bufprintf(ob, "</h%d>\n", level);
@@ -552,8 +556,8 @@ rndr_normal_text(struct buf *ob, struct buf *text, struct mkd_renderopt *options
 }
 
 void
-init_renderer(struct mkd_renderer *renderer,
-		unsigned int render_flags, void *opaque,
+init_xhtml_renderer(struct mkd_renderer *renderer,
+		unsigned int render_flags,
 		unsigned int parser_flags, int recursion_depth)
 {
 	static const struct mkd_renderer renderer_default = {
@@ -578,10 +582,11 @@ init_renderer(struct mkd_renderer *renderer,
 
 		NULL,
 		rndr_normal_text,
+		NULL,
 
 		"*_",
 
-		{ NULL, 0 },
+		{ 0, 0 },
 		{ 0, 0 },
 	};
 
@@ -597,8 +602,6 @@ init_renderer(struct mkd_renderer *renderer,
 
 	renderer->parser_options.recursion_depth = recursion_depth;
 	renderer->parser_options.flags = parser_flags;
-
-	renderer->render_options.opaque = opaque;
 	renderer->render_options.flags = render_flags;
 }
 

data/ext/toc.c

@@ -0,0 +1,101 @@
+/*
+ * 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;
+}
+

data/lib/redcarpet.rb

@@ -26,7 +26,7 @@
 #   end
 #
 class Redcarpet
-  VERSION = '1.1.1'
+  VERSION = '1.2.0'
 
   # Original Markdown formatted text.
   attr_reader :text
@@ -57,14 +57,13 @@ class Redcarpet
   # Don't make hyperlinks from <tt>[][]</tt> links that have unknown URL types.
   attr_accessor :safelink
 
+  # Add TOC anchors to every header
+  attr_accessor :generate_toc
+
   def initialize(text, *extensions)
     @text  = text
     extensions.each { |e| send("#{e}=", true) }
   end
-
-  def generate_toc
-    raise NotImplementedError
-  end
 end
 
 Markdown = Redcarpet unless defined? Markdown

data/redcarpet.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'redcarpet'
-  s.version = '1.1.1'
+  s.version = '1.2.0'
   s.summary = "Ruby bindings for libupskirt"
   s.date = '2011-04-02'
   s.email = 'vicent@github.com'
@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
     ext/markdown.h
     ext/redcarpet.c
     ext/render.c
+    ext/toc.c
     lib/markdown.rb
     lib/redcarpet.rb
     redcarpet.gemspec

data/test/redcarpet_test.rb

@@ -109,4 +109,17 @@ class RedcarpetTest < Test::Unit::TestCase
     assert_equal "<pre><code>This is a code block\nThis is a link [[1]] inside\n</code></pre>\n",
       markdown.to_html
   end
+
+  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
+  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>)
+    assert_equal exp, rd.toc_content.strip
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: redcarpet
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: false
   segments: 
   - 1
-  - 1
-  - 1
-  version: 1.1.1
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - "Natacha Port\xC3\xA9"
@@ -42,6 +42,7 @@ files:
 - ext/markdown.h
 - ext/redcarpet.c
 - ext/render.c
+- ext/toc.c
 - lib/markdown.rb
 - lib/redcarpet.rb
 - redcarpet.gemspec