github-markdown 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b588334527838ef5b385a6906dd1e47839a82b01
-  data.tar.gz: b0fa1d69efbaea4147d67eeec64662ac6f2f2d4f
+  metadata.gz: 28fa8ed9daf6133d7ec96ffe630eced45affce35
+  data.tar.gz: 58e12eaab9d955409da483d909de7d9b7a875560
 SHA512:
-  metadata.gz: a891bf2acfa053a96ce25572094d781afc6996815824cea9b70537ae991d7f9fe986fbb367838161e48790085de3080ec06a667bf3c0a74589f5960048ac14d5
-  data.tar.gz: 2ef8bcb62e94418c1addcba28dec5ed864458f7e3fea8c5a14dcdae79a89c34b81e70ae894b6e1fe05f6f0969f4c29ebd0cadb6b66ca88f0fda3fe370537db90
+  metadata.gz: 7d4aae8a213ec9c0a54d99a8e9e6e200e367876b3a911715adcab3b99b1cb927b722e2318064243cb597d190d7a2750a55f11f068b53f3876c29f51581f56de9
+  data.tar.gz: 8c40378c643ec6548bc4efabc358db9d0ba4d0f50c5dec32d2614d86358df123f04be19cedf4fa8ca4bf797fb379997170eae4eacd5bda403f9c1cba17e13941

data/ext/markdown/autolink.c

@@ -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] == ';') {
@@ -110,7 +110,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)

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.
 
@@ -299,14 +308,14 @@ tag_length(uint8_t *data, size_t size, enum mkd_autolink *autolink)
 	if (data[0] != '<') return 0;
 	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] == '@') {
@@ -501,7 +510,7 @@ 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 && data[i] < 33)
+				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) {
+				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) {
+				if (i + 3 < size && (_isalnum(data[i + 3]) || data[i + 3] == c))
+					continue;
+			}
+			
 			/* triple symbol found */
 			struct buf *work = rndr_newbuf(rndr, BUFFER_SPAN);
 
@@ -597,7 +618,7 @@ char_emphasis(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t of
 	size_t ret;
 
 	if (rndr->ext_flags & MKDEXT_NO_INTRA_EMPHASIS) {
-		if (offset > 0 && !_isspace(data[-1]) && (isalnum(data[-1]) || data[-1] == data[0])) {
+		if (offset > 0 && !_isspace(data[-1]) && (_isalnum(data[-1]) || data[-1] == data[0])) {
 			return 0;
 		}
 	}
@@ -722,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] == ';')
@@ -1470,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;

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,7 +1,7 @@
 # encoding: utf-8
 Gem::Specification.new do |s|
   s.name = 'github-markdown'
-  s.version = '0.6.4'
+  s.version = '0.6.5'
   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'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: github-markdown
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - GitHub, Inc