redcarpet 1.12.2 → 1.13.0

data/ext/{xhtml.h → redcarpet/html.h}

@@ -14,30 +14,35 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef UPSKIRT_XHTML_H
-#define UPSKIRT_XHTML_H
+#ifndef UPSKIRT_HTML_H
+#define UPSKIRT_HTML_H
+
+#include "markdown.h"
 
 typedef enum {
-	XHTML_SKIP_HTML = (1 << 0),
-	XHTML_SKIP_STYLE = (1 << 1),
-	XHTML_SKIP_IMAGES = (1 << 2),
-	XHTML_SKIP_LINKS = (1 << 3),
-	XHTML_SMARTYPANTS = (1 << 4),
-	XHTML_EXPAND_TABS = (1 << 5),
-	XHTML_SAFELINK = (1 << 7),
-	XHTML_TOC = (1 << 8),
-	XHTML_HARD_WRAP = (1 << 9),
-	XHTML_GITHUB_BLOCKCODE = (1 << 10),
+	HTML_SKIP_HTML = (1 << 0),
+	HTML_SKIP_STYLE = (1 << 1),
+	HTML_SKIP_IMAGES = (1 << 2),
+	HTML_SKIP_LINKS = (1 << 3),
+	HTML_EXPAND_TABS = (1 << 5),
+	HTML_SAFELINK = (1 << 7),
+	HTML_TOC = (1 << 8),
+	HTML_HARD_WRAP = (1 << 9),
+	HTML_GITHUB_BLOCKCODE = (1 << 10),
+	HTML_USE_XHTML = (1 << 11),
 } render_mode;
 
 extern void
-ups_xhtml_renderer(struct mkd_renderer *renderer, unsigned int render_flags);
+upshtml_renderer(struct mkd_renderer *renderer, unsigned int render_flags);
+
+extern void
+upshtml_toc_renderer(struct mkd_renderer *renderer);
 
 extern void
-ups_toc_renderer(struct mkd_renderer *renderer);
+upshtml_free_renderer(struct mkd_renderer *renderer);
 
 extern void
-ups_free_renderer(struct mkd_renderer *renderer);
+upshtml_smartypants(struct buf *ob, struct buf *text);
 
 #endif
 

data/ext/redcarpet/html_smartypants.c

