RubyGems - BBRedCloth - Versions diffs - 0.8.4 → 0.8.5 - Mend

BBRedCloth 0.8.4 → 0.8.5

Files changed (22) hide show

data/BBRedCloth.gemspec +13 -15
data/ext/redcloth_scan/redcloth.h +24 -8
data/ext/redcloth_scan/redcloth_bbcode.c +14 -14
data/ext/redcloth_scan/redcloth_bbcode.c.rl +3 -3
data/ext/redcloth_scan/redcloth_bbcode.rl +6 -6
data/ext/redcloth_scan/redcloth_bbcode_inline.c +6 -6
data/ext/redcloth_scan/redcloth_bbcode_inline.c.rl +3 -3
data/ext/redcloth_scan/redcloth_bbcode_inline.rl +1 -1
data/ext/redcloth_scan/redcloth_inline.c +12 -12
data/ext/redcloth_scan/redcloth_inline.c.rl +9 -9
data/ext/redcloth_scan/redcloth_scan.c +19 -19
data/ext/redcloth_scan/redcloth_scan.c.rl +8 -8
data/ext/redcloth_scan/redcloth_scan.rl +6 -6
data/lib/redcloth/version.rb +1 -1
data/test/helper.rb +12 -12
data/test/test_custom_tags.rb +1 -1
data/test/test_erb.rb +1 -1
data/test/test_extensions.rb +1 -1
data/test/test_formatters.rb +1 -1
data/test/test_parser.rb +1 -1
data/test/test_restrictions.rb +1 -1
metadata +6 -22

data/BBRedCloth.gemspec CHANGED Viewed

@@ -2,30 +2,28 @@
 Gem::Specification.new do |s|
   s.name = %q{BBRedCloth}
-  s.version = "0.8.4"
+  s.version = "0.8.5"
   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-12}
