tight-redcarpet 3.1.1 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e9e24786ab824e442074458d6b37acc2f5cca468
-  data.tar.gz: 3e99a9c16cdb6e9b8c373088f38936e9c463654a
+  metadata.gz: 0d789e647d9d2bfdd99bff901a26d1fe0513acfb
+  data.tar.gz: e980f2395afd5e731b7ffbfaa18701c627458bb1
 SHA512:
-  metadata.gz: 6da988577142c15cc12fc677fbce214d1356b3ec88b417727a42ec33d35921eba26445299b7f4821602c5afae32dcc339b9ebb5af1b397c8a36cf14cd7610e64
-  data.tar.gz: 1c1ca54286878e014e2280baea35b6030a4a97bbb2870f89c6f4225e76285b3fb0f21f0b6edfbaa95fa4460013ac997b08b4e42836fa592fc60d97086ffdb817
+  metadata.gz: aa7805caaf2ce5bd875e89c9bd723c5ffdfc34e7ce53355619af0c89f472d4c6eef5bb48c37591d3ef6d269a01e125d134879d6fd022bf76f7f255f9bf866c5b
+  data.tar.gz: 350f45ef2e36f7ab9ffb30e5664ab706bcce18e5710d31ac11b905bfe7702e1c99a31fc6599a0ec583fa3099ada9d4327cb93f844de445ed158025f69213e63e

data/README.markdown