@@ -0,0 +1,335 @@
+/*
+ * 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 "buffer.h"
+#include "html.h"
+
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <ctype.h>
+
+struct smartypants_data {
+	int in_squote;
+	int in_dquote;
+};
+
+static size_t smartypants_cb__ltag(struct buf *ob, struct smartypants_data *smrt, char previous_char, const char *text, size_t size);
+static size_t smartypants_cb__dquote(struct buf *ob, struct smartypants_data *smrt, char previous_char, const char *text, size_t size);
+static size_t smartypants_cb__amp(struct buf *ob, struct smartypants_data *smrt, char previous_char, const char *text, size_t size);
+static size_t smartypants_cb__period(struct buf *ob, struct smartypants_data *smrt, char previous_char, const char *text, size_t size);
+static size_t smartypants_cb__number(struct buf *ob, struct smartypants_data *smrt, char previous_char, const char *text, size_t size);
+static size_t smartypants_cb__dash(struct buf *ob, struct smartypants_data *smrt, char previous_char, const char *text, size_t size);
+static size_t smartypants_cb__parens(struct buf *ob, struct smartypants_data *smrt, char previous_char, const char *text, size_t size);
+static size_t smartypants_cb__squote(struct buf *ob, struct smartypants_data *smrt, char previous_char, const char *text, size_t size);
+static size_t smartypants_cb__backtick(struct buf *ob, struct smartypants_data *smrt, char previous_char, const char *text, size_t size);
+
+static size_t (*smartypants_cb_ptrs[])
+	(struct buf *, struct smartypants_data *, char, const char *, size_t) = 
+{
+	NULL,					/* 0 */
+	smartypants_cb__dash,	/* 1 */
+	smartypants_cb__parens,	/* 2 */
+	smartypants_cb__squote, /* 3 */
+	smartypants_cb__dquote, /* 4 */
+	smartypants_cb__amp,	/* 5 */
+	smartypants_cb__period,	/* 6 */
+	smartypants_cb__number,	/* 7 */
+	smartypants_cb__ltag,	/* 8 */
+	smartypants_cb__backtick, /* 9 */
+};
+
+static const char smartypants_cb_chars[] = {
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 4, 0, 0, 0, 5, 3, 2, 0, 0, 0, 0, 1, 6, 0,
+	0, 7, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+};
+
+static inline int
+word_boundary(char c)
+{
+	return c == 0 || isspace(c) || ispunct(c);
+}
+
+static int
+smartypants_quotes(struct buf *ob, char previous_char, char next_char, char quote, int *is_open)
+{
+	char ent[8];
+
+	if (*is_open && !word_boundary(next_char))
+		return 0;
+
+	if (!(*is_open) && !word_boundary(previous_char))
+		return 0;
+
+	snprintf(ent, sizeof(ent), "&%c%cquo;", (*is_open) ? 'r' : 'l', quote);
+	*is_open = !(*is_open);
+	bufputs(ob, ent);
+	return 1;
+}
+
+static size_t
+smartypants_cb__squote(struct buf *ob, struct smartypants_data *smrt, char previous_char, const char *text, size_t size)
+{
+	if (size >= 2) {
+		char t1 = tolower(text[1]);
+
+		if (t1 == '\'') {
+			if (smartypants_quotes(ob, previous_char, size >= 3 ? text[2] : 0, 'd', &smrt->in_dquote))
+				return 1;
+		}
+
+		if ((t1 == 's' || t1 == 't' || t1 == 'm' || t1 == 'd') &&
+			(size == 3 || word_boundary(text[2]))) {
+			BUFPUTSL(ob, "&rsquo;");
+			return 0;
+		}
+
+		if (size >= 3) {
+			char t2 = tolower(text[2]);
+
+			if (((t1 == 'r' && t2 == 'e') ||
+				(t1 == 'l' && t2 == 'l') ||
+				(t1 == 'v' && t2 == 'e')) &&
+				(size == 4 || word_boundary(text[3]))) {
+				BUFPUTSL(ob, "&rsquo;");
+				return 0;
+			}
+		}
+	}
+
+	if (smartypants_quotes(ob, previous_char, size > 0 ? text[1] : 0, 's', &smrt->in_squote))
+		return 0;
+
+	bufputc(ob, text[0]);
+	return 0;
+}
+
+static size_t
+smartypants_cb__parens(struct buf *ob, struct smartypants_data *smrt, char previous_char, const char *text, size_t size)
+{
+	if (size >= 3) {
+		char t1 = tolower(text[1]);
+		char t2 = tolower(text[2]);
+
+		if (t1 == 'c' && t2 == ')') {
+			BUFPUTSL(ob, "&copy;");
+			return 2;
+		}
+
+		if (t1 == 'r' && t2 == ')') {
+			BUFPUTSL(ob, "&reg;");
+			return 2;
+		}
+
+		if (size >= 4 && t1 == 't' && t2 == 'm' && text[3] == ')') {
+			BUFPUTSL(ob, "&trade;");
+			return 3;
+		}
+	}
+	
+	bufputc(ob, text[0]);
+	return 0;
+}
+
+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, "&mdash;");
+			return 1;
+		}
+
+		if (word_boundary(previous_char) && word_boundary(text[1])) {
+			BUFPUTSL(ob, "&ndash;");
+			return 0;
+		}
+	}
+
+	bufputc(ob, text[0]);
+	return 0;
+}
+
+static size_t
+smartypants_cb__amp(struct buf *ob, struct smartypants_data *smrt, char previous_char, const char *text, size_t size)
+{
+	if (size >= 6 && memcmp(text, "&quot;", 6) == 0) {
+		if (smartypants_quotes(ob, previous_char, size >= 7 ? text[6] : 0, 'd', &smrt->in_dquote))
+			return 5;
+	}
+
+	if (size >= 4 && memcmp(text, "&#0;", 4) == 0)
+		return 3;
+
+	bufputc(ob, '&');
+	return 0;
+}
+
+static size_t
+smartypants_cb__period(struct buf *ob, struct smartypants_data *smrt, char previous_char, const char *text, size_t size)
+{
+	if (size >= 3 && text[1] == '.' && text[2] == '.') {
+		BUFPUTSL(ob, "&hellip;");
+		return 2;
+	}
+
+	if (size >= 5 && text[1] == ' ' && text[2] == '.' && text[3] == ' ' && text[4] == '.') {
+		BUFPUTSL(ob, "&hellip;");
+		return 4;
+	}
+
+	bufputc(ob, text[0]);
+	return 0;
+}
+
+static size_t
+smartypants_cb__backtick(struct buf *ob, struct smartypants_data *smrt, char previous_char, const char *text, size_t size)
+{
+	if (size >= 2 && text[1] == '`') {
+		if (smartypants_quotes(ob, previous_char, size >= 3 ? text[2] : 0, 'd', &smrt->in_dquote))
+			return 1;
+	}
+
+	return 0;
+}
+
+static size_t
+smartypants_cb__number(struct buf *ob, struct smartypants_data *smrt, char previous_char, const char *text, size_t size)
+{
+	if (word_boundary(previous_char) && size >= 3) {
+		if (text[0] == '1' && text[1] == '/' && text[2] == '2') {
+			if (size == 3 || word_boundary(text[3])) {
+				BUFPUTSL(ob, "&frac12;");
+				return 2;
+			}
+		}
+
+		if (text[0] == '1' && text[1] == '/' && text[2] == '4') {
+			if (size == 3 || word_boundary(text[3]) ||
+				(size >= 5 && tolower(text[3]) == 't' && tolower(text[4]) == 'h')) {
+				BUFPUTSL(ob, "&frac14;");
+				return 2;
+			}
+		}
+
+		if (text[0] == '3' && text[1] == '/' && text[2] == '4') {
+			if (size == 3 || word_boundary(text[3]) ||
+				(size >= 6 && tolower(text[3]) == 't' && tolower(text[4]) == 'h' && tolower(text[5]) == 's')) {
+				BUFPUTSL(ob, "&frac34;");
+				return 2;
+			}
+		}
+	}
+
+	bufputc(ob, text[0]);
+	return 0;
+}
+
+static size_t
+smartypants_cb__dquote(struct buf *ob, struct smartypants_data *smrt, char previous_char, const char *text, size_t size)
+{
+	if (!smartypants_quotes(ob, previous_char, size > 0 ? text[1] : 0, 'd', &smrt->in_dquote))
+		BUFPUTSL(ob, "&quot;");
+
+	return 0;
+}
+
+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;
+
+	while (i < size && text[i] != '>')
+		i++;
+
+	bufput(ob, text, i + 1);
+	return i;
+}
+
+#if 0
+static struct {
+    char c0;
+    const char *pattern;
+    const char *entity;
+    int skip;
+} smartypants_subs[] = {
+    { '\'', "'s>",      "&rsquo;",  0 },
+    { '\'', "'t>",      "&rsquo;",  0 },
+    { '\'', "'re>",     "&rsquo;",  0 },
+    { '\'', "'ll>",     "&rsquo;",  0 },
+    { '\'', "'ve>",     "&rsquo;",  0 },
+    { '\'', "'m>",      "&rsquo;",  0 },
+    { '\'', "'d>",      "&rsquo;",  0 },
+    { '-',  "--",       "&mdash;",  1 },
+    { '-',  "<->",      "&ndash;",  0 },
+    { '.',  "...",      "&hellip;", 2 },
+    { '.',  ". . .",    "&hellip;", 4 },
+    { '(',  "(c)",      "&copy;",   2 },
+    { '(',  "(r)",      "&reg;",    2 },
+    { '(',  "(tm)",     "&trade;",  3 },
+    { '3',  "<3/4>",    "&frac34;", 2 },
+    { '3',  "<3/4ths>", "&frac34;", 2 },
+    { '1',  "<1/2>",    "&frac12;", 2 },
+    { '1',  "<1/4>",    "&frac14;", 2 },
+    { '1',  "<1/4th>",  "&frac14;", 2 },
+    { '&',  "&#0;",      0,       3 },
+};
+#endif
+
+void
+upshtml_smartypants(struct buf *ob, struct buf *text)
+{
+	size_t i;
+	struct smartypants_data smrt = {0, 0};
+
+	if (!text)
+		return;
+
+	bufgrow(ob, text->size);
+
+	for (i = 0; i < text->size; ++i) {
+		size_t org;
+		char action = 0;
+
+		org = i;
+		while (i < text->size && (action = smartypants_cb_chars[(unsigned char)text->data[i]]) == 0)
+			i++;
+
+		if (i > org)
+			bufput(ob, text->data + org, i - org);
+
+		if (i < text->size) {
+			i += smartypants_cb_ptrs[(int)action]
+				(ob, &smrt, i ? text->data[i - 1] : 0, text->data + i, text->size - i);
+		}
+	}
+}
+
+

