Closing HTML tag can end paragraph, blockquote in place of double-ret…

…urn. [#13 state:resolved]
jgarber · Jul 14, 2008 · 1976e76 · 1976e76
1 parent 549d6dd
commit 1976e76
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 0 deletions.
diff --git a/ext/redcloth_scan/redcloth_scan.rl b/ext/redcloth_scan/redcloth_scan.rl
@@ -59,6 +59,7 @@ int SYM_escape_preformatted;
   html_start = indent >B %{STORE_B(indent_before_start)} block_start_tag >B %{STORE_B(start_tag)}  indent >B %{STORE_B(indent_after_start)} ;
   html_end = indent >B %{STORE_B(indent_before_end)} block_end_tag >B %{STORE_B(end_tag)} (indent LF?) >B %{STORE_B(indent_after_end)} ;
   standalone_html = indent (block_start_tag | block_empty_tag | block_end_tag) indent LF+;
+  html_end_terminating_block = ( indent block_end_tag ) >A @{ p = reg - 1; } ;
 
   # tables
   para = ( default+ ) -- LF ;
@@ -219,6 +220,18 @@ int SYM_escape_preformatted;
         fgoto main; 
       }
     };
+    html_end_terminating_block { 
+        if (NIL_P(extend)) { 
+          ADD_BLOCK(); 
+          INLINE(html, bq_close); 
+          fgoto main; 
+        } else {
+          ADD_EXTENDED_BLOCK(); 
+          INLINE(html, bq_close); 
+          END_EXTENDED(); 
+          fgoto main; 
+        }
+      };
     default => cat;
   *|;
 
@@ -245,6 +258,16 @@ int SYM_escape_preformatted;
         fgoto main; 
       }      
     };
+    html_end_terminating_block { 
+      if (NIL_P(extend)) { 
+        ADD_BLOCK(); 
+        fgoto main; 
+      } else { 
+        ADD_EXTENDED_BLOCK(); 
+        END_EXTENDED(); 
+        fgoto main; 
+      }      
+    };
     LF list_start { 
       ADD_BLOCK(); 
       list_layout = rb_ary_new(); 

diff --git a/test/html.yml b/test/html.yml
@@ -247,3 +247,25 @@ html: |-
   ;var i,c,x;while(eval(kode));}hivelogic_enkoder();
   /* ]]> */
   </script>.</p>
+---
+name: HTML end tag can end paragraph
+in: |-
+  <div>
+  This is a paragraph.
+  </div>
+html: |-
+  <div>
+  <p>This is a paragraph.</p>
+  </div>
+---
+name: HTML end tag can end blockquote
+in: |-
+  <div>
+  bq. This is a blockquote.
+  </div>
+html: |-
+  <div>
+  <blockquote>
+  <p>This is a blockquote.</p>
+  </blockquote>
+  </div>