redcarpet 1.12.2 → 1.13.0

data/Rakefile

@@ -1,5 +1,6 @@
 require 'date'
 require 'rake/clean'
+require 'rake/extensiontask'
 require 'digest/md5'
 
 task :default => :test
@@ -8,31 +9,7 @@ task :default => :test
 # Ruby Extension
 # ==========================================================
 
-DLEXT = Config::MAKEFILE_CONFIG['DLEXT']
-RUBYDIGEST = Digest::MD5.hexdigest(`#{RUBY} --version`)
-
-file "ext/ruby-#{RUBYDIGEST}" do |f|
-  rm_f FileList["ext/ruby-*"]
-  touch f.name
-end
-CLEAN.include "ext/ruby-*"
-
-file 'ext/Makefile' => FileList['ext/*.{c,h,rb}', "ext/ruby-#{RUBYDIGEST}"] do
-  chdir('ext') { ruby 'extconf.rb' }
-end
-CLEAN.include 'ext/Makefile', 'ext/mkmf.log'
-
-file "ext/redcarpet.#{DLEXT}" => FileList["ext/Makefile"] do |f|
-  sh 'cd ext && make clean && make && rm -rf conftest.dSYM'
-end
-CLEAN.include 'ext/*.{o,bundle,so,dll}'
-
-file "lib/redcarpet.#{DLEXT}" => "ext/redcarpet.#{DLEXT}" do |f|
-  cp f.prerequisites, "lib/", :preserve => true
-end
-
-desc 'Build the redcarpet extension'
-task :build => "lib/redcarpet.#{DLEXT}"
+Rake::ExtensionTask.new('redcarpet')
 
 # ==========================================================
 # Testing
@@ -43,10 +20,10 @@ Rake::TestTask.new('test:unit') do |t|
   t.test_files = FileList['test/*_test.rb']
   t.ruby_opts += ['-rubygems'] if defined? Gem
 end
-task 'test:unit' => [:build]
+task 'test:unit' => [:compile]
 
 desc 'Run conformance tests (MARKDOWN_TEST_VER=1.0)'
-task 'test:conformance' => [:build] do |t|
+task 'test:conformance' => [:compile] do |t|
   script = "#{pwd}/bin/redcarpet"
   test_version = ENV['MARKDOWN_TEST_VER'] || '1.0.3'
   lib_dir = "#{pwd}/lib"
@@ -56,13 +33,13 @@ task 'test:conformance' => [:build] do |t|
 end
 
 desc 'Run version 1.0 conformance suite'
-task 'test:conformance:1.0' => [:build] do |t|
+task 'test:conformance:1.0' => [:compile] do |t|
   ENV['MARKDOWN_TEST_VER'] = '1.0'
   Rake::Task['test:conformance'].invoke
 end
 
 desc 'Run 1.0.3 conformance suite'
-task 'test:conformance:1.0.3' => [:build] do |t|
+task 'test:conformance:1.0.3' => [:compile] do |t|
   ENV['MARKDOWN_TEST_VER'] = '1.0.3'
   Rake::Task['test:conformance'].invoke
 end
@@ -140,10 +117,11 @@ task :gather => 'upskirt/src/markdown.h' do |t|
     FileList[
       'upskirt/src/{markdown,buffer,array}.h',
       'upskirt/src/{markdown,buffer,array}.c',
-      'upskirt/render/xhtml.c',
-      'upskirt/render/xhtml.h',
+      'upskirt/render/html.c',
+      'upskirt/render/html_smartypants.c',
+      'upskirt/render/html.h',
     ]
-  cp files, 'ext/',
+  cp files, 'ext/redcarpet/',
     :preserve => true,
     :verbose => true
 end

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

@@ -23,6 +23,7 @@
  */
 
 #define BUFFER_STDARG
+#define BUFFER_MAX_ALLOC_SIZE (1024 * 1024 * 16) //16mb
 
 #include "buffer.h"
 
@@ -147,6 +148,25 @@ bufdup(const struct buf *src, size_t dupunit) {
 #endif
 	return ret; }
 
