Changeset 296

Timestamp:

04/14/2008 10:01:36 (7 months ago)

Author:

jgarber

Message:

Fix handling of dots that start img src. Closes #49

Location:

trunk

Files:

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

trunk/ext/redcloth_scan/redcloth_inline.rl

@@ -24 +24 @@
   # images
   image_src = ( uri ) >A %{ STORE(src) } ;
-  image_is = ( A2 C "."* image_src :> title? ) ;
+  image_is = ( A2 C ". "? image_src :> title? ) ;
   image_link = ( ":" uri >A %{ STORE_URL(href); } ) ;
   image = ( "["? "!" image_is "!" %A image_link? "]"? ) >X ;

trunk/test/images.yml

@@ -173 +173 @@
 in:  (This is an !http://example.com/i/image.jpg!:http://example.com/index.html?foo=bar&a=b#a10)  This is not.
 html: <p>(This is an <a href="http://example.com/index.html?foo=bar&amp;a=b#a10"><img src="http://example.com/i/image.jpg" alt="" /></a>)  This is not.</p>
+---
+name: image with relative src with dot
+in: "!../../image.jpg!"
+html: <p><img src="../../image.jpg" alt="" /></p>
+---
+name: image with class
+in: "!(myclass)image.jpg!"
+html: <p><img src="image.jpg" class="myclass" alt="" /></p>
+---
+name: image with class and dotspace
+in: "!(myclass). image.jpg!"
+html: <p><img src="image.jpg" class="myclass" alt="" /></p>
+---
+name: image with class and relative src with dots
+in: "!(myclass)../../image.jpg!"
+html: <p><img src="../../image.jpg" class="myclass" alt="" /></p>
+---
+name: image with class and dotspace and relative src with dots
+in: "!(myclass). ../../image.jpg!"
+html: <p><img src="../../image.jpg" class="myclass" alt="" /></p>
+---
+name: image with style
+in: "!{color:red}image.jpg!"
+html: <p><img src="image.jpg" style="color:red;" alt="" /></p>
+---
+name: image with style and dotspace
+in: "!{color:red}. image.jpg!"
+html: <p><img src="image.jpg" style="color:red;" alt="" /></p>