Changeset 234

Timestamp:

02/12/2008 13:56:38 (9 months ago)

Author:

jgarber

Message:

The best implementation of the dimension pattern yet.

Location:

branches/superredcloth

Files:

• ext/superredcloth_scan/superredcloth_inline.rl (modified) (3 diffs)
• lib/superredcloth.rb (modified) (1 diff)
• test/hobix.yml (modified) (2 diffs)

branches/superredcloth/ext/superredcloth_scan/superredcloth_inline.rl

@@ -82 +82 @@
   acronym = ( [A-Z] >A [A-Z0-9]{2,} %T "(" default+ >A %{ STORE(title) } :> ")" ) >X ;
   caps = ( upper{3,} >A %*T ) >X ;
-  dim = ( digit+ >A %{ STORE(x) } (" x " | "x") digit+ >A %*{ STORE(y) } ) >X ;
+  dim = ( digit+ >A %{ STORE(x) } (" x " @{ ASET(space, true)} | "x") digit @{ fhold; } ) >X ;
   tm = [Tt] [Mm] ;
   trademark = " "? ( "[" tm "]" | "(" tm ")" ) ;
@@ -90 +90 @@
   copyright = ( "[" cee "]" | "(" cee ")" ) ;
   entity = ( "&" %A ( '#' digit+ | alpha+ ) %T ';' ) >X ;
+
+  other_phrase = phrase -- dim;
+
 
   main := |*
@@ -132 +135 @@
     html_comment => cat;
 
-    phrase => esc;
+    other_phrase => esc;
     PUNCT => esc;
     space => esc;

branches/superredcloth/lib/superredcloth.rb

@@ -161 +161 @@
   
   def dim(opts)
-    "#{opts[:x]} × #{opts[:y]}"
+    space = opts[:space] ? " " : ''
+    "#{opts[:x]}#{space}×#{space}"
   end
   

branches/superredcloth/test/hobix.yml

@@ -69 +69 @@
 desc: The letter 'x' becomes a dimension sign when used between digits.
 in: "Observe: 2x3."
-out: "<p>Observe: 2 &#215; 3.</p>"
+out: "<p>Observe: 2&#215;3.</p>"
 --- 
 name: dimension sign with spaces
@@ -77 +77 @@
 name: dimension signs chained
 in: "Observe: 2x3x4."
-out: "<p>Observe: 2 &#215; 3 &#215; 4.</p>"
+out: "<p>Observe: 2&#215;3&#215;4.</p>"
 --- 
 name: trademark and copyright