Changeset 243

Timestamp:

02/22/2008 16:06:26 (9 months ago)

Author:

jgarber

Message:

Fix escapement of special characters inside inline code bits.

Location:

branches/superredcloth

Files:

• ext/superredcloth_scan/superredcloth.h (modified) (3 diffs)
• ext/superredcloth_scan/superredcloth_inline.rl (modified) (3 diffs)
• test/threshold.yml (modified) (1 diff)

branches/superredcloth/ext/superredcloth_scan/superredcloth.h

@@ -9 +9 @@
 /* function defs */
 void rb_str_cat_escaped(VALUE str, char *tokstart, char *tokend);
+void rb_str_cat_escaped_for_preformatted(VALUE str, char *tokstart, char *tokend);
 VALUE superredcloth_inline(VALUE, char *, char *);
 VALUE superredcloth_inline2(VALUE, VALUE);
@@ -17 +18 @@
 VALUE red_pass2(VALUE, VALUE, VALUE, VALUE);
 VALUE red_pass(VALUE, VALUE, VALUE, ID);
+VALUE red_pass_code(VALUE, VALUE, VALUE, ID);
 
 /* parser macros */
@@ -25 +27 @@
 #define PASS(H, A, T)  rb_str_append(H, red_pass(rb_formatter, regs, ID2SYM(rb_intern(#A)), rb_intern(#T)))
 #define PASS2(H, A, T) rb_str_append(H, red_pass2(rb_formatter, regs, ID2SYM(rb_intern(#A)), ID2SYM(rb_intern(#T))))
+#define PASS_CODE(H, A, T) rb_str_append(H, red_pass_code(rb_formatter, regs, ID2SYM(rb_intern(#A)), rb_intern(#T)))
 #define ADD_BLOCK() \
   rb_str_append(html, red_block(rb_formatter, regs, block)); \

branches/superredcloth/ext/superredcloth_scan/superredcloth_inline.rl

@@ -59 +59 @@
   # markup
   code = "["? "@" >X C mtext >A %T :> "@" "]"? ;
+  code_tag = ("<code>" mspace?) >X (( mtext ) >A %T) :>> (mspace? "</code>") ;
   strong = "["? "*" >X C mtext >A %T :> "*" "]"? ;
   b = "["? "**" >X C mtext >A %T :> "**" "]"? ;
@@ -100 +101 @@
     link { STORE_URL(href); PASS(block, name, link); };
 
-    code { PASS(block, text, code); };
+    code { PASS_CODE(block, text, code); };
+    code_tag { PASS_CODE(block, text, code); };
     strong { PASS(block, text, strong); };
     b { PASS(block, text, b); };
@@ -156 +158 @@
 
 VALUE
+red_pass_code(VALUE rb_formatter, VALUE regs, VALUE ref, ID meth)
+{
+  VALUE txt = rb_hash_aref(regs, ref);
+  if (!NIL_P(txt)) {
+    VALUE txt2 = rb_str_new2("");
+    rb_str_cat_escaped_for_preformatted(txt2, RSTRING(txt)->ptr, RSTRING(txt)->ptr + RSTRING(txt)->len);
+    rb_hash_aset(regs, ref, txt2);
+  }
+  return rb_funcall(rb_formatter, meth, 1, regs);
+}
+
+VALUE
 red_pass2(VALUE rb_formatter, VALUE regs, VALUE ref, VALUE btype)
 {

branches/superredcloth/test/threshold.yml

@@ -367 +367 @@
   // display a hello message
   </code>
-  <code>         print "Hello, World";
+  <code>        print "Hello, World";
   }
   ?&gt;