Changeset 298

Timestamp:

04/16/2008 06:21:50 (7 months ago)

Author:

jgarber

Message:

Allow a list to follow a paragraph with no space in between for backward compatibility.

Location:

trunk

Files:

• ext/redcloth_scan/redcloth_scan.rl (modified) (1 diff)
• test/lists.yml (modified) (1 diff)

trunk/ext/redcloth_scan/redcloth_scan.rl

@@ -232 +232 @@
         END_EXTENDED(); 
         fgoto main; 
-      } 
-    };
+      }      
+    };
+    CRLF list_start { 
+      ADD_BLOCK(); 
+      list_layout = rb_ary_new(); 
+      LIST_ITEM(); 
+      fgoto list; 
+    };
+    
     default => cat;
   *|;

trunk/test/lists.yml

@@ -217 +217 @@
         <li>Like this</li>
   </ul>
+---
+name: ordered list immediately following paragraph
+desc: Normally a paragraph and a list that follows it should be separated by two newlines.  Textile-2.0.0 recognizes the list even when separated by only one newline, but creates invalid XHTML by placing the list inside the paragraph.  RedCloth recognizes the pattern for backward compatibility, but creates valid XHTML.
+in: |-
+  A simple example.
+  # One
+  # Two
+html: |-
+  <p>A simple example.</p>
+  <ol>
+        <li>One</li>
+        <li>Two</li>
+  </ol>
+---
+name: unordered list immediately following paragraph
+in: |-
+  A simple example.
+  * One
+  * Two
+html: |-
+  <p>A simple example.</p>
+  <ul>
+        <li>One</li>
+        <li>Two</li>
+  </ul>
+---
+name: ordered list immediately following extended block
+in: |-
+  div.. Here it comes.
+  
+  A simple example.
+  # One
+  # Two
+html: |-
+  <div>Here it comes.</div>
+  <div>A simple example.</div>
+  <ol>
+        <li>One</li>
+        <li>Two</li>
+  </ol>
+---
+name: unordered list immediately following extended block
+in: |-
+  div.. Here it comes.
+  
+  A simple example.
+  * One
+  * Two
+html: |-
+  <div>Here it comes.</div>
+  <div>A simple example.</div>
+  <ul>
+        <li>One</li>
+        <li>Two</li>
+  </ul>