greenmat 3.2.0.0 → 3.2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fda7624ffadcd3576cd31d5785a9aa9eaf14cfe7
-  data.tar.gz: 5ebc173f5a5dd42dcb73e3454303533484d31c47
+  metadata.gz: 99e020834997f3b59f385346f3667d1ca32fdbac
+  data.tar.gz: 17d1921ed9bb728470eb37ea620c067ffdda1fc6
 SHA512:
-  metadata.gz: 9401853a7711a8969caabd10a54b3da514cbfc391cbdfc4796732876200f03d0c7d87f9266803069d2bd27cc4dc5806a711d8409efba540543d9d05afb6408d5
-  data.tar.gz: c7c3611dd92f07addaad1c3781eaabc5aa04e696c66ac52d5d5ca59985d6e621a47464f6453aabe9e6c2df925ab7ea167903273bd59ec6211638b9c62d2feb7f
+  metadata.gz: 7b112616170f2816923c42db5bdda43a9d727976164ce49d0c1fc76980c6405ed7c437eca3f4c103fab72b6f38199e6580eeeb7c063bcb4367f635232718ae93
+  data.tar.gz: 7850871f158ca6527c602d8bf69896f5b59cb606057615893565c9ce2f7507ec6814e3de20135325b419162fd67aa6754e2c1f570b70a13083f44a878f1348a9

data/ext/greenmat/gm_markdown.c

@@ -68,6 +68,9 @@ static void rb_greenmat_md_flags(VALUE hash, unsigned int *enabled_extensions_p)
 	if (rb_hash_lookup(hash, CSTR2SYM("footnotes")) == Qtrue)
 		extensions |= MKDEXT_FOOTNOTES;
 
+	if (rb_hash_lookup(hash, CSTR2SYM("no_mention_emphasis")) == Qtrue)
+		extensions |= MKDEXT_NO_MENTION_EMPHASIS;
+
 	*enabled_extensions_p = extensions;
 }
 

data/ext/greenmat/markdown.c

@@ -342,6 +342,12 @@ _isalnum(int c)
 	return isalnum(c) && c < 0x7f;
 }
 
+static inline int
+is_wordchar(int c)
+{
+	return _isalnum(c) || c == '_' || c == '-';
+}
+
 /*
  * Check whether a char is a Markdown space.
 
@@ -587,6 +593,38 @@ find_emph_char(uint8_t *data, size_t size, uint8_t c)
 	return 0;
 }
 
+static int
+is_part_of_mention(uint8_t *data, size_t offset)
+{
+	int i;
+	int lookbehind_limit = (int)-offset;
+	uint8_t character;
+
+	for (i = 0; i >= lookbehind_limit; i--) {
+		character = data[i];
+
+		if (is_wordchar(character)) {
+			// Continue lookbehind.
+		} else if (character == '@') {
+			if (i == offset) {
+				// The "@" is at beginning of the text. (e.g. "@foo")
+				return 1;
+			} else {
+				// Check if the previous character of the "@" is alphanumeric or not.
+				//   " @foo" and "あ@foo" are mentions.
+				//   "a@foo" is not a mention.
+				uint8_t prev_character = data[i - 1];
+				return !_isalnum(prev_character);
+			}
+		} else {
+			// Found non-mention character, so this is not a mention.
+			return 0;
+		}
+	}
+
+	return 0;
+}
+
 /* parse_emph1 • parsing single emphase */
 /* closed by a symbol not preceded by whitespace and not followed by symbol */
 static size_t
@@ -612,6 +650,11 @@ parse_emph1(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t size
 					continue;
 			}
 
+			if (rndr->ext_flags & MKDEXT_NO_MENTION_EMPHASIS) {
+				if (is_part_of_mention(data + i, i))
+					continue;
+			}
+
 			work = rndr_newbuf(rndr, BUFFER_SPAN);
 			parse_inline(work, rndr, data, i);
 
@@ -642,6 +685,11 @@ 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_MENTION_EMPHASIS) {
+				if (is_part_of_mention(data + i, i))
+					continue;
+			}
+
 			work = rndr_newbuf(rndr, BUFFER_SPAN);
 			parse_inline(work, rndr, data, i);
 
@@ -678,6 +726,11 @@ 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_MENTION_EMPHASIS) {
+				if (is_part_of_mention(data + i, i))
+					continue;
+			}
+
 			/* triple symbol found */
 			struct buf *work = rndr_newbuf(rndr, BUFFER_SPAN);
 
@@ -714,6 +767,11 @@ char_emphasis(struct buf *ob, struct sd_markdown *rndr, uint8_t *data, size_t of
 			return 0;
 	}
 
+	if (rndr->ext_flags & MKDEXT_NO_MENTION_EMPHASIS) {
+		if (is_part_of_mention(data, offset))
+			return 0;
+	}
+
 	if (size > 2 && data[1] != c) {
 		/* whitespace cannot follow an opening emphasis;
 		 * strikethrough only takes two characters '~~' */

data/ext/greenmat/markdown.h

@@ -58,7 +58,8 @@ enum mkd_extensions {
 	MKDEXT_DISABLE_INDENTED_CODE = (1 << 9),
 	MKDEXT_HIGHLIGHT = (1 << 10),
 	MKDEXT_FOOTNOTES = (1 << 11),
-	MKDEXT_QUOTE = (1 << 12)
+	MKDEXT_QUOTE = (1 << 12),
+	MKDEXT_NO_MENTION_EMPHASIS = (1 << 13)
 };
 
 /* sd_callbacks - functions for rendering parsed data */

data/greenmat.gemspec

@@ -1,7 +1,7 @@
 # encoding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'greenmat'
+require 'greenmat/version'
 
 Gem::Specification.new do |s|
   s.name = 'greenmat'

data/lib/greenmat.rb

@@ -1,9 +1,8 @@
 require 'greenmat.so'
 require 'greenmat/compat'
+require 'greenmat/version'
 
 module Greenmat
-  VERSION = '3.2.0.0'
-
   class Markdown
     attr_reader :renderer
   end

data/test/markdown_test.rb

@@ -4,13 +4,18 @@ require 'test_helper'
 class MarkdownTest < Greenmat::TestCase
 
   def setup
-    @markdown = Greenmat::Markdown.new(Greenmat::Render::HTML)
+    @markdown = Greenmat::Markdown.new(Greenmat::Render::HTML, greenmat_options)
   end
 
   def render_with(flags, text)
+    flags = greenmat_options.merge(flags)
     Greenmat::Markdown.new(Greenmat::Render::HTML, flags).render(text)
   end
 
+  def greenmat_options
+    { no_mention_emphasis: true }
+  end
+
   def test_that_simple_one_liner_goes_to_html
     assert_respond_to @markdown, :render
     assert_equal "<p>Hello World.</p>\n", @markdown.render("Hello World.")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: greenmat
 version: !ruby/object:Gem::Version
-  version: 3.2.0.0
+  version: 3.2.0.1
 platform: ruby
 authors:
 - Natacha Porté
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-24 00:00:00.000000000 Z
+date: 2015-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler