BBRedCloth 0.8.3 → 0.8.4

data/BBRedCloth.gemspec

@@ -2,13 +2,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{BBRedCloth}
-  s.version = "0.8.3"
+  s.version = "0.8.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Alyea"]
-  s.date = %q{2011-06-09}
+  s.date = %q{2011-06-12}
   s.default_executable = %q{redcloth}
-  s.description = %q{BBRedCloth-0.8.3 - Textile parser for Ruby. Includes BBCode additions.
+  s.description = %q{BBRedCloth-0.8.4 - Textile parser for Ruby. Includes BBCode additions.
 http://redcloth.org/}
   s.email = %q{ryan@fangamer.com}
   s.executables = ["redcloth"]
@@ -21,7 +21,7 @@ http://redcloth.org/}
   s.required_ruby_version = Gem::Requirement.new(">= 1.8.4")
   s.rubyforge_project = %q{bbredcloth}
   s.rubygems_version = %q{1.3.7}
-  s.summary = %q{BBRedCloth-0.8.3 - Textile parser for Ruby. Includes BBCode additions. http://redcloth.org/}
+  s.summary = %q{BBRedCloth-0.8.4 - Textile parser for Ruby. Includes BBCode additions. http://redcloth.org/}
   s.test_files = ["test/test_custom_tags.rb", "test/test_erb.rb", "test/test_extensions.rb", "test/test_formatters.rb", "test/test_parser.rb", "test/test_restrictions.rb"]
 
   if s.respond_to? :specification_version then

data/README.textile

@@ -111,6 +111,7 @@ You can disable the following:
 * :quote2
 * :multi_paragraph_quote
 * :link_alias
+* :noparagraph_line_start (ie. spaces at the beginning of a paragraph do not render <p> tags.)
 
 h3. BBCode-Only
 

data/ext/redcloth_scan/redcloth.h

@@ -45,6 +45,8 @@ VALUE redcloth_bbcode_inline2(VALUE, VALUE, VALUE);
 
 /* parser macros */
 #define CALL_STACK_SIZE 20
+#define UNLESS_DISABLED_BLOCK(H, T, F) \
+  if (rb_funcall(rb_funcall(self, rb_intern("disable_inline"), 0),rb_intern("include?"), 1,ID2SYM(rb_intern(#T))) != Qtrue) { F }
 #define UNLESS_DISABLED_INLINE(H, T, F) \
   if (rb_funcall(rb_funcall(self, rb_intern("disable_inline"), 0),rb_intern("include?"), 1,ID2SYM(rb_intern(#T))) == Qtrue) { rb_str_append(H,red_passthrough(self, ts, te, refs)); } \
   else {   /*VALUE test = rb_str_new(ts,te-ts); printf("\nred_passthrough_else() '%s'\n", RSTRING(test)->ptr);*/ F }

data/ext/redcloth_scan/redcloth_scan.c

@@ -10468,7 +10468,7 @@ _eof_trans:
 	break;
 	case 189:
 #line 393 "ext/redcloth_scan/redcloth_scan.c.rl"
-	{te = p;p--;{ ASET("type", "ignored_line"); {cs = 2468; goto _again;} }}
+	{te = p;p--;{ UNLESS_DISABLED_BLOCK(block,noparagraph_line_start,ASET("type", "ignored_line"); {cs = 2468; goto _again;}) }}
 	break;
 	case 190:
 #line 395 "ext/redcloth_scan/redcloth_scan.c.rl"
@@ -10593,7 +10593,7 @@ _eof_trans:
 	{{p = ((te))-1;} rb_str_append(failed_start,rb_str_new(ts,te-ts)); failed_start_point_p = p; failed_start_point_ts = ts; failed_start_point_te = te; store_title = 0; {cs = 2495; goto _again;} }
 	break;
 	case 61:
-	{{p = ((te))-1;} ASET("type", "ignored_line"); {cs = 2468; goto _again;} }
+	{{p = ((te))-1;} UNLESS_DISABLED_BLOCK(block,noparagraph_line_start,ASET("type", "ignored_line"); {cs = 2468; goto _again;}) }
 	break;
 	case 64:
 	{{p = ((te))-1;} CAT(block); {cs = 2465; goto _again;} }

data/ext/redcloth_scan/redcloth_scan.rl

@@ -390,7 +390,7 @@
     bb_quote_tag_start   { rb_str_append(failed_start,rb_str_new(ts,te-ts)); failed_start_point_p = p; failed_start_point_ts = ts; failed_start_point_te = te; store_cite = 0; fgoto bb_quote_tag; };
     bb_spoiler_tag_start { rb_str_append(failed_start,rb_str_new(ts,te-ts)); failed_start_point_p = p; failed_start_point_ts = ts; failed_start_point_te = te; store_title = 0; fgoto bb_spoiler_tag; };
     
-    noparagraph_line_start  { ASET("type", "ignored_line"); fgoto noparagraph_line; };
+    noparagraph_line_start  { UNLESS_DISABLED_BLOCK(block,noparagraph_line_start,ASET("type", "ignored_line"); fgoto noparagraph_line;) };
     notextile_tag_start { ASET("type", "notextile"); fgoto notextile_tag; };
     notextile_block_start { ASET("type", "notextile"); fgoto notextile_block; };
     script_tag_start { CAT(block); fgoto script_tag; };

data/lib/redcloth/version.rb

@@ -2,7 +2,7 @@ module RedCloth
   module VERSION
     MAJOR = 0
     MINOR = 8
-    TINY  = 3
+    TINY  = 4
     RELEASE_CANDIDATE = nil
 
     STRING = [MAJOR, MINOR, TINY].join('.')

data/test/test_restrictions.rb

@@ -43,7 +43,7 @@ class TestRestrictions < Test::Unit::TestCase
   end
   
   generate_formatter_tests('general_disable_inline') do |doc|
-    RedCloth.new(doc['in'], [:disable_inline=>[:strong,:del,:align]]).to_html
+    RedCloth.new(doc['in'], [:disable_inline=>[:strong,:del,:align,:noparagraph_line_start]]).to_html
   end
   
   generate_formatter_tests('bbcode') do |doc|

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: BBRedCloth
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 55
   prerelease: false
   segments: 
   - 0
   - 8
-  - 3
-  version: 0.8.3
+  - 4
+  version: 0.8.4
 platform: ruby
 authors: 
 - Ryan Alyea
@@ -15,12 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-09 00:00:00 -07:00
+date: 2011-06-12 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
 description: |-
-  BBRedCloth-0.8.3 - Textile parser for Ruby. Includes BBCode additions.
+  BBRedCloth-0.8.4 - Textile parser for Ruby. Includes BBCode additions.
   http://redcloth.org/
 email: ryan@fangamer.com
 executables: 
@@ -148,7 +148,7 @@ rubyforge_project: bbredcloth
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: BBRedCloth-0.8.3 - Textile parser for Ruby. Includes BBCode additions. http://redcloth.org/
+summary: BBRedCloth-0.8.4 - Textile parser for Ruby. Includes BBCode additions. http://redcloth.org/
 test_files: 
 - test/test_custom_tags.rb
 - test/test_erb.rb