redcarpet 1.13.0 → 1.13.1

data/ext/redcarpet/markdown.c

@@ -1100,6 +1100,26 @@ is_codefence(char *data, size_t size, struct buf *syntax)
 	return i + 1;
 }
 
+/* is_atxheader • returns whether the line is a hash-prefixed header */
+static int
+is_atxheader(struct render *rndr, char *data, size_t size)
+{
+	if (data[0] != '#')
+		return 0;
+
+	if (rndr->ext_flags & MKDEXT_SPACE_HEADERS) {
+		size_t level = 0;
+
+		while (level < size && level < 6 && data[level] == '#')
+			level++;
+
+		if (level < size && data[level] != ' ' && data[level] != '\t')
+			return 0;
+	}
+
+	return 1;
+}
+
 /* is_headerline • returns whether the line is a setext-style hdr underline */
 static int
 is_headerline(char *data, size_t size)
@@ -1248,7 +1268,7 @@ parse_paragraph(struct buf *ob, struct render *rndr, char *data, size_t size)
 			}
 		}
 
-		if (data[i] == '#' || is_hrule(data + i, size - i)) {
+		if (is_atxheader(rndr, data + i, size - i) || is_hrule(data + i, size - i)) {
 			end = i;
 			break;
 		}
@@ -1532,7 +1552,6 @@ parse_list(struct buf *ob, struct render *rndr, char *data, size_t size, int fla
 	return i;
 }
 
-
 /* parse_atxheader • parsing of atx-style headers */
 static size_t
 parse_atxheader(struct buf *ob, struct render *rndr, char *data, size_t size)
@@ -1540,9 +1559,6 @@ parse_atxheader(struct buf *ob, struct render *rndr, char *data, size_t size)
 	size_t level = 0;
 	size_t i, end, skip;
 
-	if (!size || data[0] != '#')
-		return 0;
-
 	while (level < size && level < 6 && data[level] == '#')
 		level++;
 
@@ -1887,7 +1903,7 @@ parse_block(struct buf *ob, struct render *rndr, char *data, size_t size)
 		txt_data = data + beg;
 		end = size - beg;
 
-		if (data[beg] == '#')
+		if (is_atxheader(rndr, txt_data, end))
 			beg += parse_atxheader(ob, rndr, txt_data, end);
 
 		else if (data[beg] == '<' && rndr->make.blockhtml &&

data/ext/redcarpet/markdown.h

@@ -39,6 +39,7 @@ enum mkd_extensions {
 	MKDEXT_AUTOLINK = (1 << 3),
 	MKDEXT_STRIKETHROUGH = (1 << 4),
 	MKDEXT_LAX_HTML_BLOCKS = (1 << 5),
+	MKDEXT_SPACE_HEADERS = (1 << 6),
 };
 
 /* mkd_renderer • functions for rendering parsed data */

data/ext/redcarpet/redcarpet.c

@@ -72,6 +72,9 @@ static void rb_redcarpet__get_flags(VALUE ruby_obj,
 	if (rb_funcall(ruby_obj, rb_intern("lax_htmlblock"), 0) == Qtrue)
 		extensions |= MKDEXT_LAX_HTML_BLOCKS;
 
+	if (rb_funcall(ruby_obj, rb_intern("space_header"), 0) == Qtrue)
+		extensions |= MKDEXT_SPACE_HEADERS;
+
 	*enabled_extensions_p = extensions;
 	*render_flags_p = render_flags;
 }

data/lib/redcarpet.rb

@@ -26,7 +26,7 @@
 #   end
 #
 class Redcarpet
-  VERSION = '1.13.0'
+  VERSION = '1.13.1'
 
   # Original Markdown formatted text.
   attr_reader :text
@@ -79,6 +79,9 @@ class Redcarpet
   # Generate XHTML 1.0 compilant self-closing tags (e.g. <br/>)
   attr_accessor :xhtml
 
+  # Force a space between header hashes and the header itself
+  attr_accessor :space_header
+
   def initialize(text, *extensions)
     @text  = text
     extensions.each { |e| send("#{e}=", true) }

data/redcarpet.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'redcarpet'
-  s.version = '1.13.0'
+  s.version = '1.13.1'
   s.summary = "Ruby bindings for libupskirt"
   s.description = 'A fast and safe Markdown to (X)HTML parser'
   s.date = '2011-05-06'

data/test/redcarpet_test.rb

@@ -233,4 +233,9 @@ text
   
     assert rd.to_html =~ /<br>/
   end
+
+  def test_spaced_headers
+    rd = Redcarpet.new("#123 a header yes\n", :space_header)
+    assert rd.to_html !~ /<h1>/
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: redcarpet
 version: !ruby/object:Gem::Version 
-  hash: 35
+  hash: 33
   prerelease: false
   segments: 
   - 1
   - 13
-  - 0
-  version: 1.13.0
+  - 1
+  version: 1.13.1
 platform: ruby
 authors: 
 - "Natacha Port\xC3\xA9"