Changeset 253

Timestamp:

03/07/2008 15:23:23 (9 months ago)

Author:

jgarber

Message:

Allow "tight" links and images (no space surrounding) per Textile2. (Requires scanner leaving actions capability found in Ragel trunk, which will become 6.1 shortly)
Finally got rid of weird p++ and p-- in STORE_URL.

Location:

branches/superredcloth/ext/superredcloth_scan

Files:

• superredcloth.h (modified) (2 diffs)
• superredcloth_inline.rl (modified) (2 diffs)

branches/superredcloth/ext/superredcloth_scan/superredcloth.h

@@ -53 +53 @@
 #define STORE_URL(T) \
   if (p > reg && reg >= ts) { \
-    p++; \
     char punct = 1; \
     while (p > reg && punct == 1) { \
@@ -67 +66 @@
   } \
   STORE(T); \
-  p--; \
   if ( !NIL_P(refs) && rb_funcall(refs, rb_intern("has_key?"), 1, rb_hash_aref(regs, ID2SYM(rb_intern(#T)))) ) { \
     rb_hash_aset(regs, ID2SYM(rb_intern(#T)), rb_hash_aref(refs, rb_hash_aref(regs, ID2SYM(rb_intern(#T))))); \

branches/superredcloth/ext/superredcloth_scan/superredcloth_inline.rl

@@ -23 +23 @@
   # links
   link_says = ( mtext+ ) >A %{ STORE(name) } ;
-  link = ( '"' C "."* " "* link_says " "* :> title? :> '":' %A uri ) >X ;
+  link = ( "["? '"' C "."* " "* link_says " "* :> title? :> '":' %A uri %{ STORE_URL(href); } :> "]"? ) >X ;
 
   # images
   image_src = ( uri ) >A %{ STORE(src) } ;
   image_is = ( A2 C "."* image_src :> title? ) ;
-  image_link = ( ":" uri ) ;
-  image = ( "!" image_is "!" %A image_link? ) >X ;
+  image_link = ( ":" uri >A %{ STORE_URL(href); } ) ;
+  image = ( "["? "!" image_is "!" %A image_link? "]"? ) >X ;
 
   # footnotes
@@ -74 +74 @@
   main := |*
 
-    image { if ( *reg == ':') { reg += 1; STORE_URL(href); } INLINE(block, image); };
-
-    link { STORE_URL(href); PASS(block, name, link); };
+    image { INLINE(block, image); };
+
+    link { PASS(block, name, link); };
 
     code { PASS_CODE(block, text, code); };