Changeset 238

Timestamp:

02/19/2008 09:29:09 (9 months ago)

Author:

jgarber

Message:

Fix extended blocks. It matches Textile 2 behavior as well.

Location:

branches/superredcloth

Files:

• ext/superredcloth_scan/superredcloth.h (modified) (1 diff)
• ext/superredcloth_scan/superredcloth_scan.rl (modified) (6 diffs)
• lib/superredcloth.rb (modified) (1 diff)

branches/superredcloth/ext/superredcloth_scan/superredcloth.h

@@ -25 +25 @@
 #define PASS(H, A, T)  rb_str_append(H, red_pass(rb_formatter, regs, ID2SYM(rb_intern(#A)), rb_intern(#T)))
 #define PASS2(H, A, T) rb_str_append(H, red_pass2(rb_formatter, regs, ID2SYM(rb_intern(#A)), ID2SYM(rb_intern(#T))))
-#define ADD_BLOCK()    rb_str_append(html, red_block(rb_formatter, regs, block)); CLEAR(block); regs = rb_hash_new()
+#define ADD_BLOCK() \
+  rb_str_append(html, red_block(rb_formatter, regs, block)); \
+  extend = Qnil; \
+  CLEAR(block); \
+  regs = rb_hash_new()
 #define ADD_EXTENDED_BLOCK()    rb_str_append(html, red_block(rb_formatter, regs, block)); CLEAR(block);
 #define ADD_BLOCKCODE()    rb_str_append(html, red_blockcode(rb_formatter, regs, block)); CLEAR(block); regs = rb_hash_new()
+#define ADD_EXTENDED_BLOCKCODE()    rb_str_append(html, red_blockcode(rb_formatter, regs, block)); CLEAR(block);
 #define ASET(T, V)     rb_hash_aset(regs, ID2SYM(rb_intern(#T)), rb_str_new2(#V));
 #define AINC(T)        red_inc(regs, ID2SYM(rb_intern(#T)));

branches/superredcloth/ext/superredcloth_scan/superredcloth_scan.rl

@@ -19 +19 @@
   include superredcloth_common "ext/superredcloth_scan/superredcloth_common.rl";
 
-  action notextile { rb_str_append(html, rb_funcall(rb_formatter, rb_intern("ignore"), 1, regs)); }
-  action extend { extend = 1; }
-  action no_extend { extend = 0; }
-  action add_unless_extended { if (extend == 0) { ADD_BLOCK(); fgoto main; } else { ADD_EXTENDED_BLOCK(); } }
+  action extend { extend = rb_hash_aref(regs, ID2SYM(rb_intern("type"))); }
 
   # blocks
@@ -30 +27 @@
   pre_start = "<pre" [^>]* ">" (space* "<code>")? ;
   pre_end = ("</code>" space*)? "</pre>" ;
-  bc_start = ( "bc" A C :> "." ( "." %extend | "" %no_extend ) " "+ ) ;
-  btype = ( "p" | "h1" | "h2" | "h3" | "h4" | "h5" | "h6" | "bq" | "bc" | "pre" | "notextile" | "div" ) >A %{ STORE(type) } ;
-  block_start = ( btype A C :> "." ( "." %extend | "" %no_extend ) " "+ ) ;
-  block_end = ( CRLF{2} | EOF );
-  extended_block_end = block_end . block_start >A @{ p = reg - 1; };
+  bc_start = ( "bc" >A %{ STORE(type) } A C :> "." ( "." %extend | "" ) " "+ ) ;
+  bq_start = ( "bq" >A %{ STORE(type) } A C :> "." ( "." %extend | "" ) " "+ ) ;
+  btype = ( "p" | "h1" | "h2" | "h3" | "h4" | "h5" | "h6" | "pre" | "notextile" | "div" ) ;
+  block_start = ( btype >A %{ STORE(type) } A C :> "." ( "." %extend | "" ) " "+ ) ;
+  next_block_start = ( btype A C :> "." ) ;
+  double_return = CRLF{2} ;
+  block_end = ( double_return | EOF );
+  extended_block_end = double_return . next_block_start >A @{ p = reg - 1; } ;
   ftype = ( "fn" >A %{ STORE(type) } digit+ >A %{ STORE(id) } ) ;
   footnote_start = ( ftype A C :> dotspace ) ;
@@ -61 +61 @@
   table = ( tdef? trows >{INLINE(table, table_open);} ) >{ reg = NULL; } ;
 
-  bc := |*
-    block_end       { ADD_BLOCKCODE(); fgoto main; };
-    default => esc_pre;
-  *|;
-
   pre := |*
     pre_end         { CAT(block); DONE(block); fgoto main; };
@@ -81 +76 @@
   *|;
 
+  bc := |*
+    EOF                { ADD_BLOCKCODE(); INLINE(html, bc_close); plain_block = rb_str_new2("p"); fgoto main; };
+    extended_block_end { ADD_BLOCKCODE(); INLINE(html, bc_close); plain_block = rb_str_new2("p"); fgoto main; };
+    double_return      { if (NIL_P(extend)) { ADD_BLOCKCODE(); INLINE(html, bc_close); plain_block = rb_str_new2("p"); fgoto main; } else { ADD_EXTENDED_BLOCKCODE(); } };
+    default => esc_pre;
+  *|;
+
+  bq := |*
+    EOF                { ADD_BLOCK(); INLINE(html, bq_close); fgoto main; };
+    extended_block_end { ADD_BLOCK(); INLINE(html, bq_close); fgoto main; };
+    double_return      { if (NIL_P(extend)) { ADD_BLOCK(); INLINE(html, bq_close); fgoto main; } else { ADD_EXTENDED_BLOCK(); } };
+    default => cat;
+  *|;
+
   block := |*
-    block_end => add_unless_extended;
+    EOF                { ADD_BLOCK(); fgoto main; };
     extended_block_end { ADD_BLOCK(); fgoto main; };
+    double_return      { if (NIL_P(extend)) { ADD_BLOCK(); fgoto main; } else { ADD_EXTENDED_BLOCK(); } };
     default => cat;
   *|;
@@ -104 +114 @@
     standalone_html { CAT(block); DONE(block); };
     html_start      { ASET(type, notextile); CAT(block); fgoto html; };
-    bc_start        { ASET(type, bc); fgoto bc; };
+    bc_start        { INLINE(html, bc_open); ASET(type, code); plain_block = rb_str_new2("code"); fgoto bc; };
+    bq_start        { INLINE(html, bq_open); ASET(type, p); fgoto bq; };
     block_start     { fgoto block; };
     footnote_start  { fgoto footnote; };
@@ -139 +150 @@
   int list_continue = 0;
   VALUE plain_block = rb_str_new2("p");
-  int extend = 0;
+  VALUE extend = Qnil;
   char listm[10] = "";
 

branches/superredcloth/lib/superredcloth.rb

@@ -98 +98 @@
   end
   
-  def bc(opts)
+  def bc_open(opts)
     opts[:block] = true
-    "<pre#{pba(opts)}><code#{pba(opts)}>#{opts[:text]}</code></pre>"
+    "<pre#{pba(opts)}>"
   end
   
-  def bq(opts)
+  def bc_close(opts)
+    "</pre>"
+  end
+  
+  def bq_open(opts)
     opts[:block] = true
-    "<blockquote#{pba(opts)}><p#{pba(opts)}>#{opts[:text]}</p></blockquote>"
+    "<blockquote#{pba(opts)}>"
+  end
+  
+  def bq_close(opts)
+    "</blockquote>"
   end