github-markdown 0.6.6 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ead7b9ae4db02386f4f35576e957f92eb26bfbd
-  data.tar.gz: c972c6d581bf37be2359c046274200b40f4ddb18
+  metadata.gz: 0e82a12c8f502be0b25a184c0d64f3f9a1b34f28
+  data.tar.gz: ee0fcb46a6dfacad26dae9e96fb97158b7ca5da3
 SHA512:
-  metadata.gz: 509eb216bdd44d8dc4dad574dee402642953dce1ab43279a137f6e78f516343c00983d46cbb6b20cff4b852e5c9c90243c9bfbb22b81f99905ec6f1d7cb740dc
-  data.tar.gz: 06873a9f7da78b90d5be14ddfcfda5331e22600b7bd4ff8bb2a467eef89ec429758f6acde3b6c639cf2b1f7e684d964f80131ddd20f788574bbeeef2c21ca261
+  metadata.gz: 9f46e7837ac995778eb868eca67d398ed0b2e3148854c2609ac295d5884f225dbc708603442671feec9d5deb04d875bf493a03956b7752e2a4fe52f52a7c9eff
+  data.tar.gz: 1cddaba6030d05ccfb0c82e178afcbfa9e29b08a790eda845cfa27a75acca8d590c74cd596446167bce8ba8ec26149b59cf295d8566ff35c6dd5eb7c8484f6ee

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)
@@ -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;
@@ -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;

data/ext/markdown/markdown.c

@@ -306,6 +306,12 @@ 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]))
@@ -318,13 +324,6 @@ tag_length(uint8_t *data, size_t size, enum mkd_autolink *autolink)
 	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++;
@@ -1660,7 +1659,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, previous_indent = 0, i;
-	int in_empty = 0, has_inside_empty = 0, has_trailing_empty = 0, in_fence = 0, previous_indent_diff = 0;
+	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] == ' ')
@@ -1697,7 +1696,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;
 		}
@@ -1736,19 +1735,19 @@ 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;
-		}
-
 		/* checking for a new item */
 		if ((has_next_uli && !is_hrule(data + beg + i, end - beg - i)) || has_next_oli) {
 			/* the following item must have the same indentation */
 			if (pre == orgpre) {
-				if (in_empty)
+				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;
 			}
 
@@ -1759,17 +1758,18 @@ parse_listitem(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t s
 		/* joining only indented stuff after empty lines;
 		 * note that now we only require 1 space of indentation
 		 * to continue a list */
-		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;
@@ -2038,8 +2038,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;
@@ -2060,8 +2061,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;
 
@@ -2331,11 +2359,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 */
@@ -2344,14 +2372,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;
@@ -2364,7 +2392,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 */
@@ -2380,7 +2408,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] == ')')) {
@@ -2509,7 +2537,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)
@@ -2530,7 +2559,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;
@@ -2538,8 +2567,16 @@ 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 */

data/github-markdown.gemspec

@@ -1,10 +1,10 @@
 # encoding: utf-8
 Gem::Specification.new do |s|
   s.name = 'github-markdown'
-  s.version = '0.6.6'
+  s.version = '0.6.7'
   s.summary = 'The Markdown parser for GitHub.com'
   s.description = 'Self-contained Markdown parser for GitHub, with all our custom extensions'
-  s.date = '2013-10-01'
+  s.date = '2014-09-16'
   s.email = 'vicent@github.com'
   s.homepage = 'http://github.github.com/github-flavored-markdown/'
   s.authors = ['GitHub, Inc']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: github-markdown
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors:
 - GitHub, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-01 00:00:00.000000000 Z
+date: 2014-09-16 00:00:00.000000000 Z
 dependencies: []
 description: Self-contained Markdown parser for GitHub, with all our custom extensions
 email: vicent@github.com
@@ -49,17 +49,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: The Markdown parser for GitHub.com