Changeset 261

Timestamp:

03/10/2008 14:59:10 (8 months ago)

Author:

jgarber

Message:

Make image alignment trigger parent paragraph's float style.

Location:

branches/superredcloth

Files:

• ext/superredcloth_scan/superredcloth_scan.rl (modified) (2 diffs)
• lib/superredcloth.rb (modified) (1 diff)

branches/superredcloth/ext/superredcloth_scan/superredcloth_scan.rl

@@ -47 +47 @@
   link_alias = ( "[" >{ ASET(type, ignore) } %A phrase %T "]" %A uri %{ STORE_URL(href); } ) ;
   
+  # image lookahead
+  IMG_A_LEFT = "<" %{ ASET(float, left) } ;
+  IMG_A_RIGHT = ">" %{ ASET(float, right) } ;
+  aligned_image = ( "["? "!" (IMG_A_LEFT | IMG_A_RIGHT) ) >A @{ p = reg - 1; } ;
+  
   # html blocks
   BlockTagName = Name* - ("pre" | "notextile" | "a" | "applet" | "basefont" | "bdo" | "br" | "font" | "iframe" | "img" | "map" | "object" | "param" | "q" | "script" | "span" | "sub" | "sup" | "abbr" | "acronym" | "cite" | "code" | "del" | "dfn" | "em" | "ins" | "kbd" | "samp" | "strong" | "var" | "b" | "big" | "i" | "s" | "small" | "strike" | "tt" | "u");
@@ -152 +157 @@
     table           { INLINE(table, table_close); DONE(table); fgoto block; };
     link_alias      { rb_hash_aset(refs_found, rb_hash_aref(regs, ID2SYM(rb_intern("text"))), rb_hash_aref(regs, ID2SYM(rb_intern("href")))); DONE(block); };
+    aligned_image   { rb_hash_aset(regs, ID2SYM(rb_intern("type")), plain_block); fgoto block; };
     blank_line => cat;
     default

branches/superredcloth/lib/superredcloth.rb

@@ -131 +131 @@
   
   def image(opts)
-    p_opts = {:float => opts.delete(:align)} if opts[:align]
+    opts.delete(:align)
     opts[:alt] = opts[:title]
     img = "<img src=\"#{urlesc opts[:src]}\"#{pba(opts)} alt=\"#{opts[:alt]}\" />"  
     img = "<a href=\"#{urlesc opts[:href]}\">#{img}</a>" if opts[:href]
-    img = "<p#{pba(p_opts)}>#{img}</p>" if p_opts
     img
   end