-  s.default_executable = %q{redcloth}
-  s.description = %q{BBRedCloth-0.8.4 - Textile parser for Ruby. Includes BBCode additions.
+  s.authors = [%q{Ryan Alyea}]
+  s.date = %q{2011-09-02}
+  s.description = %q{BBRedCloth-0.8.5 - Textile parser for Ruby. Includes BBCode additions.
 http://redcloth.org/}
   s.email = %q{ryan@fangamer.com}
-  s.executables = ["redcloth"]
-  s.extensions = ["ext/redcloth_scan/extconf.rb"]
-  s.extra_rdoc_files = ["CHANGELOG", "lib/case_sensitive_require/RedCloth.rb", "lib/redcloth/erb_extension.rb", "lib/redcloth/formatters/base.rb", "lib/redcloth/formatters/html.rb", "lib/redcloth/formatters/latex.rb", "lib/redcloth/textile_doc.rb", "lib/redcloth/version.rb", "lib/redcloth.rb", "README.textile"]
-  s.files = ["bin/redcloth", "CHANGELOG", "COPYING", "ext/mingw-rbconfig.rb", "ext/redcloth_scan/extconf.rb", "ext/redcloth_scan/redcloth.h", "ext/redcloth_scan/redcloth_attributes.c.rl", "ext/redcloth_scan/redcloth_attributes.java.rl", "ext/redcloth_scan/redcloth_attributes.rl", "ext/redcloth_scan/redcloth_bbcode.c.rl", "ext/redcloth_scan/redcloth_bbcode.rl", "ext/redcloth_scan/redcloth_bbcode_inline.rl", "ext/redcloth_scan/redcloth_bbcode_inline.c.rl", "ext/redcloth_scan/redcloth_common.c.rl", "ext/redcloth_scan/redcloth_common.java.rl", "ext/redcloth_scan/redcloth_common.rl", "ext/redcloth_scan/redcloth_inline.c.rl", "ext/redcloth_scan/redcloth_inline.java.rl", "ext/redcloth_scan/redcloth_inline.rl", "ext/redcloth_scan/redcloth_scan.c.rl", "ext/redcloth_scan/redcloth_scan.java.rl", "ext/redcloth_scan/redcloth_scan.rl", "extras/ragel_profiler.rb", "lib/case_sensitive_require/RedCloth.rb", "lib/redcloth/erb_extension.rb", "lib/redcloth/formatters/base.rb", "lib/redcloth/formatters/html.rb", "lib/redcloth/formatters/latex.rb", "lib/redcloth/formatters/latex_entities.yml", "lib/redcloth/textile_doc.rb", "lib/redcloth/version.rb", "lib/redcloth.rb", "Manifest", "Rakefile", "README.textile", "setup.rb", "test/basic.yml", "test/code.yml", "test/definitions.yml", "test/extra_whitespace.yml", "test/filter_html.yml", "test/filter_pba.yml", "test/helper.rb", "test/html.yml", "test/images.yml", "test/instiki.yml", "test/links.yml", "test/lists.yml", "test/poignant.yml", "test/sanitize_html.yml", "test/table.yml", "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", "test/textism.yml", "test/threshold.yml", "test/validate_fixtures.rb", "BBRedCloth.gemspec", "ext/redcloth_scan/redcloth_attributes.c", "ext/redcloth_scan/redcloth_inline.c", "ext/redcloth_scan/redcloth_scan.c", "ext/redcloth_scan/redcloth_bbcode.c", "ext/redcloth_scan/redcloth_bbcode_inline.c"]
+  s.executables = [%q{redcloth}]
+  s.extensions = [%q{ext/redcloth_scan/extconf.rb}]
+  s.extra_rdoc_files = [%q{CHANGELOG}, %q{lib/case_sensitive_require/RedCloth.rb}, %q{lib/redcloth/erb_extension.rb}, %q{lib/redcloth/formatters/base.rb}, %q{lib/redcloth/formatters/html.rb}, %q{lib/redcloth/formatters/latex.rb}, %q{lib/redcloth/textile_doc.rb}, %q{lib/redcloth/version.rb}, %q{lib/redcloth.rb}, %q{README.textile}]
+  s.files = [%q{bin/redcloth}, %q{CHANGELOG}, %q{COPYING}, %q{ext/mingw-rbconfig.rb}, %q{ext/redcloth_scan/extconf.rb}, %q{ext/redcloth_scan/redcloth.h}, %q{ext/redcloth_scan/redcloth_attributes.c.rl}, %q{ext/redcloth_scan/redcloth_attributes.java.rl}, %q{ext/redcloth_scan/redcloth_attributes.rl}, %q{ext/redcloth_scan/redcloth_bbcode.c.rl}, %q{ext/redcloth_scan/redcloth_bbcode.rl}, %q{ext/redcloth_scan/redcloth_bbcode_inline.rl}, %q{ext/redcloth_scan/redcloth_bbcode_inline.c.rl}, %q{ext/redcloth_scan/redcloth_common.c.rl}, %q{ext/redcloth_scan/redcloth_common.java.rl}, %q{ext/redcloth_scan/redcloth_common.rl}, %q{ext/redcloth_scan/redcloth_inline.c.rl}, %q{ext/redcloth_scan/redcloth_inline.java.rl}, %q{ext/redcloth_scan/redcloth_inline.rl}, %q{ext/redcloth_scan/redcloth_scan.c.rl}, %q{ext/redcloth_scan/redcloth_scan.java.rl}, %q{ext/redcloth_scan/redcloth_scan.rl}, %q{extras/ragel_profiler.rb}, %q{lib/case_sensitive_require/RedCloth.rb}, %q{lib/redcloth/erb_extension.rb}, %q{lib/redcloth/formatters/base.rb}, %q{lib/redcloth/formatters/html.rb}, %q{lib/redcloth/formatters/latex.rb}, %q{lib/redcloth/formatters/latex_entities.yml}, %q{lib/redcloth/textile_doc.rb}, %q{lib/redcloth/version.rb}, %q{lib/redcloth.rb}, %q{Manifest}, %q{Rakefile}, %q{README.textile}, %q{setup.rb}, %q{test/basic.yml}, %q{test/code.yml}, %q{test/definitions.yml}, %q{test/extra_whitespace.yml}, %q{test/filter_html.yml}, %q{test/filter_pba.yml}, %q{test/helper.rb}, %q{test/html.yml}, %q{test/images.yml}, %q{test/instiki.yml}, %q{test/links.yml}, %q{test/lists.yml}, %q{test/poignant.yml}, %q{test/sanitize_html.yml}, %q{test/table.yml}, %q{test/test_custom_tags.rb}, %q{test/test_erb.rb}, %q{test/test_extensions.rb}, %q{test/test_formatters.rb}, %q{test/test_parser.rb}, %q{test/test_restrictions.rb}, %q{test/textism.yml}, %q{test/threshold.yml}, %q{test/validate_fixtures.rb}, %q{BBRedCloth.gemspec}, %q{ext/redcloth_scan/redcloth_attributes.c}, %q{ext/redcloth_scan/redcloth_inline.c}, %q{ext/redcloth_scan/redcloth_scan.c}, %q{ext/redcloth_scan/redcloth_bbcode.c}, %q{ext/redcloth_scan/redcloth_bbcode_inline.c}]
   s.homepage = %q{http://redcloth.org}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "BBRedCloth", "--main", "README.textile"]
-  s.require_paths = ["lib", "ext", "lib/case_sensitive_require"]
+  s.rdoc_options = [%q{--line-numbers}, %q{--inline-source}, %q{--title}, %q{BBRedCloth}, %q{--main}, %q{README.textile}]
+  s.require_paths = [%q{lib}, %q{ext}, %q{lib/case_sensitive_require}]
   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.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"]
+  s.rubygems_version = %q{1.8.7}
+  s.summary = %q{BBRedCloth-0.8.5 - Textile parser for Ruby. Includes BBCode additions. http://redcloth.org/}
+  s.test_files = [%q{test/test_custom_tags.rb}, %q{test/test_erb.rb}, %q{test/test_extensions.rb}, %q{test/test_formatters.rb}, %q{test/test_parser.rb}, %q{test/test_restrictions.rb}]
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/ext/redcloth_scan/redcloth.h CHANGED Viewed

@@ -15,6 +15,22 @@
 #define RARRAY_PTR(x) (RARRAY(x)->ptr)
 #endif
+// Different string conversions for ruby 1.8 and ruby 1.9. For 1.9,
+// we need to set the encoding of the string.
+// For Ruby 1.9
+#ifdef HAVE_RUBY_ENCODING_H
+#include "ruby/encoding.h"
+#define STR_NEW(p,n) rb_enc_str_new((p),(n),rb_utf8_encoding())
+#define STR_NEW2(p) rb_enc_str_new((p),strlen(p),rb_utf8_encoding())
+// For Ruby 1.8
+#else
+#define STR_NEW(p,n) rb_str_new((p),(n))
+#define STR_NEW2(p) rb_str_new2((p))
+#endif
 /* variable defs */
 #ifndef redcloth_scan_c
 extern VALUE super_ParseError, mRedCloth, super_RedCloth;
@@ -49,18 +65,18 @@ VALUE redcloth_bbcode_inline2(VALUE, VALUE, VALUE);
   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 }
+  else {   /*VALUE test = STR_NEW(ts,te-ts); printf("\nred_passthrough_else() '%s'\n", RSTRING(test)->ptr);*/ F }
 #define UNLESS_DISABLED_ATTRIBUTE(T, F) \
   if (!(rb_funcall(rb_funcall(self, rb_intern("disable_inline"), 0),rb_intern("include?"), 1,ID2SYM(rb_intern(#T))) == Qtrue)) { F } //if !(rb_funcall(rb_funcall(self, rb_intern("disable_inline"), 0),rb_intern("include?"), 1,ID2SYM(rb_intern(#T))) == Qtrue) { F }
 #define CLEAR_REGS()   regs = rb_hash_new();
 #define RESET_REG()    reg = NULL
 #define CAT(H)         rb_str_cat(H, ts, te-ts)
-#define CLEAR(H)       H = rb_str_new2("")
-#define SET_PLAIN_BLOCK(T) plain_block = rb_str_new2(T)
+#define CLEAR(H)       H = STR_NEW2("")
+#define SET_PLAIN_BLOCK(T) plain_block = STR_NEW2(T)
 #define RESET_TYPE(T)  rb_hash_aset(regs, ID2SYM(rb_intern("type")), plain_block)
 #define INLINE(H, T)   rb_str_append(H, rb_funcall(self, rb_intern(T), 1, regs))
 #define DONE(H)        rb_str_append(html, H); CLEAR(H); CLEAR_REGS()
-#define BBDONE()       failed_start = rb_str_new2(""); html = rb_str_new2(""); CLEAR_REGS(); RESET_REG();
+#define BBDONE()       failed_start = STR_NEW2(""); html = STR_NEW2(""); CLEAR_REGS(); RESET_REG();
 #define PASS(H, A, T)  rb_str_append(H, red_pass(self, regs, ID2SYM(rb_intern(A)), rb_intern(T), refs))
 #define PARSE_ATTR(A)  red_parse_attr(self, regs, ID2SYM(rb_intern(A)))
 #define PARSE_LINK_ATTR(A)  red_parse_link_attr(self, regs, ID2SYM(rb_intern(A)))
@@ -75,7 +91,7 @@ VALUE redcloth_bbcode_inline2(VALUE, VALUE, VALUE);
 #define IS_NOT_EXTENDED()     NIL_P(extend)
 #define ADD_BLOCKCODE()    rb_str_append(html, red_blockcode(self, regs, block)); CLEAR(block); CLEAR_REGS()
 #define ADD_EXTENDED_BLOCKCODE()    rb_str_append(html, red_blockcode(self, regs, block)); CLEAR(block);
-#define ASET(T, V)     rb_hash_aset(regs, ID2SYM(rb_intern(T)), rb_str_new2(V));
+#define ASET(T, V)     rb_hash_aset(regs, ID2SYM(rb_intern(T)), STR_NEW2(V));
 #define AINC(T)        red_inc(regs, ID2SYM(rb_intern(T)));
 #define SET_ATTRIBUTES() \
   VALUE buf = Qnil; \
@@ -96,7 +112,7 @@ VALUE redcloth_bbcode_inline2(VALUE, VALUE, VALUE);
   }
 #define STORE(T)  \
   if (p > reg && reg >= ts) { \
-    VALUE str = rb_str_new(reg, p-reg); \
+    VALUE str = STR_NEW(reg, p-reg); \
     rb_hash_aset(regs, ID2SYM(rb_intern(T)), str); \
   /*  printf("STORE(" T ") '%s' (p:'%d' reg:'%d')\n", RSTRING(str)->ptr, p, reg);*/  \
   } else { \
@@ -104,7 +120,7 @@ VALUE redcloth_bbcode_inline2(VALUE, VALUE, VALUE);
   }
 #define STORE_B(T)  \
   if (p > bck && bck >= ts) { \
-    VALUE str = rb_str_new(bck, p-bck); \
+    VALUE str = STR_NEW(bck, p-bck); \
     rb_hash_aset(regs, ID2SYM(rb_intern(T)), str); \
   /*  printf("STORE_B(" T ") '%s' (p:'%d' reg:'%d')\n", RSTRING(str)->ptr, p, reg);*/  \
   } else { \
@@ -177,7 +193,7 @@ VALUE redcloth_bbcode_inline2(VALUE, VALUE, VALUE);
       } \
       rb_hash_aset(regs, ID2SYM(rb_intern("nest")), INT2NUM(nest)); \
       rb_str_append(html, rb_funcall(self, rb_intern(listm), 1, regs)); \
-      rb_ary_store(list_layout, nest-1, rb_str_new2(list_type)); \
+      rb_ary_store(list_layout, nest-1, STR_NEW2(list_type)); \
       CLEAR_REGS(); \
       ASET("first", "true"); \
     } \

data/ext/redcloth_scan/redcloth_bbcode.c CHANGED Viewed

@@ -1539,14 +1539,14 @@ redcloth_bbcode(self, p, pe, refs)
   int cs, act, nest;
   char *ts = NULL, *te = NULL, *reg = NULL, *bck = NULL, *eof = NULL;
   char *orig_p = p, *orig_pe = pe;
-  VALUE block = rb_str_new2("");
+  VALUE block = STR_NEW2("");
   VALUE regs = Qnil; CLEAR_REGS()
   unsigned int opts = 0;
   VALUE buf = Qnil;
   VALUE hash = Qnil;
-  VALUE html = rb_str_new2("");
-  VALUE failed_start = rb_str_new2("");
+  VALUE html = STR_NEW2("");
+  VALUE failed_start = STR_NEW2("");
   char *failed_start_point_p = NULL, *failed_start_point_ts = NULL, *failed_start_point_te = NULL;
   int stack[CALL_STACK_SIZE],top,nested_quote = 0, nested_spoiler = 0, store_cite = 1, store_title = 1;
@@ -1830,7 +1830,7 @@ _eof_trans:
 	break;
 	case 44:
 #line 80 "ext/redcloth_scan/redcloth_bbcode.c.rl"
-	{te = p+1;{ ASET("type", "notextile"); rb_str_append(failed_start,rb_str_new(ts,te-ts)); {cs = 647; goto _again;} }}
+	{te = p+1;{ ASET("type", "notextile"); rb_str_append(failed_start,STR_NEW(ts,te-ts)); {cs = 647; goto _again;} }}
 	break;
 	case 45:
 #line 81 "ext/redcloth_scan/redcloth_bbcode.c.rl"
@@ -1842,7 +1842,7 @@ _eof_trans:
 	break;
 	case 47:
 #line 80 "ext/redcloth_scan/redcloth_bbcode.c.rl"
-	{te = p;p--;{ ASET("type", "notextile"); rb_str_append(failed_start,rb_str_new(ts,te-ts)); {cs = 647; goto _again;} }}
+	{te = p;p--;{ ASET("type", "notextile"); rb_str_append(failed_start,STR_NEW(ts,te-ts)); {cs = 647; goto _again;} }}
 	break;
 	case 48:
 #line 82 "ext/redcloth_scan/redcloth_bbcode.c.rl"
@@ -1850,7 +1850,7 @@ _eof_trans:
 	break;
 	case 49:
 #line 80 "ext/redcloth_scan/redcloth_bbcode.c.rl"
-	{{p = ((te))-1;}{ ASET("type", "notextile"); rb_str_append(failed_start,rb_str_new(ts,te-ts)); {cs = 647; goto _again;} }}
+	{{p = ((te))-1;}{ ASET("type", "notextile"); rb_str_append(failed_start,STR_NEW(ts,te-ts)); {cs = 647; goto _again;} }}
 	break;
 	case 50:
 #line 82 "ext/redcloth_scan/redcloth_bbcode.c.rl"
@@ -1872,7 +1872,7 @@ _eof_trans:
 	break;
 	case 53:
 #line 40 "ext/redcloth_scan/redcloth_bbcode.c.rl"
-	{te = p+1;{ CLEAR(block); CLEAR_REGS(); rb_str_append(block,failed_start); failed_start = rb_str_new2(""); p = failed_start_point_p; ts = failed_start_point_ts; te = failed_start_point_te; {cs = 663; goto _again;} }}
+	{te = p+1;{ CLEAR(block); CLEAR_REGS(); rb_str_append(block,failed_start); failed_start = STR_NEW2(""); p = failed_start_point_p; ts = failed_start_point_ts; te = failed_start_point_te; {cs = 663; goto _again;} }}
 	break;
 	case 54:
 #line 32 "ext/redcloth_scan/redcloth_bbcode.c.rl"
@@ -1918,7 +1918,7 @@ _eof_trans:
 	break;
 	case 60:
 #line 59 "ext/redcloth_scan/redcloth_bbcode.c.rl"
-	{te = p+1;{ CLEAR(block); CLEAR_REGS(); rb_str_append(block,failed_start); failed_start = rb_str_new2(""); p = failed_start_point_p; ts = failed_start_point_ts; te = failed_start_point_te; {cs = 663; goto _again;} }}
+	{te = p+1;{ CLEAR(block); CLEAR_REGS(); rb_str_append(block,failed_start); failed_start = STR_NEW2(""); p = failed_start_point_p; ts = failed_start_point_ts; te = failed_start_point_te; {cs = 663; goto _again;} }}
 	break;
 	case 61:
 #line 45 "ext/redcloth_scan/redcloth_bbcode.c.rl"
@@ -1969,7 +1969,7 @@ _eof_trans:
 	break;
 	case 67:
 #line 77 "ext/redcloth_scan/redcloth_bbcode.c.rl"
-	{te = p+1;{ CLEAR(block); CLEAR_REGS(); rb_str_append(block,failed_start); failed_start = rb_str_new2(""); p = failed_start_point_p; ts = failed_start_point_ts; te = failed_start_point_te; {cs = 663; goto _again;} }}
+	{te = p+1;{ CLEAR(block); CLEAR_REGS(); rb_str_append(block,failed_start); failed_start = STR_NEW2(""); p = failed_start_point_p; ts = failed_start_point_ts; te = failed_start_point_te; {cs = 663; goto _again;} }}
 	break;
 	case 68:
 #line 64 "ext/redcloth_scan/redcloth_bbcode.c.rl"
@@ -2096,15 +2096,15 @@ _eof_trans:
 	break;
 	case 87:
 #line 120 "ext/redcloth_scan/redcloth_bbcode.c.rl"
-	{te = p+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; {cs = 653; goto _again;} }}
+	{te = p+1;{ rb_str_append(failed_start,STR_NEW(ts,te-ts)); failed_start_point_p = p; failed_start_point_ts = ts; failed_start_point_te = te; {cs = 653; goto _again;} }}
 	break;
 	case 88:
 #line 121 "ext/redcloth_scan/redcloth_bbcode.c.rl"
-	{te = p+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_cite = 0; {cs = 656; goto _again;} }}
+	{te = p+1;{ rb_str_append(failed_start,STR_NEW(ts,te-ts)); failed_start_point_p = p; failed_start_point_ts = ts; failed_start_point_te = te; store_cite = 0; {cs = 656; goto _again;} }}
 	break;
 	case 89:
 #line 122 "ext/redcloth_scan/redcloth_bbcode.c.rl"
-	{te = p+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 = 660; goto _again;} }}
+	{te = p+1;{ rb_str_append(failed_start,STR_NEW(ts,te-ts)); failed_start_point_p = p; failed_start_point_ts = ts; failed_start_point_te = te; store_title = 0; {cs = 660; goto _again;} }}
 	break;
 	case 90:
 #line 124 "ext/redcloth_scan/redcloth_bbcode.c.rl"
@@ -2112,7 +2112,7 @@ _eof_trans:
 	break;
 	case 91:
 #line 120 "ext/redcloth_scan/redcloth_bbcode.c.rl"
-	{te = p;p--;{ 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; {cs = 653; goto _again;} }}
+	{te = p;p--;{ rb_str_append(failed_start,STR_NEW(ts,te-ts)); failed_start_point_p = p; failed_start_point_ts = ts; failed_start_point_te = te; {cs = 653; goto _again;} }}
 	break;
 	case 92:
 #line 9 "ext/redcloth_scan/redcloth_bbcode.c.rl"
@@ -2124,7 +2124,7 @@ _eof_trans:
 	break;
 	case 94:
 #line 120 "ext/redcloth_scan/redcloth_bbcode.c.rl"
-	{{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; {cs = 653; goto _again;} }}
+	{{p = ((te))-1;}{ rb_str_append(failed_start,STR_NEW(ts,te-ts)); failed_start_point_p = p; failed_start_point_ts = ts; failed_start_point_te = te; {cs = 653; goto _again;} }}
 	break;
 	case 95:
 #line 9 "ext/redcloth_scan/redcloth_bbcode.c.rl"

data/ext/redcloth_scan/redcloth_bbcode.c.rl CHANGED Viewed

@@ -25,14 +25,14 @@ redcloth_bbcode(self, p, pe, refs)
   int cs, act, nest;
   char *ts = NULL, *te = NULL, *reg = NULL, *bck = NULL, *eof = NULL;
   char *orig_p = p, *orig_pe = pe;
-  VALUE block = rb_str_new2("");
+  VALUE block = STR_NEW2("");
   VALUE regs = Qnil; CLEAR_REGS()
   unsigned int opts = 0;
   VALUE buf = Qnil;
   VALUE hash = Qnil;
-  VALUE html = rb_str_new2("");
-  VALUE failed_start = rb_str_new2("");
+  VALUE html = STR_NEW2("");
+  VALUE failed_start = STR_NEW2("");
   char *failed_start_point_p = NULL, *failed_start_point_ts = NULL, *failed_start_point_te = NULL;
   int stack[CALL_STACK_SIZE],top,nested_quote = 0, nested_spoiler = 0, store_cite = 1, store_title = 1;

data/ext/redcloth_scan/redcloth_bbcode.rl CHANGED Viewed

@@ -37,7 +37,7 @@
       fgoto main;
     };
     default => cat;
-    EOF => { CLEAR(block); CLEAR_REGS(); rb_str_append(block,failed_start); failed_start = rb_str_new2(""); p = failed_start_point_p; ts = failed_start_point_ts; te = failed_start_point_te; fgoto done; };
+    EOF => { CLEAR(block); CLEAR_REGS(); rb_str_append(block,failed_start); failed_start = STR_NEW2(""); p = failed_start_point_p; ts = failed_start_point_ts; te = failed_start_point_te; fgoto done; };
   *|;
   bb_quote_tag := |*
@@ -56,7 +56,7 @@
       else { CAT(block); }
     };
     default => cat;