+/* bufgrow • increasing the allocated size to the given value */
+int
+bufgrow(struct buf *buf, size_t neosz) {
+	size_t neoasz;
+	void *neodata;
+	if (!buf || !buf->unit || neosz > BUFFER_MAX_ALLOC_SIZE) return 0;
+	if (buf->asize >= neosz) return 1;
+	neoasz = buf->asize + buf->unit;
+	while (neoasz < neosz) neoasz += buf->unit;
+	neodata = realloc(buf->data, neoasz);
+	if (!neodata) return 0;
+#ifdef BUFFER_STATS
+	buffer_stat_alloc_bytes += (neoasz - buf->asize);
+#endif
+	buf->data = neodata;
+	buf->asize = neoasz;
+	return 1; }
+
+
 /* bufnew • allocation of a new buffer */
 struct buf *
 bufnew(size_t unit) {
@@ -196,6 +216,14 @@ bufputs(struct buf *buf, const char *str) {
 	bufput(buf, str, strlen (str)); }
 
 
+/* bufputc • appends a single char to a buffer */
+void
+bufputc(struct buf *buf, char c) {
+	if (!buf || !bufgrow(buf, buf->size + 1)) return;
+	buf->data[buf->size] = c;
+	buf->size += 1; }
+
+
 /* bufrelease • decrease the reference count and free the buffer if needed */
 void
 bufrelease(struct buf *buf) {

data/ext/{buffer.h → redcarpet/buffer.h}

@@ -21,7 +21,6 @@
 
 #include <stddef.h>
 
-#define BUFFER_MAX_ALLOC_SIZE (1024 * 1024 * 16) /* 16mb */
 
 /********************
  * TYPE DEFINITIONS *
@@ -82,6 +81,10 @@ struct buf *
 bufdup(const struct buf *, size_t)
 	__attribute__ ((malloc));
 
+/* bufgrow • increasing the allocated size to the given value */
+int
+bufgrow(struct buf *, size_t);
+
 /* bufnew • allocation of a new buffer */
 struct buf *
 bufnew(size_t)
@@ -104,6 +107,10 @@ bufput(struct buf *, const void*, size_t);
 void
 bufputs(struct buf *, const char*);
 
+/* bufputc • appends a single char to a buffer */
+void
+bufputc(struct buf *, char);
+
 /* bufrelease • decrease the reference count and free the buffer if needed */
 void
 bufrelease(struct buf *);
@@ -135,33 +142,6 @@ vbufprintf(struct buf *, const char*, va_list);
 
 #endif /* def BUFFER_STDARG */
 
-#include <stdlib.h>
-
-/* bufgrow • increasing the allocated size to the given value */
-static inline int
-bufgrow(struct buf *buf, size_t neosz) {
-	size_t neoasz;
-	void *neodata;
-	if (!buf || !buf->unit || neosz > BUFFER_MAX_ALLOC_SIZE) return 0;
-	if (buf->asize >= neosz) return 1;
-	neoasz = buf->asize + buf->unit;
-	while (neoasz < neosz) neoasz += buf->unit;
-	neodata = realloc(buf->data, neoasz);
-	if (!neodata) return 0;
-#ifdef BUFFER_STATS
-	buffer_stat_alloc_bytes += (neoasz - buf->asize);
-#endif
-	buf->data = neodata;
-	buf->asize = neoasz;
-	return 1; }
-
-/* bufputc • appends a single char to a buffer */
-static inline void
-bufputc(struct buf *buf, char c) {
-	if (!buf || !bufgrow(buf, buf->size + 1)) return;
-	buf->data[buf->size] = c;
-	buf->size += 1; }
-
 #endif /* ndef LITHIUM_BUFFER_H */
 
 /* vim: set filetype=c: */

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

@@ -16,25 +16,21 @@
  */
 
 #include "markdown.h"
-#include "xhtml.h"
+#include "html.h"
 
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <ctype.h>
 
-struct xhtml_renderopt {
+struct html_renderopt {
 	struct {
 		int header_count;
 		int current_level;
 	} toc_data;
 
-	struct {
-		int in_squote;
-		int in_dquote;
-	} quotes;
-
 	unsigned int flags;
+	const char *close_tag;
 };
 
 static inline void
@@ -109,12 +105,12 @@ is_html_tag(struct buf *tag, const char *tagname)
 static int
 rndr_autolink(struct buf *ob, struct buf *link, enum mkd_autolink type, void *opaque)
 {
-	struct xhtml_renderopt *options = opaque;
+	struct html_renderopt *options = opaque;
 
 	if (!link || !link->size)
 		return 0;
 
-	if ((options->flags & XHTML_SAFELINK) != 0 &&
+	if ((options->flags & HTML_SAFELINK) != 0 &&
 		!is_safe_link(link->data, link->size) &&
 		type != MKDA_EMAIL)
 		return 0;
@@ -277,12 +273,12 @@ rndr_emphasis(struct buf *ob, struct buf *text, void *opaque)
 static void
 rndr_header(struct buf *ob, struct buf *text, int level, void *opaque)
 {
-	struct xhtml_renderopt *options = opaque;
+	struct html_renderopt *options = opaque;
 	
 	if (ob->size)
 		bufputc(ob, '\n');
 
-	if (options->flags & XHTML_TOC) {
+	if (options->flags & HTML_TOC) {
 		bufprintf(ob, "<a name=\"toc_%d\"></a>", options->toc_data.header_count++);
 	}
 
@@ -294,9 +290,9 @@ rndr_header(struct buf *ob, struct buf *text, int level, void *opaque)
 static int
 rndr_link(struct buf *ob, struct buf *link, struct buf *title, struct buf *content, void *opaque)
 {
-	struct xhtml_renderopt *options = opaque;
+	struct html_renderopt *options = opaque;
 	
-	if ((options->flags & XHTML_SAFELINK) != 0 && !is_safe_link(link->data, link->size))
+	if ((options->flags & HTML_SAFELINK) != 0 && !is_safe_link(link->data, link->size))
 		return 0;
 
 	BUFPUTSL(ob, "<a href=\"");
@@ -333,7 +329,7 @@ rndr_listitem(struct buf *ob, struct buf *text, int flags, void *opaque)
 static void
 rndr_paragraph(struct buf *ob, struct buf *text, void *opaque)
 {
-	struct xhtml_renderopt *options = opaque;
+	struct html_renderopt *options = opaque;
 	size_t i = 0;
 
 	if (ob->size) bufputc(ob, '\n');
@@ -347,7 +343,7 @@ rndr_paragraph(struct buf *ob, struct buf *text, void *opaque)
 		return;
 
 	BUFPUTSL(ob, "<p>");
-	if (options->flags & XHTML_HARD_WRAP) {
+	if (options->flags & HTML_HARD_WRAP) {
 		size_t org;
 		while (i < text->size) {
 			org = i;
@@ -360,17 +356,14 @@ rndr_paragraph(struct buf *ob, struct buf *text, void *opaque)
 			if (i >= text->size)
 				break;
 
-			BUFPUTSL(ob, "<br/>\n");
+			BUFPUTSL(ob, "<br");
+			bufputs(ob, options->close_tag);
 			i++;
 		}
 	} else {
 		bufput(ob, &text->data[i], text->size - i);
 	}
 	BUFPUTSL(ob, "</p>\n");
-
-	/* Close any open quotes at the end of the paragraph */
-	options->quotes.in_squote = 0;
-	options->quotes.in_dquote = 0;
 }
 
 static void
@@ -398,21 +391,19 @@ rndr_triple_emphasis(struct buf *ob, struct buf *text, void *opaque)
 	return 1;
 }
 
-
-/**********************
- * XHTML 1.0 RENDERER *
- **********************/
-
 static void
 rndr_hrule(struct buf *ob, void *opaque)
 {
+	struct html_renderopt *options = opaque;	
 	if (ob->size) bufputc(ob, '\n');
-	BUFPUTSL(ob, "<hr />\n");
+	BUFPUTSL(ob, "<hr");
+	bufputs(ob, options->close_tag);
 }
 
 static int
 rndr_image(struct buf *ob, struct buf *link, struct buf *title, struct buf *alt, void *opaque)
 {
+	struct html_renderopt *options = opaque;	
 	if (!link || !link->size) return 0;
 	BUFPUTSL(ob, "<img src=\"");
 	attr_escape(ob, link->data, link->size);
@@ -422,32 +413,36 @@ rndr_image(struct buf *ob, struct buf *link, struct buf *title, struct buf *alt,
 	if (title && title->size) {
 		BUFPUTSL(ob, "\" title=\"");
 		attr_escape(ob, title->data, title->size); }
-	BUFPUTSL(ob, "\" />");
+
+	bufputc(ob, '"');
+	bufputs(ob, options->close_tag);
 	return 1;
 }
 
 static int
 rndr_linebreak(struct buf *ob, void *opaque)
 {
-	BUFPUTSL(ob, "<br />\n");
+	struct html_renderopt *options = opaque;	
+	BUFPUTSL(ob, "<br");
+	bufputs(ob, options->close_tag);
 	return 1;
 }
 
 static int
 rndr_raw_html(struct buf *ob, struct buf *text, void *opaque)
 {
-	struct xhtml_renderopt *options = opaque;	
+	struct html_renderopt *options = opaque;	
 
-	if ((options->flags & XHTML_SKIP_HTML) != 0)
+	if ((options->flags & HTML_SKIP_HTML) != 0)
 		return 1;
 
-	if ((options->flags & XHTML_SKIP_STYLE) != 0 && is_html_tag(text, "style"))
+	if ((options->flags & HTML_SKIP_STYLE) != 0 && is_html_tag(text, "style"))
 		return 1;
 
-	if ((options->flags & XHTML_SKIP_LINKS) != 0 && is_html_tag(text, "a"))
+	if ((options->flags & HTML_SKIP_LINKS) != 0 && is_html_tag(text, "a"))
 		return 1;
 
-	if ((options->flags & XHTML_SKIP_IMAGES) != 0 && is_html_tag(text, "img"))
+	if ((options->flags & HTML_SKIP_IMAGES) != 0 && is_html_tag(text, "img"))
 		return 1;
 
 	bufput(ob, text->data, text->size);
@@ -504,92 +499,6 @@ rndr_tablecell(struct buf *ob, struct buf *text, int align, void *opaque)
 	BUFPUTSL(ob, "</td>");
 }
 
-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 },
-};
-
-#define SUBS_COUNT (sizeof(smartypants_subs) / sizeof(smartypants_subs[0]))
-
-static inline int
-word_boundary(char c)
-{
-	return isspace(c) || ispunct(c);
-}
-
-static int
-smartypants_cmpsub(const struct buf *buf, size_t start, const char *prefix)
-{
-	size_t i;
-
-	if (prefix[0] == '<') {
-		if (start == 0 || !word_boundary(buf->data[start - 1]))
-			return 0;
-
-		prefix++;
-	}
-
-	for (i = start; i < buf->size; ++i) {
-		char c, p;
-
-		c = tolower(buf->data[i]);
-		p = *prefix++;
-
-		if (p == 0)
-			return 1;
-
-		if (p == '>')
-			return word_boundary(c);
-
-		if (c != p)
-			return 0;
-	}
-
-	return (*prefix == '>');
-}
-
-static int
-smartypants_quotes(struct buf *ob, struct buf *text, size_t i, int is_open)
-{
-	char ent[8];
-
-	if (is_open && i + 1 < text->size && !word_boundary(text->data[i + 1]))
-		return 0;
-
-	if (!is_open && i > 0 && !word_boundary(text->data[i - 1]))
-		return 0;
-
-	snprintf(ent, sizeof(ent), "&%c%cquo;",
-		is_open ? 'r' : 'l',
-		text->data[i] == '\'' ? 's' : 'd');
-
-	bufputs(ob, ent);
-	return 1;
-}
-
 static void
 rndr_normal_text(struct buf *ob, struct buf *text, void *opaque)
 {
@@ -597,61 +506,10 @@ rndr_normal_text(struct buf *ob, struct buf *text, void *opaque)
 		attr_escape(ob, text->data, text->size);
 }
 
-static void
-rndr_smartypants(struct buf *ob, struct buf *text, void *opaque)
-{
-	struct xhtml_renderopt *options = opaque;
-	size_t i;
-
-	if (!text)
-		return;
-
-	for (i = 0; i < text->size; ++i) {
-		size_t sub;
-		char c = text->data[i];
-
-		for (sub = 0; sub < SUBS_COUNT; ++sub) {
-			if (c == smartypants_subs[sub].c0 &&
-				smartypants_cmpsub(text, i, smartypants_subs[sub].pattern)) {
-
-				if (smartypants_subs[sub].entity)
-					bufputs(ob, smartypants_subs[sub].entity);
-
-				i += smartypants_subs[sub].skip;
-				break;
-			}
-		}
-
-		if (sub < SUBS_COUNT)
-			continue;
-
-		switch (c) {
-		case '\"':
-			if (smartypants_quotes(ob, text, i, options->quotes.in_dquote)) {
-				options->quotes.in_dquote = !options->quotes.in_dquote;
-				continue;
-			}
-			break;
-
-		case '\'':
-			if (smartypants_quotes(ob, text, i, options->quotes.in_squote)) {
-				options->quotes.in_squote = !options->quotes.in_squote;
-				continue;
-			}
-			break;
-		}
-
-		/*
-		 * Copy raw character
-		 */
-		put_scaped_char(ob, c);
-	}
-}
-
 static void
 toc_header(struct buf *ob, struct buf *text, int level, void *opaque)
 {
-	struct xhtml_renderopt *options = opaque;
+	struct html_renderopt *options = opaque;
 
 	if (level > options->toc_data.current_level) {
 		if (level > 1)
@@ -676,7 +534,7 @@ toc_header(struct buf *ob, struct buf *text, int level, void *opaque)
 static void
 toc_finalize(struct buf *ob, void *opaque)
 {
-	struct xhtml_renderopt *options = opaque;
+	struct html_renderopt *options = opaque;
 
 	while (options->toc_data.current_level > 1) {
 		BUFPUTSL(ob, "</ul></li>\n");
@@ -688,7 +546,7 @@ toc_finalize(struct buf *ob, void *opaque)
 }
 
 void
-ups_toc_renderer(struct mkd_renderer *renderer)
+upshtml_toc_renderer(struct mkd_renderer *renderer)
 {
 	static const struct mkd_renderer toc_render = {
 		NULL,
@@ -723,17 +581,20 @@ ups_toc_renderer(struct mkd_renderer *renderer)
 		NULL
 	};
 
-	struct xhtml_renderopt *options;	
-	options = calloc(1, sizeof(struct xhtml_renderopt));
-	options->flags = XHTML_TOC;
+	struct html_renderopt *options;	
+	options = calloc(1, sizeof(struct html_renderopt));
+	options->flags = HTML_TOC;
 
 	memcpy(renderer, &toc_render, sizeof(struct mkd_renderer));
 	renderer->opaque = options;
 }
 
 void
-ups_xhtml_renderer(struct mkd_renderer *renderer, unsigned int render_flags)
+upshtml_renderer(struct mkd_renderer *renderer, unsigned int render_flags)
 {
+	static const char *xhtml_close = "/>\n";
+	static const char *html_close = ">\n";
+
 	static const struct mkd_renderer renderer_default = {
 		rndr_blockcode,
 		rndr_blockquote,
@@ -767,33 +628,31 @@ ups_xhtml_renderer(struct mkd_renderer *renderer, unsigned int render_flags)
 		NULL
 	};
 
-	struct xhtml_renderopt *options;	
-	options = calloc(1, sizeof(struct xhtml_renderopt));
+	struct html_renderopt *options;	
+	options = calloc(1, sizeof(struct html_renderopt));
 	options->flags = render_flags;
+	options->close_tag = (render_flags & HTML_USE_XHTML) ? xhtml_close : html_close;
 
 	memcpy(renderer, &renderer_default, sizeof(struct mkd_renderer));
 	renderer->opaque = options;
 
-	if (render_flags & XHTML_SKIP_IMAGES)
+	if (render_flags & HTML_SKIP_IMAGES)
 		renderer->image = NULL;
 
-	if (render_flags & XHTML_SKIP_LINKS) {
+	if (render_flags & HTML_SKIP_LINKS) {
 		renderer->link = NULL;
 		renderer->autolink = NULL;
 	}
 
-	if (render_flags & XHTML_SKIP_HTML)
+	if (render_flags & HTML_SKIP_HTML)
 		renderer->blockhtml = NULL;
 
-	if (render_flags & XHTML_SMARTYPANTS)
-		renderer->normal_text = rndr_smartypants;
-
-	if (render_flags & XHTML_GITHUB_BLOCKCODE)
+	if (render_flags & HTML_GITHUB_BLOCKCODE)
 		renderer->blockcode = rndr_blockcode_github;
 }
 
 void
-ups_free_renderer(struct mkd_renderer *renderer)
+upshtml_free_renderer(struct mkd_renderer *renderer)
 {
 	free(renderer->opaque);
 }