redcarpet 1.17.2 → 2.0.0b

data/ext/redcarpet/html.h

@@ -34,20 +34,29 @@ typedef enum {
 	HTML_USE_XHTML = (1 << 11),
 } render_mode;
 
+typedef enum {
+	HTML_TAG_NONE = 0,
+	HTML_TAG_OPEN,
+	HTML_TAG_CLOSE,
+} html_tag;
+
 void
-upshtml_escape(struct buf *ob, const char *src, size_t size);
+sdhtml_escape(struct buf *ob, const char *src, size_t size);
+
+int
+sdhtml_tag(const char *tag_data, size_t tag_size, const char *tagname);
 
 extern void
-upshtml_renderer(struct mkd_renderer *renderer, unsigned int render_flags);
+sdhtml_renderer(struct mkd_renderer *renderer, unsigned int render_flags, void *extra);
 
 extern void
-upshtml_toc_renderer(struct mkd_renderer *renderer);
+sdhtml_toc_renderer(struct mkd_renderer *renderer, void *extra);
 
 extern void
-upshtml_free_renderer(struct mkd_renderer *renderer);
+sdhtml_free_renderer(struct mkd_renderer *renderer);
 
 extern void
-upshtml_smartypants(struct buf *ob, struct buf *text);
+sdhtml_smartypants(struct buf *ob, struct buf *text);
 
 #endif
 

data/ext/redcarpet/html_smartypants.c