-    EOF => { CLEAR(block); CLEAR_REGS(); rb_str_append(block,failed_start); failed_start = rb_str_new2(""); p = failed_start_point_p; ts = failed_start_point_ts; te = failed_start_point_te; fgoto done; };
+    EOF => { CLEAR(block); CLEAR_REGS(); rb_str_append(block,failed_start); failed_start = STR_NEW2(""); p = failed_start_point_p; ts = failed_start_point_ts; te = failed_start_point_te; fgoto done; };
   *|;
   bb_spoiler_tag := |*
@@ -74,7 +74,7 @@
       else { CAT(block); }
     };
     default => cat;
-    EOF => { CLEAR(block); CLEAR_REGS(); rb_str_append(block,failed_start); failed_start = rb_str_new2(""); p = failed_start_point_p; ts = failed_start_point_ts; te = failed_start_point_te; fgoto done; };
+    EOF => { CLEAR(block); CLEAR_REGS(); rb_str_append(block,failed_start); failed_start = STR_NEW2(""); p = failed_start_point_p; ts = failed_start_point_ts; te = failed_start_point_te; fgoto done; };
   *|;
   done := |*
@@ -117,9 +117,9 @@
     #  fhold;
     #  fcall bbcode_inline;
     #};
-    bb_pre_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; fgoto bb_pre_tag; };
-    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; };
+    bb_pre_tag_start => { rb_str_append(failed_start,STR_NEW(ts,te-ts)); failed_start_point_p = p; failed_start_point_ts = ts; failed_start_point_te = te; fgoto bb_pre_tag; };
+    bb_quote_tag_start => { rb_str_append(failed_start,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,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; };
     blank_line => cat;
     default => { fhold; fgoto block; };
   *|;

data/ext/redcloth_scan/redcloth_bbcode_inline.c CHANGED Viewed

@@ -1255,14 +1255,14 @@ redcloth_bbcode_inline(self, p, pe, refs)
   int cs, act, nest;
   char *ts = NULL, *te = NULL, *reg = NULL, *bck = NULL, *eof = NULL;
   char *orig_p = p, *orig_pe = pe;
-  VALUE block = rb_str_new2("");
+  VALUE block = STR_NEW2("");
   VALUE regs = Qnil; CLEAR_REGS()
   unsigned int opts = 0;
   VALUE buf = Qnil;
   VALUE hash = Qnil;
-  VALUE html = rb_str_new2("");
-  VALUE failed_start = rb_str_new2("");
+  VALUE html = STR_NEW2("");
+  VALUE failed_start = STR_NEW2("");
   char *failed_start_point_p = NULL, *failed_start_point_ts = NULL, *failed_start_point_te = NULL;
   int stack[CALL_STACK_SIZE],top,nested_quote = 0, nested_spoiler = 0, store_cite = 1, store_title = 1;
@@ -1534,7 +1534,7 @@ _eof_trans:
 	break;
 	case 41:
 #line 80 "ext/redcloth_scan/redcloth_bbcode_inline.c.rl"
-	{te = p+1;{ ASET("type", "notextile"); rb_str_append(failed_start,rb_str_new(ts,te-ts)); {cs = 518; goto _again;} }}
+	{te = p+1;{ ASET("type", "notextile"); rb_str_append(failed_start,STR_NEW(ts,te-ts)); {cs = 518; goto _again;} }}
 	break;
 	case 42:
 #line 81 "ext/redcloth_scan/redcloth_bbcode_inline.c.rl"
@@ -1546,7 +1546,7 @@ _eof_trans:
 	break;
 	case 44:
 #line 80 "ext/redcloth_scan/redcloth_bbcode_inline.c.rl"
-	{te = p;p--;{ ASET("type", "notextile"); rb_str_append(failed_start,rb_str_new(ts,te-ts)); {cs = 518; goto _again;} }}
+	{te = p;p--;{ ASET("type", "notextile"); rb_str_append(failed_start,STR_NEW(ts,te-ts)); {cs = 518; goto _again;} }}
 	break;
 	case 45:
 #line 82 "ext/redcloth_scan/redcloth_bbcode_inline.c.rl"
@@ -1554,7 +1554,7 @@ _eof_trans:
 	break;
 	case 46:
 #line 80 "ext/redcloth_scan/redcloth_bbcode_inline.c.rl"
-	{{p = ((te))-1;}{ ASET("type", "notextile"); rb_str_append(failed_start,rb_str_new(ts,te-ts)); {cs = 518; goto _again;} }}
+	{{p = ((te))-1;}{ ASET("type", "notextile"); rb_str_append(failed_start,STR_NEW(ts,te-ts)); {cs = 518; goto _again;} }}
 	break;
 	case 47:
 #line 82 "ext/redcloth_scan/redcloth_bbcode_inline.c.rl"

data/ext/redcloth_scan/redcloth_bbcode_inline.c.rl CHANGED Viewed

@@ -45,14 +45,14 @@ redcloth_bbcode_inline(self, p, pe, refs)
   int cs, act, nest;
   char *ts = NULL, *te = NULL, *reg = NULL, *bck = NULL, *eof = NULL;
   char *orig_p = p, *orig_pe = pe;
-  VALUE block = rb_str_new2("");
+  VALUE block = STR_NEW2("");
   VALUE regs = Qnil; CLEAR_REGS()
   unsigned int opts = 0;
   VALUE buf = Qnil;
   VALUE hash = Qnil;
-  VALUE html = rb_str_new2("");
-  VALUE failed_start = rb_str_new2("");
+  VALUE html = STR_NEW2("");
+  VALUE failed_start = STR_NEW2("");
   char *failed_start_point_p = NULL, *failed_start_point_ts = NULL, *failed_start_point_te = NULL;
   int stack[CALL_STACK_SIZE],top,nested_quote = 0, nested_spoiler = 0, store_cite = 1, store_title = 1;

data/ext/redcloth_scan/redcloth_bbcode_inline.rl CHANGED Viewed

@@ -77,7 +77,7 @@
     bb_img2    { UNLESS_DISABLED_INLINE(block,image,PASS(block, "name", "image");); };
     bb_spoiler { PASS(block, "name", "bb_spoiler"); CLEAR_REGS();};
-    bb_pre_tag_start     { ASET("type", "notextile"); rb_str_append(failed_start,rb_str_new(ts,te-ts)); fgoto bb_inline_pre_tag; };
+    bb_pre_tag_start     { ASET("type", "notextile"); rb_str_append(failed_start,STR_NEW(ts,te-ts)); fgoto bb_inline_pre_tag; };
     nl => { fhold; fret; };
     default => { CAT(block); fret;};
   *|;

data/ext/redcloth_scan/redcloth_inline.c CHANGED Viewed

@@ -11075,8 +11075,8 @@ red_pass(VALUE self, VALUE regs, VALUE ref, ID meth, VALUE refs)
 VALUE
 red_passthrough(VALUE self, char *ts, char *te, VALUE refs)
 {
-  VALUE ret = rb_str_new(ts,1);
-  VALUE txt = rb_str_new(ts+1,te-ts-2);
+  VALUE ret = STR_NEW(ts,1);
+  VALUE txt = STR_NEW(ts+1,te-ts-2);
   if (!NIL_P(txt)) {
     //printf("red_passthrough() '%s'\n", RSTRING(txt)->ptr);
@@ -11112,7 +11112,7 @@ red_pass_code(VALUE self, VALUE regs, VALUE ref, ID meth)
 {
   VALUE txt = rb_hash_aref(regs, ref);
   if (!NIL_P(txt)) {
-    VALUE txt2 = rb_str_new2("");
+    VALUE txt2 = STR_NEW2("");
     rb_str_cat_escaped_for_preformatted(self, txt2, RSTRING_PTR(txt), RSTRING_PTR(txt) + RSTRING_LEN(txt));
     rb_hash_aset(regs, ref, txt2);
   }
@@ -11180,14 +11180,14 @@ redcloth_inline(self, p, pe, refs)
   int cs, act;
   char *ts, *te, *reg, *eof;
   char *orig_p = p, *orig_pe = pe;
-  VALUE block = rb_str_new2("");
+  VALUE block = STR_NEW2("");
   VALUE regs = Qnil;
   unsigned int opts = 0;
   VALUE buf = Qnil;
   VALUE hash = Qnil;
-  VALUE html = rb_str_new2("");
-  VALUE failed_start = rb_str_new2("");
+  VALUE html = STR_NEW2("");
+  VALUE failed_start = STR_NEW2("");
   int stack[CALL_STACK_SIZE],top;
@@ -11573,7 +11573,7 @@ _eof_trans:
 	break;
 	case 58:
 #line 80 "ext/redcloth_scan/redcloth_inline.c.rl"
-	{te = p+1;{ ASET("type", "notextile"); rb_str_append(failed_start,rb_str_new(ts,te-ts)); {cs = 2986; goto _again;} }}
+	{te = p+1;{ ASET("type", "notextile"); rb_str_append(failed_start,STR_NEW(ts,te-ts)); {cs = 2986; goto _again;} }}
 	break;
 	case 59:
 #line 81 "ext/redcloth_scan/redcloth_inline.c.rl"
@@ -11585,7 +11585,7 @@ _eof_trans:
 	break;
 	case 61:
 #line 80 "ext/redcloth_scan/redcloth_inline.c.rl"
-	{te = p;p--;{ ASET("type", "notextile"); rb_str_append(failed_start,rb_str_new(ts,te-ts)); {cs = 2986; goto _again;} }}
+	{te = p;p--;{ ASET("type", "notextile"); rb_str_append(failed_start,STR_NEW(ts,te-ts)); {cs = 2986; goto _again;} }}
 	break;
 	case 62:
 #line 82 "ext/redcloth_scan/redcloth_inline.c.rl"
@@ -11593,7 +11593,7 @@ _eof_trans:
 	break;
 	case 63:
 #line 80 "ext/redcloth_scan/redcloth_inline.c.rl"
-	{{p = ((te))-1;}{ ASET("type", "notextile"); rb_str_append(failed_start,rb_str_new(ts,te-ts)); {cs = 2986; goto _again;} }}
+	{{p = ((te))-1;}{ ASET("type", "notextile"); rb_str_append(failed_start,STR_NEW(ts,te-ts)); {cs = 2986; goto _again;} }}
 	break;
 	case 64:
 #line 82 "ext/redcloth_scan/redcloth_inline.c.rl"
@@ -12110,7 +12110,7 @@ rb_str_cat_escaped(self, str, ts, te)
   VALUE self, str;
   char *ts, *te;
 {
-  VALUE source_str = rb_str_new(ts, te-ts);
+  VALUE source_str = STR_NEW(ts, te-ts);
   VALUE escaped_str = rb_funcall(self, rb_intern("escape"), 1, source_str);
   rb_str_concat(str, escaped_str);
 }
@@ -12120,7 +12120,7 @@ rb_str_cat_escaped_for_preformatted(self, str, ts, te)
   VALUE self, str;
   char *ts, *te;
 {
-  VALUE source_str = rb_str_new(ts, te-ts);
+  VALUE source_str = STR_NEW(ts, te-ts);
   VALUE escaped_str = rb_funcall(self, rb_intern("escape_pre"), 1, source_str);
   rb_str_concat(str, escaped_str);
 }
@@ -12130,7 +12130,7 @@ rb_str_cat_escaped_test(self, str, ts, te)
   VALUE self, str;
   char *ts, *te;
 {
-  VALUE source_str = rb_str_new(ts, te-ts);
+  VALUE source_str = STR_NEW(ts, te-ts);
   rb_str_concat(str, source_str);
 }

data/ext/redcloth_scan/redcloth_inline.c.rl CHANGED Viewed

@@ -40,8 +40,8 @@ red_pass(VALUE self, VALUE regs, VALUE ref, ID meth, VALUE refs)
 VALUE
 red_passthrough(VALUE self, char *ts, char *te, VALUE refs)
 {
-  VALUE ret = rb_str_new(ts,1);
-  VALUE txt = rb_str_new(ts+1,te-ts-2);
+  VALUE ret = STR_NEW(ts,1);
+  VALUE txt = STR_NEW(ts+1,te-ts-2);
   if (!NIL_P(txt)) {
     //printf("red_passthrough() '%s'\n", RSTRING(txt)->ptr);
@@ -77,7 +77,7 @@ red_pass_code(VALUE self, VALUE regs, VALUE ref, ID meth)
 {
   VALUE txt = rb_hash_aref(regs, ref);
   if (!NIL_P(txt)) {
-    VALUE txt2 = rb_str_new2("");
+    VALUE txt2 = STR_NEW2("");
     rb_str_cat_escaped_for_preformatted(self, txt2, RSTRING_PTR(txt), RSTRING_PTR(txt) + RSTRING_LEN(txt));
     rb_hash_aset(regs, ref, txt2);
   }
@@ -145,14 +145,14 @@ redcloth_inline(self, p, pe, refs)
   int cs, act;
   char *ts, *te, *reg, *eof;
   char *orig_p = p, *orig_pe = pe;
-  VALUE block = rb_str_new2("");
+  VALUE block = STR_NEW2("");
   VALUE regs = Qnil;
   unsigned int opts = 0;
   VALUE buf = Qnil;
   VALUE hash = Qnil;
-  VALUE html = rb_str_new2("");
-  VALUE failed_start = rb_str_new2("");
+  VALUE html = STR_NEW2("");
+  VALUE failed_start = STR_NEW2("");
   int stack[CALL_STACK_SIZE],top;
   %% write init;
@@ -172,7 +172,7 @@ rb_str_cat_escaped(self, str, ts, te)
   VALUE self, str;
   char *ts, *te;
 {
-  VALUE source_str = rb_str_new(ts, te-ts);
+  VALUE source_str = STR_NEW(ts, te-ts);
   VALUE escaped_str = rb_funcall(self, rb_intern("escape"), 1, source_str);
   rb_str_concat(str, escaped_str);
 }
@@ -182,7 +182,7 @@ rb_str_cat_escaped_for_preformatted(self, str, ts, te)
   VALUE self, str;
   char *ts, *te;
 {
-  VALUE source_str = rb_str_new(ts, te-ts);
+  VALUE source_str = STR_NEW(ts, te-ts);
   VALUE escaped_str = rb_funcall(self, rb_intern("escape_pre"), 1, source_str);
   rb_str_concat(str, escaped_str);
 }
@@ -192,7 +192,7 @@ rb_str_cat_escaped_test(self, str, ts, te)
   VALUE self, str;
   char *ts, *te;
 {
-  VALUE source_str = rb_str_new(ts, te-ts);
+  VALUE source_str = STR_NEW(ts, te-ts);
   rb_str_concat(str, source_str);
 }

data/ext/redcloth_scan/redcloth_scan.c CHANGED Viewed

@@ -9302,9 +9302,9 @@ redcloth_transform(self, p, pe, refs)
   char *orig_p = p, *orig_pe = pe;
   int cs, act, nest;
   char *ts = NULL, *te = NULL, *reg = NULL, *bck = NULL, *eof = NULL;
-  VALUE html = rb_str_new2("");
-  VALUE table = rb_str_new2("");
-  VALUE block = rb_str_new2("");
+  VALUE html = STR_NEW2("");
+  VALUE table = STR_NEW2("");
+  VALUE block = STR_NEW2("");
   VALUE regs; CLEAR_REGS()
@@ -9317,7 +9317,7 @@ redcloth_transform(self, p, pe, refs)
   char listm[10] = "";
   VALUE refs_found = rb_hash_new();
-  VALUE failed_start = rb_str_new2("");
+  VALUE failed_start = STR_NEW2("");
   char *failed_start_point_p = NULL, *failed_start_point_ts = NULL, *failed_start_point_te = NULL;
   int nested_quote = 0, nested_spoiler = 0, store_cite = 1, store_title = 1;
@@ -10010,7 +10010,7 @@ _eof_trans:
 	break;
 	case 112:
 #line 265 "ext/redcloth_scan/redcloth_scan.c.rl"
-	{te = p+1;{ CLEAR(block); CLEAR_REGS(); RESET_TYPE(); rb_str_append(block,failed_start); failed_start = rb_str_new2(""); p = failed_start_point_p; ts = failed_start_point_ts; te = failed_start_point_te; {cs = 2517; goto _again;} }}
+	{te = p+1;{ CLEAR(block); CLEAR_REGS(); RESET_TYPE(); rb_str_append(block,failed_start); failed_start = STR_NEW2(""); p = failed_start_point_p; ts = failed_start_point_ts; te = failed_start_point_te; {cs = 2517; goto _again;} }}
 	break;
 	case 113:
 #line 256 "ext/redcloth_scan/redcloth_scan.c.rl"
@@ -10060,7 +10060,7 @@ _eof_trans:
 	break;
 	case 119:
 #line 287 "ext/redcloth_scan/redcloth_scan.c.rl"
-	{te = p+1;{ CLEAR(block); ADD_BLOCK(); CLEAR_REGS(); RESET_TYPE(); rb_str_append(block,failed_start); failed_start = rb_str_new2(""); p = failed_start_point_p; ts = failed_start_point_ts; te = failed_start_point_te; {cs = 2517; goto _again;} }}
+	{te = p+1;{ CLEAR(block); ADD_BLOCK(); CLEAR_REGS(); RESET_TYPE(); rb_str_append(block,failed_start); failed_start = STR_NEW2(""); p = failed_start_point_p; ts = failed_start_point_ts; te = failed_start_point_te; {cs = 2517; goto _again;} }}
 	break;
 	case 120:
 #line 269 "ext/redcloth_scan/redcloth_scan.c.rl"
@@ -10123,7 +10123,7 @@ _eof_trans:
 	break;
 	case 128:
 #line 306 "ext/redcloth_scan/redcloth_scan.c.rl"
-	{te = p+1;{ CLEAR(block); CLEAR_REGS(); RESET_TYPE(); rb_str_append(block,failed_start); failed_start = rb_str_new2(""); p = failed_start_point_p; ts = failed_start_point_ts; te = failed_start_point_te; {cs = 2517; goto _again;} }}
+	{te = p+1;{ CLEAR(block); CLEAR_REGS(); RESET_TYPE(); rb_str_append(block,failed_start); failed_start = STR_NEW2(""); p = failed_start_point_p; ts = failed_start_point_ts; te = failed_start_point_te; {cs = 2517; goto _again;} }}
 	break;
 	case 129:
 #line 292 "ext/redcloth_scan/redcloth_scan.c.rl"
@@ -10423,7 +10423,7 @@ _eof_trans:
 	break;
 	case 179:
 #line 389 "ext/redcloth_scan/redcloth_scan.c.rl"
-	{te = p+1;{ ASET("type", "notextile"); 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; {cs = 2487; goto _again;} }}
+	{te = p+1;{ ASET("type", "notextile"); rb_str_append(failed_start,STR_NEW(ts,te-ts)); failed_start_point_p = p; failed_start_point_ts = ts; failed_start_point_te = te; {cs = 2487; goto _again;} }}
 	break;
 	case 180:
 #line 394 "ext/redcloth_scan/redcloth_scan.c.rl"
@@ -10460,11 +10460,11 @@ _eof_trans:
 	break;
 	case 187:
 #line 389 "ext/redcloth_scan/redcloth_scan.c.rl"
-	{te = p;p--;{ ASET("type", "notextile"); 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; {cs = 2487; goto _again;} }}
+	{te = p;p--;{ ASET("type", "notextile"); rb_str_append(failed_start,STR_NEW(ts,te-ts)); failed_start_point_p = p; failed_start_point_ts = ts; failed_start_point_te = te; {cs = 2487; goto _again;} }}
 	break;
 	case 188:
 #line 390 "ext/redcloth_scan/redcloth_scan.c.rl"
-	{te = p;p--;{ 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; {cs = 2490; goto _again;} }}
+	{te = p;p--;{ rb_str_append(failed_start,STR_NEW(ts,te-ts)); failed_start_point_p = p; failed_start_point_ts = ts; failed_start_point_te = te; store_cite = 0; {cs = 2490; goto _again;} }}
 	break;
 	case 189:
 #line 393 "ext/redcloth_scan/redcloth_scan.c.rl"
@@ -10553,11 +10553,11 @@ _eof_trans:
 	break;
 	case 209:
 #line 389 "ext/redcloth_scan/redcloth_scan.c.rl"
-	{{p = ((te))-1;}{ ASET("type", "notextile"); 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; {cs = 2487; goto _again;} }}
+	{{p = ((te))-1;}{ ASET("type", "notextile"); rb_str_append(failed_start,STR_NEW(ts,te-ts)); failed_start_point_p = p; failed_start_point_ts = ts; failed_start_point_te = te; {cs = 2487; goto _again;} }}
 	break;
 	case 210:
 #line 390 "ext/redcloth_scan/redcloth_scan.c.rl"
-	{{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_cite = 0; {cs = 2490; goto _again;} }}
+	{{p = ((te))-1;}{ rb_str_append(failed_start,STR_NEW(ts,te-ts)); failed_start_point_p = p; failed_start_point_ts = ts; failed_start_point_te = te; store_cite = 0; {cs = 2490; goto _again;} }}
 	break;
 	case 211:
 #line 397 "ext/redcloth_scan/redcloth_scan.c.rl"
@@ -10584,13 +10584,13 @@ _eof_trans:
 #line 1 "ext/redcloth_scan/redcloth_scan.c.rl"
 	{	switch( act ) {
 	case 58:
-	{{p = ((te))-1;} ASET("type", "notextile"); 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; {cs = 2487; goto _again;} }
+	{{p = ((te))-1;} ASET("type", "notextile"); rb_str_append(failed_start,STR_NEW(ts,te-ts)); failed_start_point_p = p; failed_start_point_ts = ts; failed_start_point_te = te; {cs = 2487; goto _again;} }
 	break;
 	case 59:
-	{{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_cite = 0; {cs = 2490; goto _again;} }
+	{{p = ((te))-1;} rb_str_append(failed_start,STR_NEW(ts,te-ts)); failed_start_point_p = p; failed_start_point_ts = ts; failed_start_point_te = te; store_cite = 0; {cs = 2490; goto _again;} }
 	break;
 	case 60:
-	{{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;} }
+	{{p = ((te))-1;} rb_str_append(failed_start,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;} UNLESS_DISABLED_BLOCK(block,noparagraph_line_start,ASET("type", "ignored_line"); {cs = 2468; goto _again;}) }
@@ -10700,7 +10700,7 @@ redcloth_html_esc(int argc, VALUE* argv, VALUE self) //(self, str, level)
   rb_scan_args(argc, argv, "11", &str, &level);
-  VALUE new_str = rb_str_new2("");
+  VALUE new_str = STR_NEW2("");
   if (str == Qnil)
     return new_str;
@@ -10758,7 +10758,7 @@ redcloth_html_esc(int argc, VALUE* argv, VALUE self) //(self, str, level)
 static VALUE
 redcloth_latex_esc(VALUE self, VALUE str)
 {
-  VALUE new_str = rb_str_new2("");
+  VALUE new_str = STR_NEW2("");
   if (str == Qnil)
     return new_str;
@@ -10797,7 +10797,7 @@ redcloth_latex_esc(VALUE self, VALUE str)
       if (t2 > t)
         rb_str_cat(new_str, t, t2-t);
       VALUE opts = rb_hash_new();
-      rb_hash_aset(opts, ID2SYM(rb_intern("text")), rb_str_new2(ch));
+      rb_hash_aset(opts, ID2SYM(rb_intern("text")), STR_NEW2(ch));
       rb_str_concat(new_str, rb_funcall(self, rb_intern("entity"), 1, opts));
       t = t2 + 1;
     }
@@ -10820,7 +10820,7 @@ redcloth_to(self, formatter)
   char *pe, *p;
   int len = 0;
-  rb_funcall(self, rb_intern("delete!"), 1, rb_str_new2("\r"));
+  rb_funcall(self, rb_intern("delete!"), 1, STR_NEW2("\r"));
   VALUE working_copy = rb_obj_clone(self);
   rb_extend_object(working_copy, formatter);
   if (rb_funcall(working_copy, rb_intern("bbcode_only"), 0) == Qtrue) {

data/ext/redcloth_scan/redcloth_scan.c.rl CHANGED Viewed

@@ -33,9 +33,9 @@ redcloth_transform(self, p, pe, refs)
   char *orig_p = p, *orig_pe = pe;
   int cs, act, nest;
   char *ts = NULL, *te = NULL, *reg = NULL, *bck = NULL, *eof = NULL;
-  VALUE html = rb_str_new2("");
-  VALUE table = rb_str_new2("");
-  VALUE block = rb_str_new2("");
+  VALUE html = STR_NEW2("");
+  VALUE table = STR_NEW2("");
+  VALUE block = STR_NEW2("");
   VALUE regs; CLEAR_REGS()
@@ -48,7 +48,7 @@ redcloth_transform(self, p, pe, refs)
   char listm[10] = "";
   VALUE refs_found = rb_hash_new();
-  VALUE failed_start = rb_str_new2("");
+  VALUE failed_start = STR_NEW2("");
   char *failed_start_point_p = NULL, *failed_start_point_ts = NULL, *failed_start_point_te = NULL;
   int nested_quote = 0, nested_spoiler = 0, store_cite = 1, store_title = 1;
@@ -88,7 +88,7 @@ redcloth_html_esc(int argc, VALUE* argv, VALUE self) //(self, str, level)
   rb_scan_args(argc, argv, "11", &str, &level);
-  VALUE new_str = rb_str_new2("");
+  VALUE new_str = STR_NEW2("");
   if (str == Qnil)
     return new_str;
@@ -146,7 +146,7 @@ redcloth_html_esc(int argc, VALUE* argv, VALUE self) //(self, str, level)
 static VALUE
 redcloth_latex_esc(VALUE self, VALUE str)
 {
-  VALUE new_str = rb_str_new2("");
+  VALUE new_str = STR_NEW2("");
   if (str == Qnil)
     return new_str;
@@ -185,7 +185,7 @@ redcloth_latex_esc(VALUE self, VALUE str)
       if (t2 > t)
         rb_str_cat(new_str, t, t2-t);
       VALUE opts = rb_hash_new();
-      rb_hash_aset(opts, ID2SYM(rb_intern("text")), rb_str_new2(ch));
+      rb_hash_aset(opts, ID2SYM(rb_intern("text")), STR_NEW2(ch));
       rb_str_concat(new_str, rb_funcall(self, rb_intern("entity"), 1, opts));
       t = t2 + 1;
     }
@@ -208,7 +208,7 @@ redcloth_to(self, formatter)
   char *pe, *p;
   int len = 0;
-  rb_funcall(self, rb_intern("delete!"), 1, rb_str_new2("\r"));
+  rb_funcall(self, rb_intern("delete!"), 1, STR_NEW2("\r"));
   VALUE working_copy = rb_obj_clone(self);
   rb_extend_object(working_copy, formatter);
   if (rb_funcall(working_copy, rb_intern("bbcode_only"), 0) == Qtrue) {

data/ext/redcloth_scan/redcloth_scan.rl CHANGED Viewed

@@ -262,7 +262,7 @@
       fgoto main;
     };
     default => cat;
-    EOF => { CLEAR(block); CLEAR_REGS(); RESET_TYPE(); rb_str_append(block,failed_start); failed_start = rb_str_new2(""); p = failed_start_point_p; ts = failed_start_point_ts; te = failed_start_point_te; fgoto done; };
+    EOF => { CLEAR(block); CLEAR_REGS(); RESET_TYPE(); rb_str_append(block,failed_start); failed_start = STR_NEW2(""); p = failed_start_point_p; ts = failed_start_point_ts; te = failed_start_point_te; fgoto done; };
   *|;
   bb_quote_tag := |*
@@ -284,7 +284,7 @@
       else { CAT(block); }
     };
     default => cat;
-    EOF => { CLEAR(block); ADD_BLOCK(); CLEAR_REGS(); RESET_TYPE(); rb_str_append(block,failed_start); failed_start = rb_str_new2(""); p = failed_start_point_p; ts = failed_start_point_ts; te = failed_start_point_te; fgoto done; };
+    EOF => { CLEAR(block); ADD_BLOCK(); CLEAR_REGS(); RESET_TYPE(); rb_str_append(block,failed_start); failed_start = STR_NEW2(""); p = failed_start_point_p; ts = failed_start_point_ts; te = failed_start_point_te; fgoto done; };
   *|;
   bb_spoiler_tag := |*
@@ -303,7 +303,7 @@
       else { CAT(block); }
     };
     default => cat;
-    EOF => { CLEAR(block); CLEAR_REGS(); RESET_TYPE(); rb_str_append(block,failed_start); failed_start = rb_str_new2(""); p = failed_start_point_p; ts = failed_start_point_ts; te = failed_start_point_te; fgoto done; };
+    EOF => { CLEAR(block); CLEAR_REGS(); RESET_TYPE(); rb_str_append(block,failed_start); failed_start = STR_NEW2(""); p = failed_start_point_p; ts = failed_start_point_ts; te = failed_start_point_te; fgoto done; };
   *|;
   block := |*
@@ -386,9 +386,9 @@
   *|;
   main := |*
-    bb_pre_tag_start     { ASET("type", "notextile"); 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; fgoto bb_pre_tag; };
-    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; };
+    bb_pre_tag_start     { ASET("type", "notextile"); rb_str_append(failed_start,STR_NEW(ts,te-ts)); failed_start_point_p = p; failed_start_point_ts = ts; failed_start_point_te = te; fgoto bb_pre_tag; };
+    bb_quote_tag_start   { rb_str_append(failed_start,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,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  { UNLESS_DISABLED_BLOCK(block,noparagraph_line_start,ASET("type", "ignored_line"); fgoto noparagraph_line;) };
     notextile_tag_start { ASET("type", "notextile"); fgoto notextile_tag; };

data/lib/redcloth/version.rb CHANGED Viewed

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

data/test/helper.rb CHANGED Viewed

@@ -93,17 +93,17 @@ EOT
   end
-  module ShowColorCodes
-     def self.included(base)
-       base.class_eval do
-         alias_method :result_without_color_codes, :result unless method_defined?(:result_without_color_codes)
-         alias_method :result, :result_with_color_codes
-       end
-     end
-     def result_with_color_codes(parameters)
-       result_without_color_codes(parameters.collect {|p| p.gsub(/\\e\[(\d+)m/) {"\e[#{$1}m"} })
-     end
-   end
-   Test::Unit::Assertions::AssertionMessage::Template.send(:include, ShowColorCodes)
+  #module ShowColorCodes
+  #   def self.included(base)
+  #     base.class_eval do
+  #       alias_method :result_without_color_codes, :result unless method_defined?(:result_without_color_codes)
+  #       alias_method :result, :result_with_color_codes
+  #     end
+  #   end
+  #   def result_with_color_codes(parameters)
+  #     result_without_color_codes(parameters.collect {|p| p.gsub(/\\e\[(\d+)m/) {"\e[#{$1}m"} })
+  #   end
+   #end
+   #Test::Unit::Assertions::AssertionMessage::Template.send(:include, ShowColorCodes)
 rescue LoadError
 end

data/test/test_custom_tags.rb CHANGED Viewed

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
-require File.join(File.dirname(__FILE__), 'helper')
+require File.join('.',File.dirname(__FILE__), 'helper')
 class TestCustomTags < Test::Unit::TestCase

data/test/test_erb.rb CHANGED Viewed

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
-require File.join(File.dirname(__FILE__), 'helper')
+require File.join('.',File.dirname(__FILE__), 'helper')
 class TestErb < Test::Unit::TestCase

data/test/test_extensions.rb CHANGED Viewed

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
-require File.join(File.dirname(__FILE__), 'helper')
+require File.join('.',File.dirname(__FILE__), 'helper')
 class TestExtensions < Test::Unit::TestCase

data/test/test_formatters.rb CHANGED Viewed

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
-require File.join(File.dirname(__FILE__), 'helper')
+require File.join('.',File.dirname(__FILE__), 'helper')
 class TestFormatters < Test::Unit::TestCase

data/test/test_parser.rb CHANGED Viewed

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
-require File.join(File.dirname(__FILE__), 'helper')
+require File.join('.',File.dirname(__FILE__), 'helper')
 class TestParser < Test::Unit::TestCase

data/test/test_restrictions.rb CHANGED Viewed

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
-require File.join(File.dirname(__FILE__), 'helper')
+require File.join('.',File.dirname(__FILE__), 'helper')
 class TestRestrictions < Test::Unit::TestCase

metadata CHANGED Viewed

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: BBRedCloth
 version: !ruby/object:Gem::Version
-  hash: 55
-  prerelease: false
-  segments:
-  - 0
-  - 8
-  - 4
-  version: 0.8.4
+  prerelease:
+  version: 0.8.5
 platform: ruby
 authors:
 - Ryan Alyea
@@ -15,12 +10,11 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-06-12 00:00:00 -07:00
-default_executable:
+date: 2011-09-02 00:00:00 Z
 dependencies: []
 description: |-
-  BBRedCloth-0.8.4 - Textile parser for Ruby. Includes BBCode additions.
+  BBRedCloth-0.8.5 - Textile parser for Ruby. Includes BBCode additions.
   http://redcloth.org/
 email: ryan@fangamer.com
 executables:
@@ -105,7 +99,6 @@ files:
 - ext/redcloth_scan/redcloth_scan.c
 - ext/redcloth_scan/redcloth_bbcode.c
 - ext/redcloth_scan/redcloth_bbcode_inline.c
-has_rdoc: true
 homepage: http://redcloth.org
 licenses: []
@@ -126,29 +119,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      hash: 63
-      segments:
-      - 1
-      - 8
-      - 4
       version: 1.8.4
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      hash: 11
-      segments:
-      - 1
-      - 2
       version: "1.2"
 requirements: []
 rubyforge_project: bbredcloth
-rubygems_version: 1.3.7
+rubygems_version: 1.8.7
 signing_key:
 specification_version: 3
-summary: BBRedCloth-0.8.4 - Textile parser for Ruby. Includes BBCode additions. http://redcloth.org/
+summary: BBRedCloth-0.8.5 - Textile parser for Ruby. Includes BBCode additions. http://redcloth.org/
 test_files:
 - test/test_custom_tags.rb
 - test/test_erb.rb