@@ -3,7 +3,7 @@ Redcarpet is written with sugar, spice and everything nice
 
 [![Build Status](https://travis-ci.org/vmg/redcarpet.svg?branch=master)](https://travis-ci.org/vmg/redcarpet)
 
-Redcarpet is Ruby library for Markdown processing that smells like
+Redcarpet is a Ruby library for Markdown processing that smells like
 butterflies and popcorn.
 
 This library is written by people
@@ -78,8 +78,8 @@ be added at the end of the opening fence for the code block.
 
 * `:autolink`: parse links even when they are not enclosed in `<>`
 characters. Autolinks for the http, https and ftp protocols will be
-automatically detected. Email addresses are also handled, and http
-links without protocol, but starting with `www`.
+automatically detected. Email addresses and http links without protocol,
+but starting with `www` are also handled.
 
 * `:disable_indented_code_blocks`: do not parse usual markdown
 code blocks. Markdown converts text with four spaces at
@@ -220,8 +220,9 @@ The following instance methods may be implemented by the renderer:
 ### Block-level calls
 
 If the return value of the method is `nil`, the block will be skipped.
-If the method for a document element is not implemented, the block will
-be skipped.
+Therefore, make sure that your renderer has at least a `paragraph` method
+implemented. If the method for a document element is not implemented, the
+block will be skipped.
 
 Example:
 
@@ -270,9 +271,9 @@ be copied verbatim:
 * footnote_ref(number)
 
 **Note**: When overriding a renderer's method, be sure to return a HTML
-element with a level that match the level of that method (e.g. return a block
-element when overriding a block-level callback). Otherwise, the output may
-be unexpected.
+element with a level that matches the level of that method (e.g. return a
+block element when overriding a block-level callback). Otherwise, the output
+may be unexpected.
 
 ### Low level rendering
 
@@ -371,7 +372,7 @@ monkeypatches the Markdown class, you're a terrible human being. Just saying.
 Boring legal stuff
 ------------------
 
-Copyright (c) 2011-2013, Vicent Martí
+Copyright (c) 2011-2014, Vicent Martí
 
 Permission to use, copy, modify, and/or distribute this software for any
 purpose with or without fee is hereby granted, provided that the above

data/Rakefile

@@ -27,13 +27,13 @@ end
 
 task 'test:unit' => :compile
 
-desc 'Run conformance tests (MARKDOWN_TEST_VER=1.0)'
+desc 'Run conformance tests (MARKDOWN_TEST_VER=1.0.3)'
 task 'test:conformance' => :compile do |t|
-  script = "#{pwd}/bin/redcarpet"
-  test_version = ENV['MARKDOWN_TEST_VER'] || '1.0.3'
+  script  = "#{pwd}/bin/redcarpet"
+  version = ENV['MARKDOWN_TEST_VER'] || '1.0.3'
   lib_dir = "#{pwd}/lib"
 
-  chdir("test/MarkdownTest_#{test_version}") do
+  chdir("test/MarkdownTest_#{version}") do
     sh "RUBYLIB=#{lib_dir} ./MarkdownTest.pl --script='#{script}' --tidy"
   end
 end

data/ext/redcarpet/buffer.c

@@ -94,7 +94,7 @@ bufnew(size_t unit)
 
 /* bufnullterm: NULL-termination of the string array */
 const char *
-bufcstr(struct buf *buf)
+bufcstr(const struct buf *buf)
 {
 	assert(buf && buf->unit);
 

data/ext/redcarpet/buffer.h

@@ -55,7 +55,7 @@ int bufgrow(struct buf *, size_t);
 struct buf *bufnew(size_t) __attribute__ ((malloc));
 
 /* bufnullterm: NUL-termination of the string array (making a C-string) */
-const char *bufcstr(struct buf *);
+const char *bufcstr(const struct buf *);
 
 /* bufprefix: compare the beginning of a buffer with a string */
 int bufprefix(const struct buf *buf, const char *prefix);

data/ext/redcarpet/html.c

@@ -17,7 +17,6 @@
 
 #include "markdown.h"
 #include "html.h"
-#include "ruby.h"
 #include <string.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -125,7 +124,7 @@ rndr_blockcode(struct buf *ob, const struct buf *text, const struct buf *lang, v
 	if (lang && lang->size) {
 		size_t i, cls;
 		if (options->flags & HTML_PRETTIFY) {
-			BUFPUTSL(ob, "<pre><code class=\"prettyprint ");
+			BUFPUTSL(ob, "<pre><code class=\"prettyprint lang-");
 			cls++;
 		} else {
 			BUFPUTSL(ob, "<pre><code class=\"");
@@ -265,17 +264,51 @@ rndr_linebreak(struct buf *ob, void *opaque)
 	return 1;
 }
 
-char *header_anchor(struct buf *text)
+char *header_anchor(const struct buf *buffer)
 {
-	VALUE str = rb_str_new2(bufcstr(text));
-	VALUE space_regex = rb_reg_new(" +", 2 /* length */, 0);
-	VALUE tags_regex = rb_reg_new("<\\/?[^>]*>", 10, 0);
+	size_t i, j, k, size = buffer->size;
 
-	VALUE heading = rb_funcall(str, rb_intern("gsub"), 2, space_regex, rb_str_new2("-"));
-	heading = rb_funcall(heading, rb_intern("gsub"), 2, tags_regex, rb_str_new2(""));
-	heading = rb_funcall(heading, rb_intern("downcase"), 0);
+	char text[size];
+	strcpy(text, bufcstr(buffer));
 
-	return StringValueCStr(heading);
+	char raw_string[size];
+
+	/* Strip down the inline HTML markup if needed */
+	if (strchr(text, '<') < strchr(text, '>')) {
+		char* part = strtok(text, "<>");
+
+		/* Once every two times, the yielded token is the
+		   content of a HTML tag so we don't need to copy it */
+		for (k = 0; part != NULL; k++) {
+			if (k == 0)
+				strcpy(raw_string, part);
+			else if (k % 2 == 0)
+				strcat(raw_string, part);
+
+			part = strtok(NULL, "<>");
+		}
+
+		size = strlen(raw_string);
+	} else {
+		strcpy(raw_string, text);
+	}
+
+	char* heading = malloc(size * sizeof(char));
+
+	/* Dasherize the string removing extra white spaces
+	   and stripped chars */
+	for (i = 0, j = 0; i < size; ++i, ++j) {
+		while (STRIPPED_CHAR(raw_string[i]) && STRIPPED_CHAR(raw_string[i+1]))
+			i++;
+
+		if (STRIPPED_CHAR(raw_string[i]))
+			heading[j] = '-';
+		else
+			heading[j] = tolower(raw_string[i]);
+	}
+
+	heading[j++] = '\0';
+	return heading;
 }
 
 static void
@@ -395,15 +428,30 @@ rndr_paragraph(struct buf *ob, const struct buf *text, void *opaque)
 static void
 rndr_raw_block(struct buf *ob, const struct buf *text, void *opaque)
 {
-	size_t org, sz;
-	if (!text) return;
-	sz = text->size;
-	while (sz > 0 && text->data[sz - 1] == '\n') sz--;
-	org = 0;
-	while (org < sz && text->data[org] == '\n') org++;
-	if (org >= sz) return;
-	if (ob->size) bufputc(ob, '\n');
-	bufput(ob, text->data + org, sz - org);
+	size_t org, size;
+	struct html_renderopt *options = opaque;
+
+	if (!text)
+		return;
+
+	size = text->size;
+	while (size > 0 && text->data[size - 1] == '\n')
+		size--;
+
+	for (org = 0; org < size && text->data[org] == '\n'; ++org)
+
+	if (org >= size)
+		return;
+
+	/* Remove style tags if the `:no_styles` option is enabled */
+	if ((options->flags & HTML_SKIP_STYLE) != 0 &&
+		sdhtml_is_tag(text->data, size, "style"))
+		return;
+
+	if (ob->size)
+		bufputc(ob, '\n');
+
+	bufput(ob, text->data + org, size - org);
 	bufputc(ob, '\n');
 }
 
@@ -429,7 +477,9 @@ static int
 rndr_image(struct buf *ob, const struct buf *link, const struct buf *title, const struct buf *alt, void *opaque)
 {
 	struct html_renderopt *options = opaque;
-	if (!link || !link->size) return 0;
+
+	if (link != NULL && (options->flags & HTML_SAFELINK) != 0 && !sd_autolink_issafe(link->data, link->size))
+		return 0;
 
 	BUFPUTSL(ob, "<img src=\"");
 	escape_href(ob, link->data, link->size);
@@ -452,7 +502,7 @@ rndr_raw_html(struct buf *ob, const struct buf *text, void *opaque)
 	struct html_renderopt *options = opaque;
 
 	/* HTML_ESCAPE overrides SKIP_HTML, SKIP_STYLE, SKIP_LINKS and SKIP_IMAGES
-	* It doens't see if there are any valid tags, just escape all of them. */
+	   It doesn't see if there are any valid tags, just escape all of them. */
 	if((options->flags & HTML_ESCAPE) != 0) {
 		escape_html(ob, text->data, text->size);
 		return 1;
@@ -636,7 +686,14 @@ toc_header(struct buf *ob, const struct buf *text, int level, void *opaque)
 		}
 
 		bufprintf(ob, "<a href=\"#%s\">", header_anchor(text));
-		if (text) escape_html(ob, text->data, text->size);
+
+		if (text) {
+			if (options->flags & HTML_ESCAPE)
+				escape_html(ob, text->data, text->size);
+			else
+				bufput(ob, text->data, text->size);
+		}
+
 		BUFPUTSL(ob, "</a>\n");
 	}
 }
@@ -661,7 +718,7 @@ toc_finalize(struct buf *ob, void *opaque)
 }
 
 void
-sdhtml_toc_renderer(struct sd_callbacks *callbacks, struct html_renderopt *options, int nesting_level)
+sdhtml_toc_renderer(struct sd_callbacks *callbacks, struct html_renderopt *options, unsigned int render_flags)
 {
 	static const struct sd_callbacks cb_default = {
 		NULL,
@@ -702,8 +759,7 @@ sdhtml_toc_renderer(struct sd_callbacks *callbacks, struct html_renderopt *optio
 	};
 
 	memset(options, 0x0, sizeof(struct html_renderopt));
-	options->flags = HTML_TOC;
-	options->toc_data.nesting_level = nesting_level;
+	options->flags = render_flags;
 
 	memcpy(callbacks, &cb_default, sizeof(struct sd_callbacks));
 }

data/ext/redcarpet/html.h

@@ -65,11 +65,17 @@ extern void
 sdhtml_renderer(struct sd_callbacks *callbacks, struct html_renderopt *options_ptr, unsigned int render_flags);
 
 extern void
-sdhtml_toc_renderer(struct sd_callbacks *callbacks, struct html_renderopt *options_ptr, int nesting_level);
+sdhtml_toc_renderer(struct sd_callbacks *callbacks, struct html_renderopt *options_ptr, unsigned int render_flags);
 
 extern void
 sdhtml_smartypants(struct buf *ob, const uint8_t *text, size_t size);
 
+/* header method used internally in Redcarpet */
+char *header_anchor(const struct buf *buffer);
+
+#define STRIPPED_CHARS " -&+$,/:;=?@\"#{}|^~[]`\\*()%.!'"
+#define STRIPPED_CHAR(x) (strchr(STRIPPED_CHARS, x) != NULL)
+
 #ifdef __cplusplus
 }
 #endif

data/ext/redcarpet/html_blocks.h

@@ -1,5 +1,6 @@
-/* C code produced by gperf version 3.0.3 */
+/* C code produced by gperf version 3.0.4 */
 /* Command-line: gperf -N find_block_tag -H hash_block_tag -C -c -E --ignore-case html_block_names.txt  */
+/* See http://git.io/RN0ncw for the list of recognized elements */
 /* Computed positions: -k'1-2' */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
@@ -29,7 +30,7 @@
 error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
 #endif
 
-/* maximum key range = 37, duplicates = 0 */
+/* maximum key range = 67, duplicates = 0 */
 
 #ifndef GPERF_DOWNCASE
 #define GPERF_DOWNCASE 1
@@ -93,32 +94,32 @@ hash_block_tag (str, len)
 {
   static const unsigned char asso_values[] =
     {
-      38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
-      38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
-      38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
-      38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
-      38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
-       8, 30, 25, 20, 15, 10, 38, 38, 38, 38,
-      38, 38, 38, 38, 38, 38,  0, 38,  0, 38,
-       5,  5,  5, 15,  0, 38, 38,  0, 15, 10,
-       0, 38, 38, 15,  0,  5, 38, 38, 38, 38,
-      38, 38, 38, 38, 38, 38, 38, 38,  0, 38,
-       0, 38,  5,  5,  5, 15,  0, 38, 38,  0,
-      15, 10,  0, 38, 38, 15,  0,  5, 38, 38,
-      38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
-      38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
-      38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
-      38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
-      38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
-      38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
-      38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
-      38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
-      38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
-      38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
-      38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
-      38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
-      38, 38, 38, 38, 38, 38, 38, 38, 38, 38,
-      38, 38, 38, 38, 38, 38, 38
+      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
+      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
+      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
+      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
+      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
+      55, 50, 45, 40, 35, 30, 68, 68, 68, 68,
+      68, 68, 68, 68, 68, 15, 10, 15, 15, 15,
+       0, 20, 10, 10,  5, 68, 68,  0, 20, 25,
+       0, 68, 68,  0, 25,  0, 15, 68, 68, 68,
+      68, 68, 68, 68, 68, 68, 68, 15, 10, 15,
+      15, 15,  0, 20, 10, 10,  5, 68, 68,  0,
+      20, 25,  0, 68, 68,  0, 25,  0, 15, 68,
+      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
+      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
+      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
+      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
+      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
+      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
+      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
+      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
+      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
+      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
+      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
+      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
+      68, 68, 68, 68, 68, 68, 68, 68, 68, 68,
+      68, 68, 68, 68, 68, 68, 68
     };
   register int hval = len;
 
@@ -136,7 +137,7 @@ hash_block_tag (str, len)
 
 #ifdef __GNUC__
 __inline
-#ifdef __GNUC_STDC_INLINE__
+#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
 __attribute__ ((__gnu_inline__))
 #endif
 #endif
@@ -147,47 +148,69 @@ find_block_tag (str, len)
 {
   enum
     {
-      TOTAL_KEYWORDS = 24,
+      TOTAL_KEYWORDS = 41,
       MIN_WORD_LENGTH = 1,
       MAX_WORD_LENGTH = 10,
       MIN_HASH_VALUE = 1,
-      MAX_HASH_VALUE = 37
+      MAX_HASH_VALUE = 67
     };
 
   static const char * const wordlist[] =
     {
       "",
       "p",
-      "dl",
-      "div",
-      "math",
-      "table",
-      "",
       "ul",
-      "del",
+      "pre",
       "form",
-      "blockquote",
+      "style",
+      "footer",
+      "section",
+      "", "", "",
       "figure",
-      "ol",
+      "hr",
       "fieldset",
+      "math",
+      "figcaption",
+      "header",
+      "dl",
+      "del",
       "",
-      "h1",
+      "blockquote",
+      "script",
+      "article",
+      "div",
+      "",
+      "video",
+      "hgroup",
+      "ol",
+      "noscript",
+      "", "",
+      "canvas",
+      "dd",
+      "nav",
+      "abbr",
+      "audio",
+      "iframe",
+      "address",
+      "ins",
+      "",
+      "table",
       "",
       "h6",
-      "pre",
       "", "",
-      "script",
+      "aside",
+      "output",
       "h5",
-      "noscript",
+      "", "",
+      "tfoot",
       "",
-      "style",
-      "iframe",
       "h4",
-      "ins",
-      "", "", "",
+      "", "", "", "",
       "h3",
       "", "", "", "",
-      "h2"
+      "h2",
+      "", "", "", "",
+      "h1"
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)