@@ -161,16 +161,14 @@ smartypants_cb__parens(struct buf *ob, struct smartypants_data *smrt, char previ
 static size_t
 smartypants_cb__dash(struct buf *ob, struct smartypants_data *smrt, char previous_char, const char *text, size_t size)
 {
-	if (size >= 2) {
-		if (text[1] == '-') {
-			BUFPUTSL(ob, "—");
-			return 1;
-		}
+	if (size >= 3 && text[1] == '-' && text[2] == '-') {
+		BUFPUTSL(ob, "—");
+		return 2;
+	}
 
-		if (word_boundary(previous_char) && word_boundary(text[1])) {
-			BUFPUTSL(ob, "–");
-			return 0;
-		}
+	if (size >= 2 && text[1] == '-') {
+		BUFPUTSL(ob, "–");
+		return 1;
 	}
 
 	bufputc(ob, text[0]);
@@ -264,11 +262,37 @@ smartypants_cb__dquote(struct buf *ob, struct smartypants_data *smrt, char previ
 static size_t
 smartypants_cb__ltag(struct buf *ob, struct smartypants_data *smrt, char previous_char, const char *text, size_t size)
 {
-	size_t i = 0;
+	static const char *skip_tags[] = {"pre", "code", "kbd", "script"};
+	static const size_t skip_tags_count = 4;
+
+	size_t tag, i = 0;
 
 	while (i < size && text[i] != '>')
 		i++;
 
+	for (tag = 0; tag < skip_tags_count; ++tag) {
+		if (sdhtml_tag(text, size, skip_tags[tag]) == HTML_TAG_OPEN)
+			break;
+	}
+
+	if (tag < skip_tags_count) {
+		for (;;) {
+			while (i < size && text[i] != '<')
+				i++;
+
+			if (i == size)
+				break;
+
+			if (sdhtml_tag(text + i, size - i, skip_tags[tag]) == HTML_TAG_CLOSE)
+				break;
+
+			i++;
+		}
+
+		while (i < size && text[i] != '>')
+			i++;
+	}
+
 	bufput(ob, text, i + 1);
 	return i;
 }
@@ -304,7 +328,7 @@ static struct {
 #endif
 
 void
-upshtml_smartypants(struct buf *ob, struct buf *text)
+sdhtml_smartypants(struct buf *ob, struct buf *text)
 {
 	size_t i;
 	struct smartypants_data smrt = {0, 0};

data/ext/redcarpet/markdown.c

@@ -60,6 +60,7 @@ static size_t char_autolink_url(struct buf *ob, struct render *rndr, char *data,
 static size_t char_autolink_email(struct buf *ob, struct render *rndr, char *data, size_t offset, size_t size);
 static size_t char_autolink_www(struct buf *ob, struct render *rndr, char *data, size_t offset, size_t size);
 static size_t char_link(struct buf *ob, struct render *rndr, char *data, size_t offset, size_t size);
+static size_t char_superscript(struct buf *ob, struct render *rndr, char *data, size_t offset, size_t size);
 
 enum markdown_char_t {
 	MD_CHAR_NONE = 0,
@@ -72,7 +73,8 @@ enum markdown_char_t {
 	MD_CHAR_ENTITITY,
 	MD_CHAR_AUTOLINK_URL,
 	MD_CHAR_AUTOLINK_EMAIL,
-	MD_CHAR_AUTOLINK_WWW
+	MD_CHAR_AUTOLINK_WWW,
+	MD_CHAR_SUPERSCRIPT,
 };
 
 static char_trigger markdown_char_ptrs[] = {
@@ -87,6 +89,7 @@ static char_trigger markdown_char_ptrs[] = {
 	&char_autolink_url,
 	&char_autolink_email,
 	&char_autolink_www,
+	&char_superscript,
 };
 
 /* render • structure containing one particular render */
@@ -145,13 +148,14 @@ static struct html_tag block_tags[] = {
 	{ "h6",		2 },
 	{ "ol",		2 },
 	{ "ul",		2 },
-/*10*/	{ "del",	3 },
+	{ "del",	3 }, /* 10 */
 	{ "div",	3 },
-/*12*/	{ "ins",	3 },
+	{ "ins",	3 }, /* 12 */
 	{ "pre",	3 },
 	{ "form",	4 },
 	{ "math",	4 },
 	{ "table",	5 },
+	{ "figure",	6 },
 	{ "iframe",	6 },
 	{ "script",	6 },
 	{ "fieldset",	8 },
@@ -224,7 +228,7 @@ find_block_tag(char *data, size_t size)
 	while (i < size && ((data[i] >= '0' && data[i] <= '9')
 				|| (data[i] >= 'A' && data[i] <= 'Z')
 				|| (data[i] >= 'a' && data[i] <= 'z')))
-		i += 1;
+		i++;
 	if (i >= size) return 0;
 
 	/* binary search of the tag */
@@ -317,7 +321,7 @@ tag_length(char *data, size_t size, enum mkd_autolink *autolink)
 			if (data[i] == '\\') i += 2;
 			else if (data[i] == '>' || data[i] == '\'' ||
 					data[i] == '"' || isspace(data[i])) break;
-			else i += 1;
+			else i++;
 		}
 
 		if (i >= size) return 0;
@@ -327,7 +331,7 @@ 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;
+	while (i < size && data[i] != '>') i++;
 	if (i >= size) return 0;
 	return i + 1;
 }
@@ -379,47 +383,72 @@ find_emph_char(char *data, size_t size, char c)
 	size_t i = 1;
 
 	while (i < size) {
-		while (i < size && data[i] != c
-		&& data[i] != '`' && data[i] != '[')
-			i += 1;
-		if (data[i] == c) return i;
+		while (i < size && data[i] != c && data[i] != '`' && data[i] != '[')
+			i++;
+
+		if (i == size)
+			return 0;
+
+		if (data[i] == c)
+			return i;
 
 		/* not counting escaped chars */
-		if (i && data[i - 1] == '\\') { i += 1; continue; }
+		if (i && data[i - 1] == '\\') {
+			i++; continue;
+		}
 
 		/* skipping a code span */
 		if (data[i] == '`') {
 			size_t tmp_i = 0;
-			i += 1;
+
+			i++;
 			while (i < size && data[i] != '`') {
 				if (!tmp_i && data[i] == c) tmp_i = i;
-				i += 1; }
-			if (i >= size) return tmp_i;
-			i += 1; }
+				i++; 
+			}
+
+			if (i >= size)
+				return tmp_i;
 
+			i++; 
+		}
 		/* skipping a link */
 		else if (data[i] == '[') {
 			size_t tmp_i = 0;
 			char cc;
-			i += 1;
+
+			i++;
 			while (i < size && data[i] != ']') {
 				if (!tmp_i && data[i] == c) tmp_i = i;
-				i += 1; }
-			i += 1;
-			while (i < size && (data[i] == ' '
-			|| data[i] == '\t' || data[i] == '\n'))
-				i += 1;
-			if (i >= size) return tmp_i;
+				i++;
+			}
+
+			i++;
+			while (i < size && (data[i] == ' ' || data[i] == '\t' || data[i] == '\n'))
+				i++;
+
+			if (i >= size)
+				return tmp_i;
+
 			if (data[i] != '[' && data[i] != '(') { /* not a link*/
 				if (tmp_i) return tmp_i;
-				else continue; }
+				else continue;
+			}
+
 			cc = data[i];
-			i += 1;
+			i++;
 			while (i < size && data[i] != cc) {
 				if (!tmp_i && data[i] == c) tmp_i = i;
-				i += 1; }
-			if (i >= size) return tmp_i;
-			i += 1; } }
+				i++;
+			}
+
+			if (i >= size)
+				return tmp_i;
+
+			i++;
+		}
+	}
+
 	return 0;
 }
 
