Changeset 193

Timestamp:

12/18/2007 07:22:19 (11 months ago)

Author:

jgarber

Message:

Don't inline format contents of blockcode (bc.).

Location:

branches/superredcloth

Files:

• ext/superredcloth_scan/superredcloth.h (modified) (1 diff)
• ext/superredcloth_scan/superredcloth_inline.rl (modified) (1 diff)
• ext/superredcloth_scan/superredcloth_scan.rl (modified) (3 diffs)
• test/code.yml (modified) (3 diffs)

branches/superredcloth/ext/superredcloth_scan/superredcloth.h

@@ -26 +26 @@
 #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_BLOCKCODE()    rb_str_append(html, red_blockcode(rb_formatter, regs, block)); CLEAR(block); regs = rb_hash_new()
 #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_inline.rl

@@ -169 +169 @@
 }
 
+VALUE
+red_blockcode(VALUE rb_formatter, VALUE regs, VALUE block)
+{
+  VALUE btype = rb_hash_aref(regs, ID2SYM(rb_intern("type")));
+  block = rb_funcall(block, rb_intern("strip"), 0);
+  if (RSTRING(block)->len > 0)
+  {
+    rb_hash_aset(regs, ID2SYM(rb_intern("text")), block);
+    block = rb_funcall(rb_formatter, rb_intern(RSTRING(btype)->ptr), 1, regs);
+  }
+  return block;
+}
+
 void
 red_inc(VALUE regs, VALUE ref)

branches/superredcloth/ext/superredcloth_scan/superredcloth_scan.rl

@@ -28 +28 @@
   pre_start = "<pre" [^>]* ">" ;
   pre_end = "</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 ) " "+ ) ;
@@ -48 +49 @@
   table = ( tdef? trows >{INLINE(table, table_open);} ) >{ reg = NULL; } ;
 
+  bc := |*
+    block_end       { ADD_BLOCKCODE(); fgoto main; };
+    default => cat;
+  *|;
+
   pre := |*
-    pre_end        { DONE(block); fgoto main; };
+    pre_end         { DONE(block); fgoto main; };
     default => cat;
   *|;
@@ -76 +82 @@
   main := |*
     notextile_start { ASET(type, notextile); fgoto notextile; };
+    bc_start        { ASET(type, bc); fgoto bc; };
     block_start     { fgoto block; };
     footnote_start  { fgoto footnote; };

branches/superredcloth/test/code.yml

@@ -97 +97 @@
   
   bc. __not italics__
+  
+  <pre><code>__also not italics__</code></pre>
 out: |-
   <p><i>italics</i></p>
   
   <pre><code>__not italics__</code></pre>
+  
+  <pre><code>__also not italics__</code></pre>
 ---
 in: |-
@@ -118 +122 @@
 in: |-
   bc. <hello>
+  
   <code> <hello> </code>
 out: |-
-  <pre><code> &lt;hello&gt; </code></pre>
-  <code> &lt;hello&gt; </code>
+  <pre><code>&lt;hello&gt;</code></pre>
+  
+  <p><code> &lt;hello&gt; </code></p>
 ---
 in: |-
@@ -154 +160 @@
 out: |-
   <ul>
-    <li>You can put <span class="caps">HTML</span> code</li>
+    <li>You can put HTML code</li>
     <li>right in Textile</li>
     <li>and it will not put a break<br />
-    between <span class="caps">HTML</span> elements</li>
+    between HTML elements</li>
     <li>or wrap it in a p tag</li>
   </ul>