redcarpet 2.0.0b5 → 2.0.0

data/README.markdown

@@ -142,7 +142,7 @@ instantiating the renderer:
         :safe_links_only - only generate links for protocols which are considered safe
 
         :with_toc_data - add HTML anchors to each header in the output HTML,
-            to allow liking to each section.
+            to allow linking to each section.
 
         :hard_wrap - insert HTML `<br>` tags inside on paragraphs where the origin
             Markdown document had newlines (by default, Markdown ignores these
@@ -283,6 +283,34 @@ SmartyPants works on top of already-rendered HTML, and will ignore replacements
 inside the content of HTML tags and inside specific HTML blocks such as 
 `<code>` or `<pre>`.
 
+What? You really want to mix Markdown renderers?
+------------------------------------------------
+
+What a terrible idea! Markdown is already ill-specified enough; if you create
+software that is renderer-independent, the results will be completely unreliable!
+
+Each renderer has its own API and its own set of extensions: you should choose one
+(it doesn't have to be Redcarpet, though that would be great!), write your
+software accordingly, and force your users to install it. That's the
+only way to have reliable and predictable Markdown output on your program.
+
+Still, if major forces (let's say, tornadoes or other natural disasters) force you
+to keep a Markdown-compatibility later, Redcarpet also supports this:
+
+    require 'redcarpet/compat'
+
+Requiring the compatibility library will declare a `Markdown` class with the
+classical RedCloth API, e.g.
+
+    Markdown.new('this is my text').to_html
+
+This class renders 100% standards compliant Markdown with 0 extensions. Nada.
+Don't even try to enable extensions with a compatibility layer, because
+that's a maintance nightmare and won't work.
+
+On a related topic: if your Markdown gem has a `lib/markdown.rb` file that
+monkeypatches the Markdown class, you're a terrible human being. Just saying.
+
 Boring legal stuff
 ------------------
 

data/ext/redcarpet/autolink.c

@@ -24,9 +24,9 @@
 int
 sd_autolink_issafe(const uint8_t *link, size_t link_len)
 {
-	static const size_t valid_uris_count = 4;
+	static const size_t valid_uris_count = 5;
 	static const char *valid_uris[] = {
-		"http://", "https://", "ftp://", "mailto://"
+		"/", "http://", "https://", "ftp://", "mailto:"
 	};
 
 	size_t i;
@@ -140,10 +140,9 @@ check_domain(uint8_t *data, size_t size)
 		else if (!isalnum(data[i]) && data[i] != '-') break;
 	}
 
-	if (!isalnum(data[i - 1]) || np == 0)
-		return 0;
-
-	return i;
+	/* a valid domain needs to have at least a dot.
+	 * that's as far as we get */
+	return np ? i : 0;
 }
 
 size_t

data/ext/redcarpet/buffer.c

@@ -113,9 +113,35 @@ bufprintf(struct buf *buf, const char *fmt, ...)
 	if (!buf || !buf->unit)
 		return;
 
+	int n;
+
+	if (buf == 0 || (buf->size >= buf->asize && bufgrow(buf, buf->size + 1)) < 0)
+		return;
+	
 	va_start(ap, fmt);
-	vbufprintf(buf, fmt, ap);
+	n = _buf_vsnprintf((char *)buf->data + buf->size, buf->asize - buf->size, fmt, ap);
 	va_end(ap);
+
+	if (n < 0) {
+#ifdef _MSC_VER
+		n = _vscprintf(fmt, ap);
+#else
+		return;
+#endif
+	}
+
+	if ((size_t)n >= buf->asize - buf->size) {
+		if (bufgrow(buf, buf->size + n + 1) < 0)
+			return;
+		va_start(ap, fmt);
+		n = _buf_vsnprintf((char *)buf->data + buf->size, buf->asize - buf->size, fmt, ap);
+		va_end(ap);
+	}
+
+	if (n < 0)
+		return;
+
+	buf->size += n;
 }
 
 /* bufput: appends raw data to a buffer */
@@ -198,31 +224,6 @@ bufslurp(struct buf *buf, size_t len)
 void
 vbufprintf(struct buf *buf, const char *fmt, va_list ap)
 {
-	int n;
 
-	if (buf == 0 || (buf->size >= buf->asize && bufgrow(buf, buf->size + 1)) < 0)
-		return;
-
-	n = _buf_vsnprintf((char *)buf->data + buf->size, buf->asize - buf->size, fmt, ap);
-
-	if (n < 0) {
-#ifdef _MSC_VER
-		n = _vscprintf(fmt, ap);
-#else
-		return;
-#endif
-	}
-
-	if ((size_t)n >= buf->asize - buf->size) {
-		if (bufgrow(buf, buf->size + n + 1) < 0)
-			return;
-
-		n = _buf_vsnprintf((char *)buf->data + buf->size, buf->asize - buf->size, fmt, ap);
-	}
-
-	if (n < 0)
-		return;
-
-	buf->size += n;
 }
 

data/ext/redcarpet/buffer.h

@@ -15,8 +15,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#ifndef __GEN_BUFFER_H__
-#define __GEN_BUFFER_H__
+#ifndef BUFFER_H__
+#define BUFFER_H__
 
 #include <stddef.h>
 #include <stdarg.h>
@@ -85,7 +85,4 @@ void bufslurp(struct buf *, size_t);
 /* bufprintf: formatted printing to a buffer */
 void bufprintf(struct buf *, const char *, ...) __attribute__ ((format (printf, 2, 3)));
 
-/* vbufprintf: stdarg variant of formatted printing into a buffer */
-void vbufprintf(struct buf *, const char * , va_list);
-
 #endif

data/ext/redcarpet/houdini.h

@@ -1,5 +1,5 @@
-#ifndef __HOUDINI_H__
-#define __HOUDINI_H__
+#ifndef HOUDINI_H__
+#define HOUDINI_H__
 
 #include "buffer.h"
 
@@ -17,6 +17,7 @@
 extern void houdini_escape_html(struct buf *ob, const uint8_t *src, size_t size);
 extern void houdini_escape_html0(struct buf *ob, const uint8_t *src, size_t size, int secure);
 extern void houdini_unescape_html(struct buf *ob, const uint8_t *src, size_t size);
+extern void houdini_escape_xml(struct buf *ob, const uint8_t *src, size_t size);
 extern void houdini_escape_uri(struct buf *ob, const uint8_t *src, size_t size);
 extern void houdini_escape_url(struct buf *ob, const uint8_t *src, size_t size);
 extern void houdini_escape_href(struct buf *ob, const uint8_t *src, size_t size);

data/ext/redcarpet/houdini_html_e.c

@@ -49,7 +49,7 @@ static const char *HTML_ESCAPES[] = {
 void
 houdini_escape_html0(struct buf *ob, const uint8_t *src, size_t size, int secure)
 {
-	size_t  i = 0, org, esc;
+	size_t i = 0, org, esc = 0;
 
 	bufgrow(ob, ESCAPE_GROW_FACTOR(size));
 

data/ext/redcarpet/html_blocks.h

@@ -147,7 +147,7 @@ find_block_tag (str, len)
 {
   enum
     {
-      TOTAL_KEYWORDS = 23,
+      TOTAL_KEYWORDS = 24,
       MIN_WORD_LENGTH = 1,
       MAX_WORD_LENGTH = 10,
       MIN_HASH_VALUE = 1,
@@ -179,7 +179,8 @@ find_block_tag (str, len)
       "script",
       "h5",
       "noscript",
-      "", "",
+      "",
+      "style",
       "iframe",
       "h4",
       "ins",

data/ext/redcarpet/html_smartypants.c

@@ -264,8 +264,10 @@ smartypants_cb__dquote(struct buf *ob, struct smartypants_data *smrt, uint8_t pr
 static size_t
 smartypants_cb__ltag(struct buf *ob, struct smartypants_data *smrt, uint8_t previous_char, const uint8_t *text, size_t size)
 {
-	static const char *skip_tags[] = {"pre", "code", "kbd", "script"};
-	static const size_t skip_tags_count = 4;
+	static const char *skip_tags[] = {
+	  "pre", "code", "var", "samp", "kbd", "math", "script", "style"
+	};
+	static const size_t skip_tags_count = 8;
 
 	size_t tag, i = 0;
 

data/ext/redcarpet/markdown.c

@@ -111,6 +111,7 @@ struct sd_markdown {
 	struct stack work_bufs[2];
 	unsigned int ext_flags;
 	size_t max_nesting;
+	int in_link_body;
 };
 
 /***************************
@@ -372,7 +373,6 @@ parse_inline(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t siz
 		if (end >= size) break;
 		i = end;
 
-		/* calling the trigger */
 		end = markdown_char_ptrs[(int)action](ob, rndr, data + i, i, size - i);
 		if (!end) /* no action from the callback */
 			end = i + 1;
@@ -425,7 +425,6 @@ find_emph_char(uint8_t *data, size_t size, uint8_t c)
 			}
 
 			if (i >= size) return tmp_i;
-			i++;
 		}
 		/* skipping a link */
 		else if (data[i] == '[') {
@@ -682,7 +681,7 @@ char_codespan(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t of
 static size_t
 char_escape(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t offset, size_t size)
 {
-	static const char *escape_chars = "\\`*_{}[]()#+-.!:|&<>";
+	static const char *escape_chars = "\\`*_{}[]()#+-.!:|&<>^~";
 	struct buf work = { 0, 0, 0, 0 };
 
 	if (size > 1) {
@@ -758,10 +757,10 @@ char_langle_tag(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t
 static size_t
 char_autolink_www(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t offset, size_t size)
 {
-	struct buf *link, *link_url;
+	struct buf *link, *link_url, *link_text;
 	size_t link_len, rewind;
 
-	if (!rndr->cb.link)
+	if (!rndr->cb.link || rndr->in_link_body)
 		return 0;
 
 	link = rndr_newbuf(rndr, BUFFER_SPAN);
@@ -772,7 +771,14 @@ char_autolink_www(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_
 		bufput(link_url, link->data, link->size);
 
 		ob->size -= rewind;
-		rndr->cb.link(ob, link_url, NULL, link, rndr->opaque);
+		if (rndr->cb.normal_text) {
+			link_text = rndr_newbuf(rndr, BUFFER_SPAN);
+			rndr->cb.normal_text(link_text, link, rndr->opaque);
+			rndr->cb.link(ob, link_url, NULL, link_text, rndr->opaque);
+			rndr_popbuf(rndr, BUFFER_SPAN);
+		} else {
+			rndr->cb.link(ob, link_url, NULL, link, rndr->opaque);
+		}
 		rndr_popbuf(rndr, BUFFER_SPAN);
 	}
 
@@ -786,7 +792,7 @@ char_autolink_email(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, siz
 	struct buf *link;
 	size_t link_len, rewind;
 
-	if (!rndr->cb.autolink)
+	if (!rndr->cb.autolink || rndr->in_link_body)
 		return 0;
 
 	link = rndr_newbuf(rndr, BUFFER_SPAN);
@@ -806,7 +812,7 @@ char_autolink_url(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_
 	struct buf *link;
 	size_t link_len, rewind;
 
-	if (!rndr->cb.autolink)
+	if (!rndr->cb.autolink || rndr->in_link_body)
 		return 0;
 
 	link = rndr_newbuf(rndr, BUFFER_SPAN);
@@ -832,6 +838,7 @@ char_link(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t offset
 	struct buf *u_link = 0;
 	size_t org_work_size = rndr->work_bufs[BUFFER_SPAN].size;
 	int text_has_nl = 0, ret = 0;
+	int in_title = 0, qtype = 0;
 
 	/* checking whether the correct renderer exists */
 	if ((is_img && !rndr->cb.image) || (!is_img && !rndr->cb.link))
@@ -888,12 +895,15 @@ char_link(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t offset
 
 		/* looking for title end if present */
 		if (data[i] == '\'' || data[i] == '"') {
+			qtype = data[i];
+			in_title = 1;
 			i++;
 			title_b = i;
 
 			while (i < size) {
 				if (data[i] == '\\') i += 2;
-				else if (data[i] == ')') break;
+				else if (data[i] == qtype) {in_title = 0; i++;}
+				else if ((data[i] == ')') && !in_title) break;
 				else i++;
 			}
 
@@ -1019,8 +1029,15 @@ char_link(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t offset
 	/* building content: img alt is escaped, link content is parsed */
 	if (txt_e > 1) {
 		content = rndr_newbuf(rndr, BUFFER_SPAN);
-		if (is_img) bufput(content, data + 1, txt_e - 1);
-		else parse_inline(content, rndr, data + 1, txt_e - 1);
+		if (is_img) {
+			bufput(content, data + 1, txt_e - 1);
+		} else {
+			/* disable autolinking when parsing inline the
+			 * content of a link */
+			rndr->in_link_body = 1;
+			parse_inline(content, rndr, data + 1, txt_e - 1);
+			rndr->in_link_body = 0;
+		}
 	}
 
 	if (link) {
@@ -1558,6 +1575,7 @@ parse_listitem(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t s
 	struct buf *work = 0, *inter = 0;
 	size_t beg = 0, end, pre, sublist = 0, orgpre = 0, i;
 	int in_empty = 0, has_inside_empty = 0;
+	int has_next_uli, has_next_oli;
 
 	/* keeping track of the first indentation prefix */
 	while (orgpre < 3 && orgpre < size && data[orgpre] == ' ')
@@ -1604,10 +1622,20 @@ parse_listitem(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t s
 
 		pre = i;
 
+		has_next_uli = prefix_uli(data + beg + i, end - beg - i);
+		has_next_oli = prefix_oli(data + beg + i, end - beg - i);
+
+		/* checking for ul/ol switch */
+		if (in_empty && (
+					((*flags & MKD_LIST_ORDERED) && has_next_uli) ||
+					(!(*flags & MKD_LIST_ORDERED) && has_next_oli)
+			)){
+			*flags |= MKD_LI_END;
+			break; /* the following item must have same list type */
+		}
+
 		/* checking for a new item */
-		if ((prefix_uli(data + beg + i, end - beg - i) &&
-			!is_hrule(data + beg + i, end - beg - i)) ||
-			prefix_oli(data + beg + i, end - beg - i)) {
+		if ((has_next_uli && !is_hrule(data + beg + i, end - beg - i)) || has_next_oli) {
 			if (in_empty)
 				has_inside_empty = 1;
 
@@ -2325,6 +2353,7 @@ sd_markdown_new(
 	md->ext_flags = extensions;
 	md->opaque = opaque;
 	md->max_nesting = max_nesting;
+	md->in_link_body = 0;
 
 	return md;
 }

data/ext/redcarpet/redcarpet.h

@@ -1,5 +1,5 @@
-#ifndef __REDCARPET_H__
-#define __REDCARPET_H__
+#ifndef REDCARPET_H__
+#define REDCARPET_H__
 
 #define RSTRING_NOT_MODIFIED
 #include "ruby.h"

data/ext/redcarpet/stack.h

@@ -1,5 +1,5 @@
-#ifndef __CR_STACK_H__
-#define __CR_STACK_H__
+#ifndef STACK_H__
+#define STACK_H__
 
 #include <stdlib.h>
 

data/lib/redcarpet.rb

@@ -53,3 +53,21 @@ module Redcarpet
   end
 end
 
+# Compatibility class;
+# Creates a instance of Redcarpet with the RedCloth
+# API. This instance has no extensions enabled whatsoever,
+# and no accessors to change this. 100% pure, standard
+# Markdown.
+class RedcarpetCompat
+  attr_accessor :text
+
+  def initialize(text, *_dummy)
+    @text = text
+    @markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML)
+  end
+
+  def to_html(*_dummy)
+    @markdown.render(@text)
+  end
+end
+

data/redcarpet.gemspec

@@ -1,7 +1,7 @@
 # encoding: utf-8
 Gem::Specification.new do |s|
   s.name = 'redcarpet'
-  s.version = '2.0.0b5'
+  s.version = '2.0.0'
   s.summary = "Markdown that smells nice"
   s.description = 'A fast, safe and extensible Markdown to (X)HTML parser'
   s.date = '2011-09-14'

data/test/redcarpet_test.rb

@@ -91,7 +91,6 @@ class HTMLRenderTest < Test::Unit::TestCase
     rd = render_with(@rndr[:safe_links], "[IRC](irc://chat.freenode.org/#freenode)")
     html_equal "<p>[IRC](irc://chat.freenode.org/#freenode)</p>\n", rd
   end
-
 end
 
 class MarkdownTest < Test::Unit::TestCase

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: redcarpet
 version: !ruby/object:Gem::Version 
-  hash: 61
-  prerelease: 5
+  hash: 15
+  prerelease: 
   segments: 
   - 2
   - 0
   - 0
-  - b
-  - 5
-  version: 2.0.0b5
+  version: 2.0.0
 platform: ruby
 authors: 
 - "Natacha Port\xC3\xA9"
@@ -90,14 +88,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: