BBRedCloth 0.8.0 → 0.8.1

data/BBRedCloth.gemspec

@@ -2,26 +2,26 @@
 
 Gem::Specification.new do |s|
   s.name = %q{BBRedCloth}
-  s.version = "0.8.0"
+  s.version = "0.8.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Alyea"]
-  s.date = %q{2010-09-12}
-  s.default_executable = %q{bbredcloth}
-  s.description = %q{BBRedCloth-0.8.0 - Textile parser for Ruby. Includes BBCode additions.
+  s.date = %q{2011-04-19}
+  s.default_executable = %q{redcloth}
+  s.description = %q{BBRedCloth-0.8.1 - Textile parser for Ruby. Includes BBCode additions.
 http://redcloth.org/}
   s.email = %q{ryan@fangamer.com}
-  s.executables = ["bbredcloth"]
+  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/bbredcloth", "CHANGELOG", "COPYING", "ext/mingw-rbconfig.rb", "ext/redcloth_scan/extconf.rb", "ext/redcloth_scan/redcloth.h", "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.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.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.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.0 - Textile parser for Ruby. Includes BBCode additions. http://redcloth.org/}
+  s.summary = %q{BBRedCloth-0.8.1 - 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/Manifest

@@ -1,10 +1,25 @@
-bin/bbredcloth
+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

data/bin/{bbredcloth → redcloth}

@@ -9,23 +9,17 @@ if %w(--version -v).include? ARGV.first
 end
 
 output_as = "html"
-bbcode_only = false
 opts = OptionParser.new do |opts|
-    opts.banner = "Usage: bbredcloth [options] [redcloth_formatted.txt]"
+    opts.banner = "Usage: redcloth [options] [redcloth_formatted.txt]"
     opts.separator "If no file specified, STDIN will be used. If you are typing input, you can send an EOF by pressing ^D (^Z on Windows)"
     opts.separator ""
     opts.on("-o", "--output STYLE", "Output format (defaults to #{output_as})") do |o|
         output_as = o
     end
-    opts.on("-b","--bbcode-only", "BBCode-Only") do |b|
-        bbcode_only = b
-    end
 end
 opts.parse! ARGV
 
-p bbcode_only
-
-red = RedCloth.new( ARGF.read, [(bbcode_only ? :bbcode_only : :bbcode)] )
+red = RedCloth.new( ARGF.read )
 out_meth = "to_#{ output_as }"
 if red.respond_to? out_meth
     puts red.method( out_meth ).call

data/ext/redcloth_scan/redcloth.h

@@ -36,6 +36,7 @@ void red_inc(VALUE, VALUE);
 VALUE red_block(VALUE, VALUE, VALUE, VALUE);
 VALUE red_blockcode(VALUE, VALUE, VALUE);
 VALUE red_pass(VALUE, VALUE, VALUE, ID, VALUE);
+VALUE red_passthrough(VALUE self, char *ts, char *te, VALUE refs);
 VALUE red_pass_code(VALUE, VALUE, VALUE, ID);
 VALUE redcloth_bbcode(VALUE, char *, char *, VALUE);
 VALUE redcloth_bbcode2(VALUE, VALUE, VALUE);
@@ -45,8 +46,10 @@ VALUE redcloth_bbcode_inline2(VALUE, VALUE, VALUE);
 /* parser macros */
 #define CALL_STACK_SIZE 20
 #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_cat_escaped(self, H, ts, te); } \
-  else { 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 }
+#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)

data/ext/redcloth_scan/redcloth_attributes.c.rl

@@ -0,0 +1,56 @@
+/*
+ * redcloth_attributes.c.rl
+ *
+ * Copyright (C) 2008 Jason Garber
+ */
+#include <ruby.h>
+#include "redcloth.h"
+
+%%{
+
+  machine redcloth_attributes;
+  include redcloth_common "redcloth_common.c.rl";
+  include redcloth_attributes "redcloth_attributes.rl";
+
+}%%
+
+%% write data nofinal;
+
+
+VALUE
+redcloth_attribute_parser(machine, self, p, pe)
+  int machine;
+  VALUE self;
+  char *p, *pe;
+{
+  int cs, act;
+  char *ts, *te, *reg, *bck, *eof;
+  VALUE regs = rb_hash_new();
+  VALUE buf = Qnil;
+
+  %% write init;
+
+  cs = machine;
+
+  %% write exec;
+
+  return regs;
+}
+
+VALUE
+redcloth_attributes(self, str)
+  VALUE self, str;
+{
+  StringValue(str);
+  int cs = redcloth_attributes_en_inline;
+  return redcloth_attribute_parser(cs, self, RSTRING_PTR(str), RSTRING_PTR(str) + RSTRING_LEN(str) + 1);
+}
+
+VALUE
+redcloth_link_attributes(self, str)
+  VALUE self, str;
+{
+  StringValue(str);
+  int cs = redcloth_attributes_en_link_says;
+  return redcloth_attribute_parser(cs, self, RSTRING_PTR(str), RSTRING_PTR(str) + RSTRING_LEN(str) + 1);
+}

data/ext/redcloth_scan/redcloth_attributes.java.rl

@@ -0,0 +1,96 @@
+/*
+ * redcloth_attributes.rl
+ *
+ * Copyright (C) 2008 Jason Garber
+ */
+import java.io.IOException;
+
+import org.jruby.Ruby;
+import org.jruby.RubyArray;
+import org.jruby.RubyClass;
+import org.jruby.RubyHash;
+import org.jruby.RubyModule;
+import org.jruby.RubyNumeric;
+import org.jruby.RubyObject;
+import org.jruby.RubyString;
+import org.jruby.RubySymbol;
+import org.jruby.anno.JRubyMethod;
+import org.jruby.runtime.Block;
+import org.jruby.runtime.CallbackFactory;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.jruby.exceptions.RaiseException;
+import org.jruby.runtime.load.BasicLibraryService;
+
+import org.jruby.util.ByteList;
+
+public class RedclothAttributes extends RedclothScanService.Base {
+
+%%{
+
+  machine redcloth_attributes;
+  include redcloth_common "redcloth_common.java.rl";
+  include redcloth_attributes "redcloth_attributes.rl";
+
+}%%
+
+%% write data nofinal;
+
+  public void SET_ATTRIBUTES() {
+    SET_ATTRIBUTE("class_buf", "class");
+    SET_ATTRIBUTE("id_buf", "id");
+    SET_ATTRIBUTE("lang_buf", "lang");
+    SET_ATTRIBUTE("style_buf", "style");
+  }
+
+  public void SET_ATTRIBUTE(String B, String A) {
+    buf = ((RubyHash)regs).aref(runtime.newSymbol(B));
+    if(!buf.isNil()) {
+      ((RubyHash)regs).aset(runtime.newSymbol(A), buf);
+    }
+  }
+ 
+  private int machine;
+  private IRubyObject buf;
+   
+  public RedclothAttributes(int machine, IRubyObject self, byte[] data, int p, int pe) {
+    this.runtime = self.getRuntime();
+    this.self = self;
+
+    // This is GROSS but necessary for EOF matching
+    this.data = new byte[pe+1];
+    System.arraycopy(data, p, this.data, 0, pe);
+    this.data[pe] = 0;
+
+    this.p = 0;
+    this.pe = pe+1;
+    this.eof = this.pe;
+    this.orig_p = 0;
+    this.orig_pe = this.pe;
+
+    this.regs = RubyHash.newHash(runtime);
+    this.buf = runtime.getNil();
+    this.machine = machine;
+  }
+
+  public IRubyObject parse() {
+    %% write init;
+  
+    cs = machine;
+
+    %% write exec;
+
+    return regs;
+  }
+
+  public static IRubyObject attributes(IRubyObject self, IRubyObject str) {
+    ByteList bl = str.convertToString().getByteList();
+    int cs = redcloth_attributes_en_inline;
+    return new RedclothAttributes(cs, self, bl.bytes, bl.begin, bl.realSize).parse();
+  }
+
+  public static IRubyObject link_attributes(IRubyObject self, IRubyObject str) {
+    ByteList bl = str.convertToString().getByteList();
+    int cs = redcloth_attributes_en_link_says;
+    return new RedclothAttributes(cs, self, bl.bytes, bl.begin, bl.realSize).parse();
+  }
+}

data/ext/redcloth_scan/redcloth_attributes.rl

@@ -0,0 +1,33 @@
+/*
+ * redcloth_attributes.rl
+ *
+ * Copyright (C) 2008 Jason Garber
+ */
+%%{
+
+  machine redcloth_attributes;
+  
+  C2_CLAS = ( "(" ( [^)#]+ >A %{ STORE("class_buf"); } )? ("#" [^)]+ >A %{STORE("id_buf");} )? ")" ) ;
+  C2_LNGE = ( "[" [^\]]+ >A %{ STORE("lang_buf"); } "]" ) ;
+  C2_STYL = ( "{" [^}]+ >A %{ STORE("style_buf"); } "}" ) ;
+  C2 = ( C2_CLAS | C2_STYL | C2_LNGE )+ ;
+
+  mtext_with_attributes = ( C2 mtext >A %T ) >X ;
+
+  inline := |*
+
+    mtext_with_attributes { SET_ATTRIBUTES(); } ;
+
+  *|;
+
+  link_text_with_attributes = C2 "."* " "* ( mtext+ ) >A %{ STORE("name"); } ;
+  link_text_without_attributes = ( mtext+ ) >B %{ STORE_B("name_without_attributes"); } ;
+
+  link_says := |*
+
+    link_text_with_attributes { SET_ATTRIBUTES(); } ;
+    link_text_without_attributes { SET_ATTRIBUTE("name_without_attributes", "name"); } ;
+
+  *|;
+
+}%%;

data/ext/redcloth_scan/redcloth_bbcode.c

@@ -2014,35 +2014,35 @@ _eof_trans:
 	break;
 	case 26:
 #line 60 "ext/redcloth_scan/redcloth_bbcode.c.rl"
-	{te = p+1;{ PASS(block, "text", "strong"); }}
+	{te = p+1;{ UNLESS_DISABLED_INLINE(block,strong,PASS(block, "text", "strong");) }}
 	break;
 	case 27:
 #line 61 "ext/redcloth_scan/redcloth_bbcode.c.rl"
-	{te = p+1;{ PASS(block, "text", "em"); }}
+	{te = p+1;{ UNLESS_DISABLED_INLINE(block,em,PASS(block, "text", "em");) }}
 	break;
 	case 28:
 #line 62 "ext/redcloth_scan/redcloth_bbcode.c.rl"
-	{te = p+1;{ PASS(block, "text", "ins"); }}
+	{te = p+1;{ UNLESS_DISABLED_INLINE(block,ins,PASS(block, "text", "ins");) }}
 	break;
 	case 29:
 #line 63 "ext/redcloth_scan/redcloth_bbcode.c.rl"
-	{te = p+1;{ PASS(block, "text", "del"); }}
+	{te = p+1;{ UNLESS_DISABLED_INLINE(block,s,PASS(block, "text", "del");) }}
 	break;
 	case 30:
 #line 64 "ext/redcloth_scan/redcloth_bbcode.c.rl"
-	{te = p+1;{ PASS(block, "text", "del"); }}
+	{te = p+1;{ UNLESS_DISABLED_INLINE(block,del,PASS(block, "text", "del");) }}
 	break;
 	case 31:
 #line 65 "ext/redcloth_scan/redcloth_bbcode.c.rl"
-	{te = p+1;{ PASS(block, "text", "ins"); }}
+	{te = p+1;{ UNLESS_DISABLED_INLINE(block,ins,PASS(block, "text", "ins");) }}
 	break;
 	case 32:
 #line 66 "ext/redcloth_scan/redcloth_bbcode.c.rl"
-	{te = p+1;{ PASS(block, "text", "sub"); }}
+	{te = p+1;{ UNLESS_DISABLED_INLINE(block,sub,PASS(block, "text", "sub");) }}
 	break;
 	case 33:
 #line 67 "ext/redcloth_scan/redcloth_bbcode.c.rl"
-	{te = p+1;{ PASS(block, "text", "sup"); }}
+	{te = p+1;{ UNLESS_DISABLED_INLINE(block,sup,PASS(block, "text", "sup");) }}
 	break;
 	case 34:
 #line 8 "ext/redcloth_scan/redcloth_bbcode.c.rl"
@@ -2050,27 +2050,27 @@ _eof_trans:
 	break;
 	case 35:
 #line 69 "ext/redcloth_scan/redcloth_bbcode.c.rl"
-	{te = p+1;{ PASS(block, "text", "color"); }}
+	{te = p+1;{ UNLESS_DISABLED_INLINE(block,color,PASS(block, "text", "color");) }}
 	break;
 	case 36:
 #line 70 "ext/redcloth_scan/redcloth_bbcode.c.rl"
-	{te = p+1;{ PASS(block, "text", "bbsize"); }}
+	{te = p+1;{ UNLESS_DISABLED_INLINE(block,size,PASS(block, "text", "bbsize");) }}
 	break;
 	case 37:
 #line 71 "ext/redcloth_scan/redcloth_bbcode.c.rl"
-	{te = p+1;{ PASS(block, "text", "bbalign"); }}
+	{te = p+1;{ UNLESS_DISABLED_INLINE(block,align,PASS(block, "text", "bbalign");) }}
 	break;
 	case 38:
 #line 72 "ext/redcloth_scan/redcloth_bbcode.c.rl"
-	{te = p+1;{ PASS(block, "text", "acronym"); }}
+	{te = p+1;{ UNLESS_DISABLED_INLINE(block,acronym,PASS(block, "text", "acronym");) }}
 	break;
 	case 39:
 #line 73 "ext/redcloth_scan/redcloth_bbcode.c.rl"
-	{te = p+1;{ PASS(block, "name", "link"); }}
+	{te = p+1;{ UNLESS_DISABLED_INLINE(block,link,PASS(block, "name", "link");) }}
 	break;
 	case 40:
 #line 74 "ext/redcloth_scan/redcloth_bbcode.c.rl"
-	{te = p+1;{ PASS(block, "name", "link"); }}
+	{te = p+1;{ UNLESS_DISABLED_INLINE(block,link,PASS(block, "name", "link");) }}
 	break;
 	case 41:
 #line 75 "ext/redcloth_scan/redcloth_bbcode.c.rl"

data/ext/redcloth_scan/redcloth_bbcode.c.rl

@@ -0,0 +1,60 @@
+/*
+ * redcloth_bbcode.c.rl
+ *
+ * Copyright (C) 2009 Ryan Alyea
+ */
+#include <ruby.h>
+#include "redcloth.h"
+
+%%{
+  
+  machine redcloth_bbcode;
+  include redcloth_common "redcloth_common.c.rl";
+  include redcloth_bbcode "redcloth_bbcode.rl";
+  
+}%%
+
+%% write data nofinal;
+
+VALUE
+redcloth_bbcode(self, p, pe, refs)
+  VALUE self;
+  char *p, *pe;
+  VALUE 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 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("");
+  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;
+  
+  %% write init;
+
+  %% write exec;
+  
+  if (RSTRING_LEN(block) > 0)
+  {
+    rb_hash_aset(regs, ID2SYM(rb_intern("text")), block);
+    rb_str_append(html, rb_funcall(self, rb_intern("p"), 1, regs));
+    CLEAR(block); 
+    CLEAR_REGS()
+  }
+
+  return rb_funcall(html, rb_intern("strip"), 0);
+}
+
+VALUE
+redcloth_bbcode2(self, str, refs)
+  VALUE self, str, refs;
+{
+  StringValue(str);
+  return redcloth_bbcode(self, RSTRING_PTR(str), RSTRING_PTR(str) + RSTRING_LEN(str) + 1, refs);
+}

data/ext/redcloth_scan/redcloth_bbcode.rl

@@ -0,0 +1,127 @@
+/*
+ * redcloth_bbcode.rl
+ *
+ * Copyright (C) 2009 Ryan Alyea
+ */
+%%{
+
+  machine redcloth_bbcode;
+  include redcloth_bbcode_inline 'redcloth_bbcode_inline.rl';
+  
+  #bb_pre_tag_start = "[pre" [^\]]* "]" (space* "[code]")? ;
+  #bb_pre_tag_end = ("[/code]" space*)? "[/pre]" LF? ;
+  
+  bb_quote_title = " title"? "=" bbmtext %{ if(store_cite) STORE("cite"); } >A;
+  bb_quote_tag_start = LF? ("[quote" bb_quote_title? "]") ;
+  bb_quote_tag_end =  "[/quote]" LF? ;
+  
+  bb_spoiler_tag_title = " title"? "=" bbmtext %{ if(store_title) STORE("title"); } >A;
+  bb_spoiler_tag_start = ("[spoiler" bb_spoiler_tag_title? "]") ;
+  bb_spoiler_tag_end =  "[/spoiler]" LF? ;
+  
+  bbcode_tag = "[";
+  bbcode_tag_not_quote_end = bbcode_tag -- bb_quote_tag_end;
+  
+  blank_line = LF;
+  double_return = LF{2,} ;
+  
+  direct_uri = "http" "s"? "://" uchar+ absolute_path?;
+  automatic_url = direct_uri >X >A %{ STORE_URL("href"); } ;
+  
+  bb_pre_tag := |*
+    bb_pre_tag_end {
+      rb_hash_aset(regs, ID2SYM(rb_intern("text")), rb_funcall(self, rb_intern("escape_pre"), 1, rb_funcall(block,rb_intern("strip"),0)));
+      rb_str_append(html,rb_funcall(self, rb_intern("bb_block_pre"), 1, regs));
+      CLEAR(block);
+      CLEAR_REGS();
+      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; };
+  *|;
+  
+  bb_quote_tag := |*
+    bb_quote_tag_start => { CAT(block); ++nested_quote; };
+    bb_quote_tag_end {
+      if (nested_quote-- == 0) {
+        //printf("\n\nQUOTE TAG: %s \n\n",RSTRING_PTR(rb_funcall(block,rb_intern("strip"),0)));
+        rb_hash_aset(regs, ID2SYM(rb_intern("text")), redcloth_bbcode2(self,rb_funcall(block,rb_intern("strip"),0),rb_hash_new()));
+        rb_str_append(html,rb_funcall(self, rb_intern("bbquote"), 1, regs));
+        nested_quote = 0;
+        store_cite = 1;
+        CLEAR(block);
+        CLEAR_REGS();
+        fgoto main;
+      }
+      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; };
+  *|;
+  
+  bb_spoiler_tag := |*
+    bb_spoiler_tag_start => { CAT(block); ++nested_spoiler; };
+    bb_spoiler_tag_end {
+      if (nested_spoiler-- == 0) {
+        rb_hash_aset(regs, ID2SYM(rb_intern("text")), redcloth_bbcode2(self,rb_funcall(block,rb_intern("strip"),0),rb_hash_new()));
+        rb_str_append(html,rb_funcall(self, rb_intern("bb_block_spoiler"), 1, regs));
+        nested_spoiler = 0;
+        store_title = 1;
+        CLEAR(block);
+        CLEAR_REGS();
+        fgoto main;
+      }
+      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; };
+  *|;
+  
+  done := |*
+    EOF;
+  *|;
+  
+  block := |*
+    EOF { 
+      rb_hash_aset(regs, ID2SYM(rb_intern("text")), rb_funcall(block,rb_intern("strip"),0));
+      rb_str_append(html, rb_funcall(self, rb_intern("p"), 1, regs));
+      CLEAR(block); 
+      CLEAR_REGS()
+      fgoto main;
+    };
+    bb_quote_tag_start {
+      rb_hash_aset(regs, ID2SYM(rb_intern("text")), rb_funcall(block,rb_intern("strip"),0));
+      rb_str_append(html, rb_funcall(self, rb_intern("p"), 1, regs));
+      CLEAR(block); 
+      CLEAR_REGS()
+      failed_start_point_p = p; failed_start_point_ts = ts; failed_start_point_te = te;
+      fgoto bb_quote_tag;
+    };
+    automatic_url { UNLESS_DISABLED_INLINE(block,link,PASS(block, "name", "link");) };
+    bbcode_tag => {
+      fhold;
+      fcall bbcode_inline;
+    };
+    double_return {
+      rb_hash_aset(regs, ID2SYM(rb_intern("text")), rb_funcall(block,rb_intern("strip"),0));
+      rb_str_append(html, rb_funcall(self, rb_intern("p"), 1, regs));
+      CLEAR(block); 
+      CLEAR_REGS()
+      fgoto main; 
+    };
+    default => esc;
+  *|;
+  
+  main := |*
+    #bbcode_tag => {
+    #  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; };
+    blank_line => cat;
+    default => { fhold; fgoto block; };
+  *|;
+
+}%%;

data/ext/redcloth_scan/redcloth_bbcode_inline.c

@@ -1722,35 +1722,35 @@ _eof_trans:
 	break;
 	case 23:
 #line 60 "ext/redcloth_scan/redcloth_bbcode_inline.c.rl"
-	{te = p+1;{ PASS(block, "text", "strong"); }}
+	{te = p+1;{ UNLESS_DISABLED_INLINE(block,strong,PASS(block, "text", "strong");) }}
 	break;
 	case 24:
 #line 61 "ext/redcloth_scan/redcloth_bbcode_inline.c.rl"
-	{te = p+1;{ PASS(block, "text", "em"); }}
+	{te = p+1;{ UNLESS_DISABLED_INLINE(block,em,PASS(block, "text", "em");) }}
 	break;
 	case 25:
 #line 62 "ext/redcloth_scan/redcloth_bbcode_inline.c.rl"
-	{te = p+1;{ PASS(block, "text", "ins"); }}
+	{te = p+1;{ UNLESS_DISABLED_INLINE(block,ins,PASS(block, "text", "ins");) }}
 	break;
 	case 26:
 #line 63 "ext/redcloth_scan/redcloth_bbcode_inline.c.rl"
-	{te = p+1;{ PASS(block, "text", "del"); }}
+	{te = p+1;{ UNLESS_DISABLED_INLINE(block,s,PASS(block, "text", "del");) }}
 	break;
 	case 27:
 #line 64 "ext/redcloth_scan/redcloth_bbcode_inline.c.rl"
-	{te = p+1;{ PASS(block, "text", "del"); }}
+	{te = p+1;{ UNLESS_DISABLED_INLINE(block,del,PASS(block, "text", "del");) }}
 	break;
 	case 28:
 #line 65 "ext/redcloth_scan/redcloth_bbcode_inline.c.rl"
-	{te = p+1;{ PASS(block, "text", "ins"); }}
+	{te = p+1;{ UNLESS_DISABLED_INLINE(block,ins,PASS(block, "text", "ins");) }}
 	break;
 	case 29:
 #line 66 "ext/redcloth_scan/redcloth_bbcode_inline.c.rl"
-	{te = p+1;{ PASS(block, "text", "sub"); }}
+	{te = p+1;{ UNLESS_DISABLED_INLINE(block,sub,PASS(block, "text", "sub");) }}
 	break;
 	case 30:
 #line 67 "ext/redcloth_scan/redcloth_bbcode_inline.c.rl"
-	{te = p+1;{ PASS(block, "text", "sup"); }}
+	{te = p+1;{ UNLESS_DISABLED_INLINE(block,sup,PASS(block, "text", "sup");) }}
 	break;
 	case 31:
 #line 8 "ext/redcloth_scan/redcloth_bbcode_inline.c.rl"
@@ -1758,27 +1758,27 @@ _eof_trans:
 	break;
 	case 32:
 #line 69 "ext/redcloth_scan/redcloth_bbcode_inline.c.rl"
-	{te = p+1;{ PASS(block, "text", "color"); }}
+	{te = p+1;{ UNLESS_DISABLED_INLINE(block,color,PASS(block, "text", "color");) }}
 	break;
 	case 33:
 #line 70 "ext/redcloth_scan/redcloth_bbcode_inline.c.rl"
-	{te = p+1;{ PASS(block, "text", "bbsize"); }}
+	{te = p+1;{ UNLESS_DISABLED_INLINE(block,size,PASS(block, "text", "bbsize");) }}
 	break;
 	case 34:
 #line 71 "ext/redcloth_scan/redcloth_bbcode_inline.c.rl"
-	{te = p+1;{ PASS(block, "text", "bbalign"); }}
+	{te = p+1;{ UNLESS_DISABLED_INLINE(block,align,PASS(block, "text", "bbalign");) }}
 	break;
 	case 35:
 #line 72 "ext/redcloth_scan/redcloth_bbcode_inline.c.rl"
-	{te = p+1;{ PASS(block, "text", "acronym"); }}
+	{te = p+1;{ UNLESS_DISABLED_INLINE(block,acronym,PASS(block, "text", "acronym");) }}
 	break;
 	case 36:
 #line 73 "ext/redcloth_scan/redcloth_bbcode_inline.c.rl"
-	{te = p+1;{ PASS(block, "name", "link"); }}
+	{te = p+1;{ UNLESS_DISABLED_INLINE(block,link,PASS(block, "name", "link");) }}
 	break;
 	case 37:
 #line 74 "ext/redcloth_scan/redcloth_bbcode_inline.c.rl"
-	{te = p+1;{ PASS(block, "name", "link"); }}
+	{te = p+1;{ UNLESS_DISABLED_INLINE(block,link,PASS(block, "name", "link");) }}
 	break;
 	case 38:
 #line 75 "ext/redcloth_scan/redcloth_bbcode_inline.c.rl"