Fix <notextile> blocks being included in following paragraph. [#119 s…

…tate:resolved]
jgarber · May 27, 2009 · 200b459 · 200b459
1 parent a9d5f73
commit 200b459
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/ext/redcloth_scan/redcloth_common.rl b/ext/redcloth_scan/redcloth_common.rl
@@ -94,7 +94,7 @@
   code_tag_start = "<code" [^>]* ">" ;
   code_tag_end = "</code>" ;
 
-  notextile = "<notextile>" >X (default+ -- "</notextile>") >A %T "</notextile>";
+  notextile = "<notextile>" >X LF? default+ >A %T :>> "</notextile>";
 
   # URI tokens (lifted from Mongrel)
   CTL = (cntrl | 127);

diff --git a/ext/redcloth_scan/redcloth_scan.rl b/ext/redcloth_scan/redcloth_scan.rl
@@ -8,7 +8,7 @@
   machine redcloth_scan;
 
   # blocks
-  notextile_tag = notextile (LF | EOF) ;
+  notextile_tag = notextile (LF+ | EOF) ;
   noparagraph_line_start = " "+ ;
   notextile_block_start = ( "notextile" >A %{ STORE("type"); } A C :> "." ( "." %extend | "" ) " "+ ) %SET_ATTR ;
   pre_tag_start = "<pre" [^>]* ">" (space* code_tag_start)? ;
@@ -165,7 +165,7 @@
 
   main := |*
     noparagraph_line_start  { ASET("type", "ignored_line"); fgoto noparagraph_line; };
-    notextile_tag   { INLINE(block, "notextile"); };
+    notextile_tag   { INLINE(html, "notextile"); };
     notextile_block_start { ASET("type", "notextile"); fgoto notextile_block; };
     script_tag_start { CAT(block); fgoto script_tag; };
     pre_tag_start       { ASET("type", "notextile"); CAT(block); fgoto pre_tag; };

diff --git a/spec/fixtures/basic.yml b/spec/fixtures/basic.yml
@@ -51,6 +51,24 @@ html: |-
   <p>When the elephant comes to take a p. you&#8230;</p>
   </blockquote>
 --- 
+name: notextile block
+in: |-
+  Some text:
+  
+  <notextile>
+  <div class="example"><pre>
+  Some code
+  </pre></div>
+  </notextile>
+  
+  Some more text.
+html: |-
+  <p>Some text:</p>
+  <div class="example"><pre>
+  Some code
+  </pre></div>
+  <p>Some more text.</p>
+---
 name: notextile block containing block start
 in: |-
   notextile. I saw a ship. It ate my elephant.