data/ext/{markdown.c → redcarpet/markdown.c}

@@ -50,12 +50,44 @@ struct render;
 typedef size_t
 (*char_trigger)(struct buf *ob, struct render *rndr, char *data, size_t offset, size_t size);
 
+static size_t char_emphasis(struct buf *ob, struct render *rndr, char *data, size_t offset, size_t size);
+static size_t char_linebreak(struct buf *ob, struct render *rndr, char *data, size_t offset, size_t size);
+static size_t char_codespan(struct buf *ob, struct render *rndr, char *data, size_t offset, size_t size);
+static size_t char_escape(struct buf *ob, struct render *rndr, char *data, size_t offset, size_t size);
+static size_t char_entity(struct buf *ob, struct render *rndr, char *data, size_t offset, size_t size);
+static size_t char_langle_tag(struct buf *ob, struct render *rndr, char *data, size_t offset, size_t size);
+static size_t char_autolink(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);
+
+enum markdown_char_t {
+	MD_CHAR_NONE = 0,
+	MD_CHAR_EMPHASIS,
+	MD_CHAR_CODESPAN,
+	MD_CHAR_LINEBREAK,
+	MD_CHAR_LINK,
+	MD_CHAR_LANGLE,
+	MD_CHAR_ESCAPE,
+	MD_CHAR_ENTITITY,
+	MD_CHAR_AUTOLINK,
+};
+
+static char_trigger markdown_char_ptrs[] = {
+	NULL,
+	&char_emphasis,
+	&char_codespan,
+	&char_linebreak,
+	&char_link,
+	&char_langle_tag,
+	&char_escape,
+	&char_entity,
+	&char_autolink,
+};
 
 /* render • structure containing one particular render */
 struct render {
 	struct mkd_renderer	make;
 	struct array refs;
-	char_trigger active_char[256];
+	char active_char[256];
 	struct parray work_bufs[2];
 	unsigned int ext_flags;
 	size_t max_nesting;
@@ -305,7 +337,7 @@ static void
 parse_inline(struct buf *ob, struct render *rndr, char *data, size_t size)
 {
 	size_t i = 0, end = 0;
-	char_trigger action = 0;
+	char action = 0;
 	struct buf work = { 0, 0, 0, 0, 0 };
 
 	if (rndr->work_bufs[BUFFER_SPAN].size +
@@ -330,7 +362,7 @@ parse_inline(struct buf *ob, struct render *rndr, char *data, size_t size)
 		i = end;
 
 		/* calling the trigger */
-		end = action(ob, rndr, data + i, i, size - i);
+		end = markdown_char_ptrs[(int)action](ob, rndr, data + i, i, size - i);
 		if (!end) /* no action from the callback */
 			end = i + 1;
 		else { 
@@ -1755,20 +1787,34 @@ parse_table_header(struct buf *ob, struct render *rndr, char *data, size_t size,
 		under_end++;
 
 	for (col = 0; col < *columns && i < under_end; ++col) {
+		size_t dashes = 0;
+
+		while (i < under_end && (data[i] == ' ' || data[i] == '\t'))
+			i++;
+
 		if (data[i] == ':') {
 			i++; (*column_data)[col] |= MKD_TABLE_ALIGN_L;
+			dashes++;
 		}
 
-		while (i < under_end && data[i] == '-')
-			i++;
+		while (i < under_end && data[i] == '-') {
+			i++; dashes++;
+		}
 
 		if (i < under_end && data[i] == ':') {
 			i++; (*column_data)[col] |= MKD_TABLE_ALIGN_R;
+			dashes++;
 		}
 
+		while (i < under_end && (data[i] == ' ' || data[i] == '\t'))
+			i++;
+
 		if (i < under_end && data[i] != '|')
 			break;
 
+		if (dashes < 3)
+			break;
+
 		i++;
 	}
 
@@ -2052,34 +2098,34 @@ ups_markdown(struct buf *ob, struct buf *ib, const struct mkd_renderer *rndrer,
 		rndr.active_char[i] = 0;
 
 	if (rndr.make.emphasis || rndr.make.double_emphasis || rndr.make.triple_emphasis) {
-		rndr.active_char['*'] = char_emphasis;
-		rndr.active_char['_'] = char_emphasis;
+		rndr.active_char['*'] = MD_CHAR_EMPHASIS;
+		rndr.active_char['_'] = MD_CHAR_EMPHASIS;
 		if (extensions & MKDEXT_STRIKETHROUGH)
-			rndr.active_char['~'] = char_emphasis;
+			rndr.active_char['~'] = MD_CHAR_EMPHASIS;
 	}
 
 	if (rndr.make.codespan)
-		rndr.active_char['`'] = char_codespan;
+		rndr.active_char['`'] = MD_CHAR_CODESPAN;
 
 	if (rndr.make.linebreak)
-		rndr.active_char['\n'] = char_linebreak;
+		rndr.active_char['\n'] = MD_CHAR_LINEBREAK;
 
 	if (rndr.make.image || rndr.make.link)
-		rndr.active_char['['] = char_link;
+		rndr.active_char['['] = MD_CHAR_LINK;
 
-	rndr.active_char['<'] = char_langle_tag;
-	rndr.active_char['\\'] = char_escape;
-	rndr.active_char['&'] = char_entity;
+	rndr.active_char['<'] = MD_CHAR_LANGLE;
+	rndr.active_char['\\'] = MD_CHAR_ESCAPE;
+	rndr.active_char['&'] = MD_CHAR_ENTITITY;
 
 	if (extensions & MKDEXT_AUTOLINK) {
-		rndr.active_char['h'] = char_autolink; // http, https
-		rndr.active_char['H'] = char_autolink;
+		rndr.active_char['h'] = MD_CHAR_AUTOLINK; // http, https
+		rndr.active_char['H'] = MD_CHAR_AUTOLINK;
 
-		rndr.active_char['f'] = char_autolink; // ftp
-		rndr.active_char['F'] = char_autolink;
+		rndr.active_char['f'] = MD_CHAR_AUTOLINK; // ftp
+		rndr.active_char['F'] = MD_CHAR_AUTOLINK;
 
-		rndr.active_char['m'] = char_autolink; // mailto
-		rndr.active_char['M'] = char_autolink;
+		rndr.active_char['m'] = MD_CHAR_AUTOLINK; // mailto
+		rndr.active_char['M'] = MD_CHAR_AUTOLINK;
 	}
 
 	/* Extension data */