github-markdown 0.5.2 → 0.6.9

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a2f2a20e79b2838e629c702b785c60edc0fd286f
+  data.tar.gz: 633a0cb21dfb034293b8449b7f65bcc77d51e96b
+SHA512:
+  metadata.gz: 2d0fa591d20cfcaa459fde53061ad9c59da05f2f6a6163dc79305d29b971663c16ccedf3882a01039e1ffbfd29e86cad2e6d15f4459b40a2568b51fe7693d2e6
+  data.tar.gz: 5c705bf59ec494a7032c2e94821a7d12713073381e8c2658c2c5d8be26e6151473389aa8973e1716041b4b5c583677733cb77e157a037451e88c7384ab5b9fc4

data/Rakefile

@@ -14,6 +14,22 @@ Rake::ExtensionTask.new('markdown') do |ext|
   ext.lib_dir = 'lib/github'
 end
 
+# ==========================================================
+# Helpers
+# ==========================================================
+
+def name
+  @name ||= "github-markdown"
+end
+
+def version
+  @version ||= File.read("#{name}.gemspec").match(/^\s*s.version\s*=\s*['"](.*)['"]/)[1]
+end
+
+def gem_file
+  "#{name}-#{version}.gem"
+end
+
 # ==========================================================
 # Testing
 # ==========================================================
@@ -44,6 +60,20 @@ file package('.gem') => %w[pkg/ github-markdown.gemspec] + $spec.files do |f|
   mv File.basename(f.name), f.name
 end
 
+
+desc "Create tag v#{version} and build and push #{gem_file} to Rubygems"
+task :release => :package do
+  unless `git branch` =~ /^\* master$/
+    puts "You must be on the master branch to release!"
+    exit!
+  end
+  sh "git commit --allow-empty -a -m 'Release #{version}'"
+  sh "git tag v#{version}"
+  sh "git push origin master"
+  sh "git push origin v#{version}"
+  sh "gem push pkg/#{name}-#{version}.gem"
+end
+
 # GEMSPEC HELPERS ==========================================================
 
 task :update_gem do
@@ -84,5 +114,3 @@ end
 file 'sundown/src/markdown.h' do |t|
   abort "The Sundown submodule is required."
 end
-
-

data/ext/markdown/autolink.c

@@ -51,7 +51,7 @@ sd_autolink_issafe(const uint8_t *link, size_t link_len)
 static size_t
 autolink_delim(uint8_t *data, size_t link_end, size_t max_rewind, size_t size)
 {
-	uint8_t cclose, copen = 0;
+	uint8_t cclose, copen;
 	size_t i;
 
 	for (i = 0; i < link_end; ++i)
@@ -61,7 +61,7 @@ autolink_delim(uint8_t *data, size_t link_end, size_t max_rewind, size_t size)
 		}
 
 	while (link_end > 0) {
-		if (strchr("?!.,", data[link_end - 1]) != NULL)
+		if (strchr("?!.,:", data[link_end - 1]) != NULL)
 			link_end--;
 
 		else if (data[link_end - 1] == ';') {
@@ -78,20 +78,21 @@ autolink_delim(uint8_t *data, size_t link_end, size_t max_rewind, size_t size)
 		else break;
 	}
 
-	if (link_end == 0)
-		return 0;
-
-	cclose = data[link_end - 1];
-
-	switch (cclose) {
-	case '"':	copen = '"'; break;
-	case '\'':	copen = '\''; break;
-	case ')':	copen = '('; break;
-	case ']':	copen = '['; break;
-	case '}':	copen = '{'; break;
-	}
+	while (link_end > 0) {
+		cclose = data[link_end - 1];
+
+		switch (cclose) {
+		case '"':	copen = '"'; break;
+		case '\'':	copen = '\''; break;
+		case ')':	copen = '('; break;
+		case ']':	copen = '['; break;
+		case '}':	copen = '{'; break;
+		default:	copen = 0;
+		}
 
-	if (copen != 0) {
+		if (copen == 0)
+			break;
+		
 		size_t closing = 0;
 		size_t opening = 0;
 		size_t i = 0;
@@ -110,7 +111,7 @@ autolink_delim(uint8_t *data, size_t link_end, size_t max_rewind, size_t size)
 		 *		=> http://www.pokemon.com/Pikachu_(Electric)
 		 *
 		 *	foo http://www.pokemon.com/Pikachu_(Electric)) bar
-		 *		=> http://www.pokemon.com/Pikachu_(Electric))
+		 *		=> http://www.pokemon.com/Pikachu_(Electric)
 		 *
 		 *	(foo http://www.pokemon.com/Pikachu_(Electric)) bar
 		 *		=> foo http://www.pokemon.com/Pikachu_(Electric)
@@ -125,8 +126,10 @@ autolink_delim(uint8_t *data, size_t link_end, size_t max_rewind, size_t size)
 			i++;
 		}
 
-		if (closing != opening)
-			link_end--;
+		if (closing == opening)
+			break;
+		
+		link_end--;
 	}
 
 	return link_end;
@@ -135,16 +138,20 @@ autolink_delim(uint8_t *data, size_t link_end, size_t max_rewind, size_t size)
 static size_t
 check_domain(uint8_t *data, size_t size, int allow_short)
 {
-	size_t i, np = 0;
+	size_t i, np = 0, uscore1 = 0, uscore2 = 0;
 
-	if (!isalnum(data[0]))
-		return 0;
-
-	for (i = 1; i < size - 1; ++i) {
-		if (data[i] == '.') np++;
+	for (i = 1; i < size - 1; i++) {
+		if (data[i] == '_') uscore2++;
+		else if (data[i] == '.') {
+			uscore1 = uscore2;
+			uscore2 = 0;
+			np++;
+		}
 		else if (!isalnum(data[i]) && data[i] != '-') break;
 	}
 
+	if (uscore1 > 0 || uscore2 > 0) return 0;
+
 	if (allow_short) {
 		/* We don't need a valid domain in the strict sense (with
 		 * least one dot; so just make sure it's composed of valid
@@ -169,7 +176,7 @@ sd_autolink__www(
 {
 	size_t link_end;
 
-	if (max_rewind > 0 && !ispunct(data[-1]) && !isspace(data[-1]))
+	if (max_rewind > 0 && data[-1] != '(' && data[-1] != '[' && !isspace(data[-1]))
 		return 0;
 
 	if (size < 4 || memcmp(data, "www.", strlen("www.")) != 0)
@@ -204,7 +211,7 @@ sd_autolink__email(
 	unsigned int flags)
 {
 	size_t link_end, rewind;
-	int nb = 0, np = 0;
+	int nb = 0, np = 0, ns = 0;
 
 	for (rewind = 0; rewind < max_rewind; ++rewind) {
 		uint8_t c = data[-rewind - 1];
@@ -215,10 +222,13 @@ sd_autolink__email(
 		if (strchr(".+-_", c) != NULL)
 			continue;
 
+		if (c == '/')
+			ns++;
+
 		break;
 	}
 
-	if (rewind == 0)
+	if (rewind == 0 || ns > 0)
 		return 0;
 
 	for (link_end = 0; link_end < size; ++link_end) {
@@ -235,7 +245,8 @@ sd_autolink__email(
 			break;
 	}
 
-	if (link_end < 2 || nb != 1 || np == 0)
+	if (link_end < 2 || nb != 1 || np == 0 ||
+		(!isalpha(data[link_end - 1]) && data[link_end - 1] != '.'))
 		return 0;
 
 	link_end = autolink_delim(data, link_end, max_rewind, size);
@@ -293,4 +304,3 @@ sd_autolink__url(
 
 	return link_end;
 }
-

data/ext/markdown/markdown.c

@@ -233,6 +233,15 @@ free_link_refs(struct link_ref **references)
 	}
 }
 
+/*
+ Wrap isalnum so that characters outside of the ASCII range don't count.
+ */
+static inline int
+_isalnum(int c)
+{
+	return isalnum(c) && c < 0x7f;
+}
+
 /*
  * Check whether a char is a Markdown space.
 
@@ -297,25 +306,24 @@ tag_length(uint8_t *data, size_t size, enum mkd_autolink *autolink)
 
 	/* begins with a '<' optionally followed by '/', followed by letter or number */
 	if (data[0] != '<') return 0;
+
+	if ((i = is_mail_autolink(data + 1, size - 1)) != 0) {
+		*autolink = MKDA_EMAIL;
+		return i + 1;
+	}
+
 	i = (data[1] == '/') ? 2 : 1;
 
-	if (!isalnum(data[i]))
+	if (!_isalnum(data[i]))
 		return 0;
 
 	/* scheme test */
 	*autolink = MKDA_NOT_AUTOLINK;
 
 	/* try to find the beginning of an URI */
-	while (i < size && (isalnum(data[i]) || data[i] == '.' || data[i] == '+' || data[i] == '-'))
+	while (i < size && (_isalnum(data[i]) || data[i] == '.' || data[i] == '+' || data[i] == '-'))
 		i++;
 
-	if (i > 1 && data[i] == '@') {
-		if ((j = is_mail_autolink(data + i, size - i)) != 0) {
-			*autolink = MKDA_EMAIL;
-			return i + j;
-		}
-	}
-
 	if (i > 2 && data[i] == ':') {
 		*autolink = MKDA_NORMAL;
 		i++;
@@ -352,7 +360,7 @@ tag_length(uint8_t *data, size_t size, enum mkd_autolink *autolink)
 static void
 parse_inline(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t size)
 {
-	size_t i = 0, end = 0;
+	size_t i = 0, end = 0, consumed = 0;
 	uint8_t action = 0;
 	struct buf work = { 0, 0, 0, 0 };
 
@@ -377,12 +385,13 @@ parse_inline(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t siz
 		if (end >= size) break;
 		i = end;
 
-		end = markdown_char_ptrs[(int)action](ob, rndr, data + i, i, size - i);
+		end = markdown_char_ptrs[(int)action](ob, rndr, data + i, i - consumed, size - i);
 		if (!end) /* no action from the callback */
 			end = i + 1;
 		else {
 			i += end;
 			end = i;
+			consumed = i;
 		}
 	}
 }
@@ -394,7 +403,7 @@ find_emph_char(uint8_t *data, size_t size, uint8_t c)
 	size_t i = 1;
 
 	while (i < size) {
-		while (i < size && data[i] != c && data[i] != '`' && data[i] != '[')
+		while (i < size && data[i] != c && data[i] != '[')
 			i++;
 
 		if (i == size)
@@ -500,8 +509,8 @@ parse_emph1(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t size
 
 		if (data[i] == c && !_isspace(data[i - 1])) {
 
-			if (rndr->ext_flags & MKDEXT_NO_INTRA_EMPHASIS) {
-				if (i + 1 < size && isalnum(data[i + 1]))
+			if (rndr->ext_flags & MKDEXT_NO_INTRA_EMPHASIS && c == '_') {
+				if (i + 1 < size && (_isalnum(data[i + 1]) || data[i + 1] == c))
 					continue;
 			}
 
@@ -536,6 +545,12 @@ parse_emph2(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t size
 		i += len;
 
 		if (i + 1 < size && data[i] == c && data[i + 1] == c && i && !_isspace(data[i - 1])) {
+
+			if (rndr->ext_flags & MKDEXT_NO_INTRA_EMPHASIS && c == '_') {
+				if (i + 2 < size && (_isalnum(data[i + 2]) || data[i + 2] == c))
+					continue;
+			}
+
 			work = rndr_newbuf(rndr, BUFFER_SPAN);
 			parse_inline(work, rndr, data, i);
 			r = render_method(ob, work, rndr->opaque);
@@ -565,6 +580,12 @@ parse_emph3(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t size
 			continue;
 
 		if (i + 2 < size && data[i + 1] == c && data[i + 2] == c && rndr->cb.triple_emphasis) {
+
+			if (rndr->ext_flags & MKDEXT_NO_INTRA_EMPHASIS && c == '_') {
+				if (i + 3 < size && (_isalnum(data[i + 3]) || data[i + 3] == c))
+					continue;
+			}
+
 			/* triple symbol found */
 			struct buf *work = rndr_newbuf(rndr, BUFFER_SPAN);
 
@@ -596,9 +617,10 @@ char_emphasis(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t of
 	uint8_t c = data[0];
 	size_t ret;
 
-	if (rndr->ext_flags & MKDEXT_NO_INTRA_EMPHASIS) {
-		if (offset > 0 && !_isspace(data[-1]) && data[-1] != '>')
+	if (rndr->ext_flags & MKDEXT_NO_INTRA_EMPHASIS && c == '_') {
+		if (offset > 0 && !_isspace(data[-1]) && (_isalnum(data[-1]) || data[-1] == data[0])) {
 			return 0;
+		}
 	}
 
 	if (size > 2 && data[1] != c) {
@@ -721,7 +743,7 @@ char_entity(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t offs
 	if (end < size && data[end] == '#')
 		end++;
 
-	while (end < size && isalnum(data[end]))
+	while (end < size && _isalnum(data[end]))
 		end++;
 
 	if (end < size && data[end] == ';')
@@ -895,10 +917,18 @@ char_link(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t offset
 		link_b = i;
 
 		/* looking for link end: ' " ) */
+		/* Count the number of open parenthesis */
+		size_t nb_p = 0;
+
 		while (i < size) {
 			if (data[i] == '\\') i += 2;
-			else if (data[i] == ')') break;
-			else if (i >= 1 && _isspace(data[i-1]) && (data[i] == '\'' || data[i] == '"')) break;
+			else if (data[i] == '(' && i != 0) {
+				nb_p++; i++;
+			}
+			else if (data[i] == ')') {
+				if (nb_p == 0) break;
+				nb_p--; i++;
+			} else if (i >= 1 && _isspace(data[i-1]) && (data[i] == '\'' || data[i] == '"')) break;
 			else i++;
 		}
 
@@ -1364,7 +1394,7 @@ prefix_uli(uint8_t *data, size_t size)
 
 	if (i < size && data[i] == ' ') i++;
 	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] != '-') ||
@@ -1461,7 +1491,7 @@ parse_paragraph(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t
 		 * let's check to see if there's some kind of block starting
 		 * here
 		 */
-		if ((rndr->ext_flags & MKDEXT_LAX_SPACING) && !isalnum(data[i])) {
+		if ((rndr->ext_flags & MKDEXT_LAX_SPACING) && !_isalnum(data[i])) {
 			if (prefix_oli(data + i, size - i) ||
 				prefix_uli(data + i, size - i)) {
 				end = i;
@@ -1629,8 +1659,8 @@ static size_t
 parse_listitem(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t size, int *flags)
 {
 	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, in_fence = 0;
+	size_t beg = 0, end, pre, sublist = 0, orgpre = 0, previous_indent = 0, i;
+	int empty_lines = 0, has_inside_empty = 0, has_trailing_empty = 0, in_fence = 0, previous_indent_diff = 0;
 
 	/* keeping track of the first indentation prefix */
 	while (orgpre < 3 && orgpre < size && data[orgpre] == ' ')
@@ -1667,7 +1697,7 @@ parse_listitem(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t s
 
 		/* process an empty line */
 		if (is_empty(data + beg, end - beg)) {
-			in_empty = 1;
+			empty_lines++;
 			beg = end;
 			continue;
 		}
@@ -1677,11 +1707,26 @@ parse_listitem(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t s
 		while (i < 4 && beg + i < end && data[beg + i] == ' ')
 			i++;
 
+		/* don't bother calculating, this is probably the first item if == 0 */
+		if (previous_indent > 0) {
+			previous_indent_diff = i - previous_indent;
+			/* allow indentations between 2 and 4 spaces to count as a new list */
+			if (previous_indent_diff > 1 && previous_indent_diff < 4)
+				i = 2;
+		}
+
 		pre = i;
+		previous_indent = pre;
 
 		if (rndr->ext_flags & MKDEXT_FENCED_CODE) {
-			if (is_codefence(data + beg + i, end - beg - i, NULL) != 0)
+			if (is_codefence(data + beg + i, end - beg - i, NULL) != 0) {
+				/* If the fenced code isn't indented, then end the list */
+				if (pre == 0 && !in_fence) {
+					*flags |= MKD_LI_END;
+					break;
+				}
 				in_fence = !in_fence;
+			}
 		}
 
 		/* Only check for new list items if we are **not** inside
@@ -1691,46 +1736,48 @@ parse_listitem(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t s
 			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 ((has_next_uli && !is_hrule(data + beg + i, end - beg - i)) || has_next_oli) {
-			if (in_empty)
-				has_inside_empty = 1;
-
-			if (pre == orgpre) /* the following item must have */
-				break;             /* the same indentation */
+			/* the following item must have the same indentation */
+			if (pre == orgpre) {
+				if (empty_lines > 0) {
+					has_trailing_empty = 1;
+
+					/* checking for ul/ol switch */
+					if (((*flags & MKD_LIST_ORDERED) && has_next_uli) ||
+						(!(*flags & MKD_LIST_ORDERED) && has_next_oli)) {
+						*flags |= MKD_LI_END;
+					}
+				}
+				break;
+			}
 
 			if (!sublist)
 				sublist = work->size;
 		}
+
 		/* joining only indented stuff after empty lines;
 		 * note that now we only require 1 space of indentation
 		 * to continue a list */
-		else if (in_empty && pre == 0) {
+		if (empty_lines > 0 && pre == 0 && !in_fence) {
 			*flags |= MKD_LI_END;
 			break;
 		}
-		else if (in_empty) {
-			bufputc(work, '\n');
+		else if (empty_lines > 0) {
+			/* preserve all the empty lines because they
+			 * may be meaningful inside a code block */
+			for (; empty_lines > 0; empty_lines--)
+				bufputc(work, '\n');
 			has_inside_empty = 1;
 		}
 
-		in_empty = 0;
-
 		/* adding the line without prefix into the working buffer */
 		bufput(work, data + beg + i, end - beg - i);
 		beg = end;
 	}
 
 	/* render of li contents */
-	if (has_inside_empty)
+	if (has_inside_empty || has_trailing_empty)
 		*flags |= MKD_LI_BLOCK;
 
 	if (*flags & MKD_LI_BLOCK) {
@@ -1751,6 +1798,9 @@ parse_listitem(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t s
 			parse_inline(inter, rndr, work->data, work->size);
 	}
 
+	if (!has_trailing_empty)
+		*flags &= ~MKD_LI_BLOCK;
+
 	/* render of li itself */
 	if (rndr->cb.listitem)
 		rndr->cb.listitem(ob, inter, *flags, rndr->opaque);
@@ -1989,8 +2039,9 @@ parse_table_row(
 	int *col_data,
 	int header_flag)
 {
-	size_t i = 0, col;
+	size_t i = 0, j, code_end, col;
 	struct buf *row_work = 0;
+	int nb = 0, is_escaped = 0;
 
 	if (!rndr->cb.table_cell || !rndr->cb.table_row)
 		return;
@@ -2011,8 +2062,35 @@ parse_table_row(
 
 		cell_start = i;
 
-		while (i < size && data[i] != '|')
-			i++;
+		/* find the | marking the end of this cell */
+		while (i < size) {
+			if (!is_escaped && data[i] == '|')
+				break;
+
+			/* find code spans because they can contain |s */
+			if (!is_escaped && data[i] == '`') {
+				for (nb=0; i < size && data[i] == '`'; i++)
+					nb++;
+
+				for (j=0, code_end=i; code_end < size && j < nb; code_end++) {
+					if (data[code_end] == '`') j++;
+					else j = 0;
+				}
+
+				/* bail if there's no matching delimiter */
+				if (j < nb) {
+					i++;
+					continue;
+				}
+
+				i = code_end;
+				is_escaped = 0;
+			}
+			else {
+				is_escaped = !is_escaped && data[i] == '\\';
+				i++;
+			}
+		}
 
 		cell_end = i - 1;
 
@@ -2282,11 +2360,11 @@ is_ref(const uint8_t *data, size_t beg, size_t end, size_t *last, struct link_re
 	i++;
 	if (i >= end || data[i] != ':') return 0;
 	i++;
-	while (i < end && data[i] == ' ') i++;
+	while (i < end && (data[i] == ' ' || data[i] == '\t')) i++;
 	if (i < end && (data[i] == '\n' || data[i] == '\r')) {
 		i++;
 		if (i < end && data[i] == '\r' && data[i - 1] == '\n') i++; }
-	while (i < end && data[i] == ' ') i++;
+	while (i < end && (data[i] == ' ' || data[i] == '\t')) i++;
 	if (i >= end) return 0;
 
 	/* link: whitespace-free sequence, optionally between angle brackets */
@@ -2295,14 +2373,14 @@ is_ref(const uint8_t *data, size_t beg, size_t end, size_t *last, struct link_re
 
 	link_offset = i;
 
-	while (i < end && data[i] != ' ' && data[i] != '\n' && data[i] != '\r')
+	while (i < end && data[i] != ' ' && data[i] != '\t' && 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] == ' ') i++;
+	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;
@@ -2315,7 +2393,7 @@ is_ref(const uint8_t *data, size_t beg, size_t end, size_t *last, struct link_re
 	/* optional (space|tab)* spacer after a newline */
 	if (line_end) {
 		i = line_end + 1;
-		while (i < end && data[i] == ' ') i++; }
+		while (i < end && (data[i] == ' ' || data[i] == '\t')) i++; }
 
 	/* optional title: any non-newline sequence enclosed in '"()
 					alone on its line */
@@ -2331,7 +2409,7 @@ is_ref(const uint8_t *data, size_t beg, size_t end, size_t *last, struct link_re
 		else	title_end = i;
 		/* stepping back */
 		i -= 1;
-		while (i > title_offset && data[i] == ' ')
+		while (i > title_offset && (data[i] == ' ' || data[i] == '\t'))
 			i -= 1;
 		if (i > title_offset
 		&& (data[i] == '\'' || data[i] == '"' || data[i] == ')')) {
@@ -2460,7 +2538,8 @@ sd_markdown_render(struct buf *ob, const uint8_t *document, size_t doc_size, str
 	static const char UTF8_BOM[] = {0xEF, 0xBB, 0xBF};
 
 	struct buf *text;
-	size_t beg, end;
+	size_t beg, end, expanded_beg;
+	int in_code_block = 0;
 
 	text = bufnew(64);
 	if (!text)
@@ -2481,7 +2560,7 @@ sd_markdown_render(struct buf *ob, const uint8_t *document, size_t doc_size, str
 		beg += 3;
 
 	while (beg < doc_size) /* iterating over lines */
-		if (is_ref(document, beg, doc_size, &end, md->refs))
+		if (!in_code_block && is_ref(document, beg, doc_size, &end, md->refs))
 			beg = end;
 		else { /* skipping to the next line */
 			end = beg;
@@ -2489,9 +2568,17 @@ sd_markdown_render(struct buf *ob, const uint8_t *document, size_t doc_size, str
 				end++;
 
 			/* adding the line body if present */
-			if (end > beg)
+			if (end > beg) {
+				expanded_beg = text->size;
+
 				expand_tabs(text, document + beg, end - beg);
 
+				/* check for a fenced code block */
+				if ((md->ext_flags & MKDEXT_FENCED_CODE) != 0 &&
+					is_codefence(text->data + expanded_beg, text->size - expanded_beg, NULL) != 0)
+					in_code_block = !in_code_block;
+			}
+
 			while (end < doc_size && (document[end] == '\n' || document[end] == '\r')) {
 				/* add one \n per newline */
 				if (document[end] == '\n' || (end + 1 < doc_size && document[end + 1] != '\n'))

data/ext/markdown/plaintext.c

@@ -109,12 +109,6 @@ rndr_paragraph(struct buf *ob, const struct buf *text, void *opaque)
 	plaintext_block(ob, text);
 }
 
-static void
-rndr_raw_block(struct buf *ob, const struct buf *text, void *opaque)
-{
-	/* NO OP */
-}
-
 static void
 rndr_hrule(struct buf *ob, void *opaque)
 {
@@ -159,7 +153,7 @@ sdtext_renderer(struct sd_callbacks *callbacks)
 	static const struct sd_callbacks cb_default = {
 		rndr_blockcode,
 		rndr_blockquote,
-		rndr_raw_block,
+		NULL,
 		rndr_header,
 		rndr_hrule,
 		rndr_list,

data/github-markdown.gemspec

@@ -1,12 +1,10 @@
 # encoding: utf-8
 Gem::Specification.new do |s|
   s.name = 'github-markdown'
-  s.version = '0.5.2'
-  s.summary = 'The Markdown parser for GitHub.com'
-  s.description = 'Self-contained Markdown parser for GitHub, with all our custom extensions'
-  s.date = '2012-07-08'
-  s.email = 'vicent@github.com'
-  s.homepage = 'http://github.github.com/github-flavored-markdown/'
+  s.version = '0.6.9'
+  s.summary = 'THIS GEM IS NOT MAINTAINED AND NOT SUPPORTED. The Markdown parser for GitHub.com'
+  s.description = 'THIS GEM IS NOT MAINTAINED AND NOT SUPPORTED. Self-contained Markdown parser for GitHub, with all our custom extensions'
+  s.license = 'MIT'
   s.authors = ['GitHub, Inc']
   # = MANIFEST =
   s.files = %w[
@@ -38,5 +36,4 @@ Gem::Specification.new do |s|
   s.test_files = ["test/gfm_test.rb"]
   s.extensions = ["ext/markdown/extconf.rb"]
   s.require_paths = ["lib"]
-  s.add_development_dependency "rake-compiler"
 end

data/test/gfm_test.rb

@@ -16,6 +16,33 @@ def html_equal(html_a, html_b)
 end
 
 class GFMBasicTest < Test::Unit::TestCase
+  Dir['test/fixtures/*.text', 'test/fixtures/Markdown_Redcarpet/**/*.text'].each do |md_file|
+    dirname = File.dirname(md_file)
+    markup = md_file.split('/').last.gsub(/\.text/, '').gsub(/(\s+)/, "_")
+    define_method "test_#{dirname}_#{markup}" do
+      source = File.read(md_file)
+
+      expected_file = "#{dirname}/#{markup}.html"
+      expected = File.read(expected_file).rstrip
+      actual = GitHub::Markdown.render(source).rstrip
+
+      if source != expected
+        assert(source != actual, "#{markup} did not render anything")
+      end
+
+      diff = IO.popen("diff -u - #{expected_file}", 'r+') do |f|
+        f.write actual
+        f.close_write
+        f.read
+      end
+
+      assert expected == actual, <<message
+#{File.basename expected_file}'s contents don't match command output:
+#{diff}
+message
+    end
+  end
+
   def test_that_render_works
     GitHub::Markdown.to_html("Hello **world**!", :gfm)
   end
@@ -50,7 +77,7 @@ class GFMBasicTest < Test::Unit::TestCase
     parsed = Nokogiri::HTML::DocumentFragment.parse(html)
 
     items.inject(parsed) do |node, expected_item|
-      child = node.at('.//ul/li')
+      child = node.xpath('.//ul/li')
       child_item = child.children.detect{|e| e.text?}.text.strip
       assert_equal expected_item, child_item
       node = child

metadata

@@ -1,46 +1,23 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: github-markdown
-version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: 
-  segments: 
-  - 0
-  - 5
-  - 2
-  version: 0.5.2
+version: !ruby/object:Gem::Version
+  version: 0.6.9
 platform: ruby
-authors: 
+authors:
 - GitHub, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-07-08 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rake-compiler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id001
-description: Self-contained Markdown parser for GitHub, with all our custom extensions
-email: vicent@github.com
+date: 2015-08-10 00:00:00.000000000 Z
+dependencies: []
+description: THIS GEM IS NOT MAINTAINED AND NOT SUPPORTED. Self-contained Markdown
+  parser for GitHub, with all our custom extensions
+email: 
 executables: []
-
-extensions: 
+extensions:
 - ext/markdown/extconf.rb
 extra_rdoc_files: []
-
-files: 
+files:
 - Rakefile
 - bin/gfm
 - ext/markdown/autolink.c
@@ -64,39 +41,29 @@ files:
 - github-markdown.gemspec
 - lib/github/markdown.rb
 - test/gfm_test.rb
-has_rdoc: true
-homepage: http://github.github.com/github-flavored-markdown/
-licenses: []
-
+homepage: 
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 2.2.3
 signing_key: 
-specification_version: 3
-summary: The Markdown parser for GitHub.com
-test_files: 
+specification_version: 4
+summary: THIS GEM IS NOT MAINTAINED AND NOT SUPPORTED. The Markdown parser for GitHub.com
+test_files:
 - test/gfm_test.rb