@@ -444,7 +473,7 @@ parse_emph1(struct buf *ob, struct render *rndr, char *data, size_t size, char c
 		if (i >= size) return 0;
 
 		if (i + 1 < size && data[i + 1] == c) {
-			i += 1;
+			i++;
 			continue;
 		}
 
@@ -668,7 +697,7 @@ char_entity(struct buf *ob, struct render *rndr, char *data, size_t offset, size
 		end++;
 
 	if (end < size && data[end] == ';')
-		end += 1; /* real entity */
+		end++; /* real entity */
 	else
 		return 0; /* lone '&' */
 
@@ -719,7 +748,7 @@ char_autolink_www(struct buf *ob, struct render *rndr, char *data, size_t offset
 
 	link = rndr_newbuf(rndr, BUFFER_SPAN);
 
-	if ((link_len = ups_autolink__www(&rewind, link, data, offset, size)) > 0) {
+	if ((link_len = sd_autolink__www(&rewind, link, data, offset, size)) > 0) {
 		link_url = rndr_newbuf(rndr, BUFFER_SPAN);
 		BUFPUTSL(link_url, "http://");
 		bufput(link_url, link->data, link->size);
@@ -744,7 +773,7 @@ char_autolink_email(struct buf *ob, struct render *rndr, char *data, size_t offs
 
 	link = rndr_newbuf(rndr, BUFFER_SPAN);
 
-	if ((link_len = ups_autolink__email(&rewind, link, data, offset, size)) > 0) {
+	if ((link_len = sd_autolink__email(&rewind, link, data, offset, size)) > 0) {
 		ob->size -= rewind;
 		rndr->make.autolink(ob, link, MKDA_EMAIL, rndr->make.opaque);
 	}
@@ -764,7 +793,7 @@ char_autolink_url(struct buf *ob, struct render *rndr, char *data, size_t offset
 
 	link = rndr_newbuf(rndr, BUFFER_SPAN);
 
-	if ((link_len = ups_autolink__url(&rewind, link, data, offset, size)) > 0) {
+	if ((link_len = sd_autolink__url(&rewind, link, data, offset, size)) > 0) {
 		ob->size -= rewind;
 		rndr->make.autolink(ob, link, MKDA_NORMAL, rndr->make.opaque);
 	}
@@ -791,7 +820,7 @@ char_link(struct buf *ob, struct render *rndr, char *data, size_t offset, size_t
 		goto cleanup;
 
 	/* looking for the matching closing bracket */
-	for (level = 1; i < size; i += 1) {
+	for (level = 1; i < size; i++) {
 		if (data[i] == '\n')
 			text_has_nl = 1;
 
@@ -812,7 +841,7 @@ char_link(struct buf *ob, struct render *rndr, char *data, size_t offset, size_t
 		goto cleanup;
 
 	txt_e = i;
-	i += 1;
+	i++;
 
 	/* skip any amount of whitespace or newline */
 	/* (this is much more laxist than original markdown syntax) */
@@ -822,7 +851,7 @@ char_link(struct buf *ob, struct render *rndr, char *data, size_t offset, size_t
 	/* inline style link */
 	if (i < size && data[i] == '(') {
 		/* skipping initial whitespace */
-		i += 1;
+		i++;
 
 		while (i < size && isspace(data[i]))
 			i++;
@@ -833,7 +862,7 @@ char_link(struct buf *ob, struct render *rndr, char *data, size_t offset, size_t
 		while (i < size) {
 			if (data[i] == '\\') i += 2;
 			else if (data[i] == ')' || data[i] == '\'' || data[i] == '"') break;
-			else i += 1;
+			else i++;
 		}
 
 		if (i >= size) goto cleanup;
@@ -847,7 +876,7 @@ char_link(struct buf *ob, struct render *rndr, char *data, size_t offset, size_t
 			while (i < size) {
 				if (data[i] == '\\') i += 2;
 				else if (data[i] == ')') break;
-				else i += 1;
+				else i++;
 			}
 
 			if (i >= size) goto cleanup;
@@ -892,7 +921,7 @@ char_link(struct buf *ob, struct render *rndr, char *data, size_t offset, size_t
 		struct link_ref *lr;
 
 		/* looking for the id */
-		i += 1;
+		i++;
 		link_b = i;
 		while (i < size && data[i] != ']') i++;
 		if (i >= size) goto cleanup;
@@ -928,7 +957,7 @@ char_link(struct buf *ob, struct render *rndr, char *data, size_t offset, size_t
 		/* keeping link and title from link_ref */
 		link = lr->link;
 		title = lr->title;
-		i += 1;
+		i++;
 	}
 
 	/* shortcut reference style link */
@@ -995,7 +1024,43 @@ cleanup:
 	return ret ? i : 0;
 }
 
+static size_t
+char_superscript(struct buf *ob, struct render *rndr, char *data, size_t offset, size_t size)
+{
+	size_t sup_start, sup_len;
+	struct buf *sup;
+
+	if (!rndr->make.superscript)
+		return 0;
+
+	if (size < 2)
+		return 0;
+
+	if (data[1] == '(') {
+		sup_start = sup_len = 2;
+
+		while (sup_len < size && data[sup_len] != ')' && data[sup_len - 1] != '\\')
+			sup_len++;
 
+		if (sup_len == size)
+			return 0;
+	} else {
+		sup_start = sup_len = 1;
+
+		while (sup_len < size && !isspace(data[sup_len]))
+			sup_len++;
+	}
+
+	if (sup_len - sup_start == 0)
+		return (sup_start == 2) ? 3 : 0;
+
+	sup = rndr_newbuf(rndr, BUFFER_SPAN);
+	parse_inline(sup, rndr, data + sup_start, sup_len - sup_start);
+	rndr->make.superscript(ob, sup, rndr->make.opaque);
+	rndr_popbuf(rndr, BUFFER_SPAN);
+
+	return (sup_start == 2) ? sup_len + 1 : sup_len;
+}
 
 /*********************************
  * BLOCK-LEVEL PARSING FUNCTIONS *
@@ -1006,7 +1071,7 @@ static size_t
 is_empty(char *data, size_t size)
 {
 	size_t i;
-	for (i = 0; i < size && data[i] != '\n'; i += 1)
+	for (i = 0; i < size && data[i] != '\n'; i++)
 		if (data[i] != ' ' && data[i] != '\t') return 0;
 	return i + 1;
 }
@@ -1020,9 +1085,9 @@ is_hrule(char *data, size_t size)
 
 	/* skipping initial spaces */
 	if (size < 3) return 0;
-	if (data[0] == ' ') { i += 1;
-	if (data[1] == ' ') { i += 1;
-	if (data[2] == ' ') { i += 1; } } }
+	if (data[0] == ' ') { i++;
+	if (data[1] == ' ') { i++;
+	if (data[2] == ' ') { i++; } } }
 
 	/* looking at the hrule char */
 	if (i + 2 >= size
@@ -1032,10 +1097,10 @@ is_hrule(char *data, size_t size)
 
 	/* the whole line must be the char or whitespace */
 	while (i < size && data[i] != '\n') {
-		if (data[i] == c) n += 1;
+		if (data[i] == c) n++;
 		else if (data[i] != ' ' && data[i] != '\t')
 			return 0;
-		i += 1; }
+		i++; }
 
 	return n >= 3;
 }
@@ -1049,9 +1114,9 @@ is_codefence(char *data, size_t size, struct buf *syntax)
 
 	/* skipping initial spaces */
 	if (size < 3) return 0;
-	if (data[0] == ' ') { i += 1;
-	if (data[1] == ' ') { i += 1;
-	if (data[2] == ' ') { i += 1; } } }
+	if (data[0] == ' ') { i++;
+	if (data[1] == ' ') { i++;
+	if (data[2] == ' ') { i++; } } }
 
 	/* looking at the hrule char */
 	if (i + 2 >= size || !(data[i] == '~' || data[i] == '`'))
@@ -1142,14 +1207,14 @@ is_headerline(char *data, size_t size)
 
 	/* test of level 1 header */
 	if (data[i] == '=') {
-		for (i = 1; i < size && data[i] == '='; i += 1);
-		while (i < size && (data[i] == ' ' || data[i] == '\t')) i += 1;
+		for (i = 1; i < size && data[i] == '='; i++);
+		while (i < size && (data[i] == ' ' || data[i] == '\t')) i++;
 		return (i >= size || data[i] == '\n') ? 1 : 0; }
 
 	/* test of level 2 header */
 	if (data[i] == '-') {
-		for (i = 1; i < size && data[i] == '-'; i += 1);
-		while (i < size && (data[i] == ' ' || data[i] == '\t')) i += 1;
+		for (i = 1; i < size && data[i] == '-'; i++);
+		while (i < size && (data[i] == ' ' || data[i] == '\t')) i++;
 		return (i >= size || data[i] == '\n') ? 2 : 0; }
 
 	return 0;
@@ -1160,9 +1225,9 @@ static size_t
 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;
-	if (i < size && data[i] == ' ') i += 1;
+	if (i < size && data[i] == ' ') i++;
+	if (i < size && data[i] == ' ') i++;
+	if (i < size && data[i] == ' ') i++;
 	if (i < size && data[i] == '>') {
 		if (i + 1 < size && (data[i + 1] == ' ' || data[i+1] == '\t'))
 			return i + 2;
@@ -1185,11 +1250,11 @@ static size_t
 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;
-	if (i < size && data[i] == ' ') i += 1;
+	if (i < size && data[i] == ' ') i++;
+	if (i < size && data[i] == ' ') i++;
+	if (i < size && data[i] == ' ') i++;
 	if (i >= size || data[i] < '0' || data[i] > '9') return 0;
-	while (i < size && data[i] >= '0' && data[i] <= '9') i += 1;
+	while (i < size && data[i] >= '0' && data[i] <= '9') i++;
 	if (i + 1 >= size || data[i] != '.'
 	|| (data[i + 1] != ' ' && data[i + 1] != '\t')) return 0;
 	return i + 2;
@@ -1200,9 +1265,9 @@ static size_t
 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;
-	if (i < size && data[i] == ' ') i += 1;
+	if (i < size && data[i] == ' ') i++;
+	if (i < size && data[i] == ' ') i++;
+	if (i < size && data[i] == ' ') i++;
 	if (i + 1 >= size
 	|| (data[i] != '*' && data[i] != '+' && data[i] != '-')
 	|| (data[i + 1] != ' ' && data[i + 1] != '\t'))
@@ -1363,7 +1428,7 @@ parse_fencedcode(struct buf *ob, struct render *rndr, char *data, size_t size)
 			break;
 		}
 
-		for (end = beg + 1; end < size && data[end - 1] != '\n'; end += 1);
+		for (end = beg + 1; end < size && data[end - 1] != '\n'; end++);
 
 		if (beg < end) {
 			/* verbatim copy to the working buffer,
@@ -1677,10 +1742,10 @@ parse_htmlblock(struct buf *ob, struct render *rndr, char *data, size_t size, in
 		if (size > 4 && (data[1] == 'h' || data[1] == 'H') && (data[2] == 'r' || data[2] == 'R')) {
 			i = 3;
 			while (i < size && data[i] != '>')
-				i += 1;
+				i++;
 
 			if (i + 1 < size) {
-				i += 1;
+				i++;
 				j = is_empty(data + i, size - i);
 				if (j) {
 					work.size = i + j;
@@ -1991,34 +2056,34 @@ is_ref(char *data, size_t beg, size_t end, size_t *last, struct array *refs)
 
 	/* id part: anything but a newline between brackets */
 	if (data[i] != '[') return 0;
-	i += 1;
+	i++;
 	id_offset = i;
 	while (i < end && data[i] != '\n' && data[i] != '\r' && data[i] != ']')
-		i += 1;
+		i++;
 	if (i >= end || data[i] != ']') return 0;
 	id_end = i;
 
 	/* spacer: colon (space | tab)* newline? (space | tab)* */
-	i += 1;
+	i++;
 	if (i >= end || data[i] != ':') return 0;
-	i += 1;
-	while (i < end && (data[i] == ' ' || data[i] == '\t')) i += 1;
+	i++;
+	while (i < end && (data[i] == ' ' || data[i] == '\t')) i++;
 	if (i < end && (data[i] == '\n' || data[i] == '\r')) {
-		i += 1;
-		if (i < end && data[i] == '\r' && data[i - 1] == '\n') i += 1; }
-	while (i < end && (data[i] == ' ' || data[i] == '\t')) i += 1;
+		i++;
+		if (i < end && data[i] == '\r' && data[i - 1] == '\n') i++; }
+	while (i < end && (data[i] == ' ' || data[i] == '\t')) i++;
 	if (i >= end) return 0;
 
 	/* link: whitespace-free sequence, optionally between angle brackets */
-	if (data[i] == '<') i += 1;
+	if (data[i] == '<') i++;
 	link_offset = i;
 	while (i < end && data[i] != ' ' && data[i] != '\t'
-			&& data[i] != '\n' && data[i] != '\r') i += 1;
+			&& data[i] != '\n' && data[i] != '\r') i++;
 	if (data[i - 1] == '>') link_end = i - 1;
 	else link_end = i;
 
 	/* optional spacer: (space | tab)* (newline | '\'' | '"' | '(' ) */
-	while (i < end && (data[i] == ' ' || data[i] == '\t')) i += 1;
+	while (i < end && (data[i] == ' ' || data[i] == '\t')) i++;
 	if (i < end && data[i] != '\n' && data[i] != '\r'
 			&& data[i] != '\'' && data[i] != '"' && data[i] != '(')
 		return 0;
@@ -2031,17 +2096,17 @@ is_ref(char *data, size_t beg, size_t end, size_t *last, struct array *refs)
 	/* optional (space|tab)* spacer after a newline */
 	if (line_end) {
 		i = line_end + 1;
-		while (i < end && (data[i] == ' ' || data[i] == '\t')) i += 1; }
+		while (i < end && (data[i] == ' ' || data[i] == '\t')) i++; }
 
 	/* optional title: any non-newline sequence enclosed in '"()
 					alone on its line */
 	title_offset = title_end = 0;
 	if (i + 1 < end
 	&& (data[i] == '\'' || data[i] == '"' || data[i] == '(')) {
-		i += 1;
+		i++;
 		title_offset = i;
 		/* looking for EOL */
-		while (i < end && data[i] != '\n' && data[i] != '\r') i += 1;
+		while (i < end && data[i] != '\n' && data[i] != '\r') i++;
 		if (i + 1 < end && data[i] == '\n' && data[i + 1] == '\r')
 			title_end = i + 1;
 		else	title_end = i;
@@ -2102,7 +2167,7 @@ static void expand_tabs(struct buf *ob, const char *line, size_t size)
 
 /* markdown • parses the input buffer and renders it into the output buffer */
 void
-ups_markdown(struct buf *ob, struct buf *ib, const struct mkd_renderer *rndrer, unsigned int extensions) {
+sd_markdown(struct buf *ob, struct buf *ib, const struct mkd_renderer *rndrer, unsigned int extensions) {
 	struct link_ref *lr;
 	struct buf *text;
 	size_t i, beg, end;
@@ -2124,7 +2189,7 @@ ups_markdown(struct buf *ob, struct buf *ib, const struct mkd_renderer *rndrer,
 	parr_init(&rndr.work_bufs[BUFFER_BLOCK]);
 	parr_init(&rndr.work_bufs[BUFFER_SPAN]);
 
-	for (i = 0; i < 256; i += 1)
+	for (i = 0; i < 256; i++)
 		rndr.active_char[i] = 0;
 
 	if (rndr.make.emphasis || rndr.make.double_emphasis || rndr.make.triple_emphasis) {
@@ -2153,6 +2218,9 @@ ups_markdown(struct buf *ob, struct buf *ib, const struct mkd_renderer *rndrer,
 		rndr.active_char['w'] = MD_CHAR_AUTOLINK_WWW;
 	}
 
+	if (extensions & MKDEXT_SUPERSCRIPT)
+		rndr.active_char['^'] = MD_CHAR_SUPERSCRIPT;
+
 	/* Extension data */
 	rndr.ext_flags = extensions;
 	rndr.max_nesting = 16;
@@ -2165,7 +2233,7 @@ ups_markdown(struct buf *ob, struct buf *ib, const struct mkd_renderer *rndrer,
 		else { /* skipping to the next line */
 			end = beg;
 			while (end < ib->size && ib->data[end] != '\n' && ib->data[end] != '\r')
-				end += 1;
+				end++;
 
 			/* adding the line body if present */
 			if (end > beg)
@@ -2175,7 +2243,7 @@ ups_markdown(struct buf *ob, struct buf *ib, const struct mkd_renderer *rndrer,
 				/* add one \n per newline */
 				if (ib->data[end] == '\n' || (end + 1 < ib->size && ib->data[end + 1] != '\n'))
 					bufputc(text, '\n');
-				end += 1;
+				end++;
 			}
 
 			beg = end;
@@ -2203,7 +2271,7 @@ ups_markdown(struct buf *ob, struct buf *ib, const struct mkd_renderer *rndrer,
 	/* clean-up */
 	bufrelease(text);
 	lr = rndr.refs.base;
-	for (i = 0; i < (size_t)rndr.refs.size; i += 1) {
+	for (i = 0; i < (size_t)rndr.refs.size; i++) {
 		bufrelease(lr[i].id);
 		bufrelease(lr[i].link);
 		bufrelease(lr[i].title);
@@ -2225,7 +2293,7 @@ ups_markdown(struct buf *ob, struct buf *ib, const struct mkd_renderer *rndrer,
 }
 
 void
-ups_version(int *ver_major, int *ver_minor, int *ver_revision)
+sd_version(int *ver_major, int *ver_minor, int *ver_revision)
 {
 	*ver_major = UPSKIRT_VER_MAJOR;
 	*ver_minor = UPSKIRT_VER_MINOR;