RedCloth 4.1.1-universal-java → 4.1.9-universal-java

data/ext/redcloth_scan/redcloth_attributes.c.rl

@@ -1,7 +1,7 @@
 /*
  * redcloth_attributes.c.rl
  *
- * Copyright (C) 2008 Jason Garber
+ * Copyright (C) 2009 Jason Garber
  */
 #include <ruby.h>
 #include "redcloth.h"
@@ -24,9 +24,8 @@ redcloth_attribute_parser(machine, self, p, pe)
   char *p, *pe;
 {
   int cs, act;
-  char *ts, *te, *reg, *bck, *eof;
+  char *ts = 0, *te = 0, *reg = 0, *bck = NULL, *eof = NULL;
   VALUE regs = rb_hash_new();
-  VALUE buf = Qnil;
 
   %% write init;
 

data/ext/redcloth_scan/redcloth_attributes.java.rl

@@ -1,7 +1,7 @@
 /*
  * redcloth_attributes.rl
  *
- * Copyright (C) 2008 Jason Garber
+ * Copyright (C) 2009 Jason Garber
  */
 import java.io.IOException;
 
@@ -43,14 +43,12 @@ public class RedclothAttributes extends RedclothScanService.Base {
   }
 
   public void SET_ATTRIBUTE(String B, String A) {
-    buf = ((RubyHash)regs).aref(runtime.newSymbol(B));
-    if(!buf.isNil()) {
-      ((RubyHash)regs).aset(runtime.newSymbol(A), buf);
+    if(!((RubyHash)regs).aref(runtime.newSymbol(B)).isNil()) {
+      ((RubyHash)regs).aset(runtime.newSymbol(A), ((RubyHash)regs).aref(runtime.newSymbol(B)));
     }
   }
  
   private int machine;
-  private IRubyObject buf;
    
   public RedclothAttributes(int machine, IRubyObject self, byte[] data, int p, int pe) {
     this.runtime = self.getRuntime();
@@ -68,7 +66,6 @@ public class RedclothAttributes extends RedclothScanService.Base {
     this.orig_pe = this.pe;
 
     this.regs = RubyHash.newHash(runtime);
-    this.buf = runtime.getNil();
     this.machine = machine;
   }
 
@@ -89,6 +86,8 @@ public class RedclothAttributes extends RedclothScanService.Base {
   }
 
   public static IRubyObject link_attributes(IRubyObject self, IRubyObject str) {
+    Ruby runtime = self.getRuntime();
+
     ByteList bl = str.convertToString().getByteList();
     int cs = redcloth_attributes_en_link_says;
     return new RedclothAttributes(cs, self, bl.bytes, bl.begin, bl.realSize).parse();

data/ext/redcloth_scan/redcloth_attributes.rl

@@ -1,14 +1,14 @@
 /*
  * redcloth_attributes.rl
  *
- * Copyright (C) 2008 Jason Garber
+ * Copyright (C) 2009 Jason Garber
  */
 %%{
 
   machine redcloth_attributes;
   
   C2_CLAS = ( "(" ( [^)#]+ >A %{ STORE("class_buf"); } )? ("#" [^)]+ >A %{STORE("id_buf");} )? ")" ) ;
-  C2_LNGE = ( "[" [^\]]+ >A %{ STORE("lang_buf"); } "]" ) ;
+  C2_LNGE = ( "[" [^\[\]]+ >A %{ STORE("lang_buf"); } "]" ) ;
   C2_STYL = ( "{" [^}]+ >A %{ STORE("style_buf"); } "}" ) ;
   C2 = ( C2_CLAS | C2_STYL | C2_LNGE )+ ;
 

data/ext/redcloth_scan/redcloth_common.rl

@@ -77,7 +77,11 @@
   script_tag_start = ( "<script" [^>]* ">" ) >X >A %T ;
   script_tag_end = ( "</script>" >A %T LF? ) >X ;
   
-
+  code_tag_start = "<code" [^>]* ">" ;
+  code_tag_end = "</code>" ;
+  
+  notextile = "<notextile>" >X (default+ -- "</notextile>") >A %T "</notextile>";
+  
   # URI tokens (lifted from Mongrel)
   CTL = (cntrl | 127);
   safe = ("$" | "-" | "_" | ".");

data/ext/redcloth_scan/redcloth_inline.c.rl

@@ -1,7 +1,7 @@
 /*
  * redcloth_inline.c.rl
  *
- * Copyright (C) 2008 Jason Garber
+ * Copyright (C) 2009 Jason Garber
  */
 #include <ruby.h>
 #include "redcloth.h"
@@ -36,16 +36,52 @@ VALUE
 red_parse_link_attr(VALUE self, VALUE regs, VALUE ref)
 {
   VALUE txt = rb_hash_aref(regs, ref);
-  VALUE new_regs = redcloth_link_attributes(self, txt);
+  VALUE new_regs = red_parse_title(redcloth_link_attributes(self, txt), ref);
+  
   return rb_funcall(regs, rb_intern("update"), 1, new_regs);
 }
 
+VALUE
+red_parse_image_attr(VALUE self, VALUE regs, VALUE ref)
+{
+  
+  return red_parse_title(regs, ref);
+}
+
+VALUE
+red_parse_title(VALUE regs, VALUE ref)
+{
+  // Store title/alt
+  VALUE txt = rb_hash_aref(regs, ref);
+  if ( txt != Qnil ) {
+    char *p = RSTRING_PTR(txt) + RSTRING_LEN(txt);
+    if (*(p - 1) == ')') {
+      char level = -1;
+      p--;
+      while (p > RSTRING_PTR(txt) && level < 0) {
+        switch(*(p - 1)) {
+          case '(': ++level; break;
+          case ')': --level; break;
+        }
+        --p;
+      }
+      VALUE title = STR_NEW(p + 1, RSTRING_PTR(txt) + RSTRING_LEN(txt) - 2 - p );
+      if (p > RSTRING_PTR(txt) && *(p - 1) == ' ') --p;
+      if (p != RSTRING_PTR(txt)) {
+        rb_hash_aset(regs, ref, STR_NEW(RSTRING_PTR(txt), p - RSTRING_PTR(txt) ));
+        rb_hash_aset(regs, ID2SYM(rb_intern("title")), title);
+      }
+    }
+  }
+  return regs;
+}
+
 VALUE
 red_pass_code(VALUE self, VALUE regs, VALUE ref, ID meth)
 {
   VALUE txt = rb_hash_aref(regs, ref);
   if (!NIL_P(txt)) {
-    VALUE txt2 = rb_str_new2("");
+    VALUE txt2 = STR_NEW2("");
     rb_str_cat_escaped_for_preformatted(self, txt2, RSTRING_PTR(txt), RSTRING_PTR(txt) + RSTRING_LEN(txt));
     rb_hash_aset(regs, ref, txt2);
   }
@@ -62,14 +98,14 @@ red_block(VALUE self, VALUE regs, VALUE block, VALUE refs)
   block = rb_funcall(block, rb_intern("strip"), 0);
   if ((!NIL_P(block)) && !NIL_P(btype))
   {
-    method = rb_intern(RSTRING_PTR(btype));
-    if (method == rb_intern("notextile")) {
+    method = rb_str_intern(btype);
+    if (method == ID2SYM(rb_intern("notextile"))) {
       rb_hash_aset(regs, sym_text, block);
     } else {
       rb_hash_aset(regs, sym_text, redcloth_inline2(self, block, refs));
     }
-    if (rb_respond_to(self, method)) {
-      block = rb_funcall(self, method, 1, regs);
+    if (rb_ary_includes(rb_funcall(self, rb_intern("formatter_methods"), 0), method)) {
+      block = rb_funcall(self, SYM2ID(method), 1, regs);
     } else {
       fallback = rb_hash_aref(regs, ID2SYM(rb_intern("fallback")));
       if (!NIL_P(fallback)) {
@@ -111,12 +147,10 @@ redcloth_inline(self, p, pe, refs)
   VALUE refs;
 {
   int cs, act;
-  char *ts, *te, *reg, *eof;
-  char *orig_p = p, *orig_pe = pe;
-  VALUE block = rb_str_new2("");
+  char *ts = NULL, *te = NULL, *reg = NULL, *eof = NULL;
+  char *orig_p = p;
+  VALUE block = STR_NEW2("");
   VALUE regs = Qnil;
-  unsigned int opts = 0;
-  VALUE buf = Qnil;
   
   %% write init;
 
@@ -135,7 +169,7 @@ rb_str_cat_escaped(self, str, ts, te)
   VALUE self, str;
   char *ts, *te;
 {
-  VALUE source_str = rb_str_new(ts, te-ts);
+  VALUE source_str = STR_NEW(ts, te-ts);
   VALUE escaped_str = rb_funcall(self, rb_intern("escape"), 1, source_str);
   rb_str_concat(str, escaped_str);
 }
@@ -145,7 +179,7 @@ rb_str_cat_escaped_for_preformatted(self, str, ts, te)
   VALUE self, str;
   char *ts, *te;
 {
-  VALUE source_str = rb_str_new(ts, te-ts);
+  VALUE source_str = STR_NEW(ts, te-ts);
   VALUE escaped_str = rb_funcall(self, rb_intern("escape_pre"), 1, source_str);
   rb_str_concat(str, escaped_str);
 }

data/ext/redcloth_scan/redcloth_inline.java.rl

@@ -1,7 +1,7 @@
 /*
  * redcloth_inline.rl
  *
- * Copyright (C) 2008 Jason Garber
+ * Copyright (C) 2009 Jason Garber
  */
 import java.io.IOException;
 
@@ -53,10 +53,40 @@ public class RedclothInline extends RedclothScanService.Base {
 
   public IRubyObject red_parse_link_attr(IRubyObject self, IRubyObject regs, IRubyObject ref) {
     IRubyObject txt = ((RubyHash)regs).aref(ref);
-    IRubyObject new_regs = RedclothAttributes.link_attributes(self, txt);
+    IRubyObject new_regs = red_parse_title(RedclothAttributes.link_attributes(self, txt), ref);
     return regs.callMethod(runtime.getCurrentContext(), "update", new_regs);
   }
 
+  public IRubyObject red_parse_image_attr(IRubyObject self, IRubyObject regs, IRubyObject ref) {
+    return red_parse_title(regs, ref);
+  }
+
+  public IRubyObject red_parse_title(IRubyObject regs, IRubyObject ref) {
+    IRubyObject name = ((RubyHash)regs).aref(ref);
+    if ( !name.isNil() ) {
+      String s = name.convertToString().toString();
+      int p = s.length();
+      if (s.charAt(p - 1) == ')') {
+        int level = -1;
+        p--;
+        while (p > 0 && level < 0) {
+          switch(s.charAt(p - 1)) {
+            case '(': ++level; break;
+            case ')': --level; break;
+          }
+          --p;
+        }
+        IRubyObject title = runtime.newString(s.substring(p + 1, s.length() - 1));
+        if(p > 0 && s.charAt(p - 1) == ' ') --p;
+        if(p != 0) {
+          ((RubyHash)regs).aset(ref, runtime.newString(s.substring(0, p)));
+          ((RubyHash)regs).aset(runtime.newSymbol("title"), title);
+        }
+      }
+    }
+    return regs;
+  }
+
   public void PASS_CODE(IRubyObject H, String A, String T, int O) {
     ((RubyString)H).append(red_pass_code(self, regs, runtime.newSymbol(A), T));
   }
@@ -69,8 +99,11 @@ public class RedclothInline extends RedclothScanService.Base {
     red_parse_link_attr(self, regs, runtime.newSymbol(A));
   }
 
+  public void PARSE_IMAGE_ATTR(String A) {
+    red_parse_image_attr(self, regs, runtime.newSymbol(A));
+  }
+
   private int opts;
-  private IRubyObject buf;
 
   public RedclothInline(IRubyObject self, byte[] data, int p, int pe, IRubyObject refs) {
     this.runtime = self.getRuntime();
@@ -90,7 +123,6 @@ public class RedclothInline extends RedclothScanService.Base {
     this.block = RubyString.newEmptyString(runtime);
     this.regs = runtime.getNil();
     this.opts = 0;
-    this.buf = runtime.getNil();
   }
 
 

data/ext/redcloth_scan/redcloth_inline.rl

@@ -1,7 +1,7 @@
 /*
  * redcloth_inline.rl
  *
- * Copyright (C) 2008 Jason Garber
+ * Copyright (C) 2009 Jason Garber
  */
 %%{
 
@@ -11,17 +11,18 @@
   mtext_noquotes = mtext -- '"' ;
   quoted_mtext = '"' mtext_noquotes '"' ;
   mtext_including_quotes = (mtext_noquotes ' "' mtext_noquotes '" ' mtext_noquotes?)+ ;
-  link_says = ( C_noactions "."* " "* ((quoted_mtext | mtext_including_quotes | mtext_noquotes) -- '":') ) >A %{ STORE("link_text"); } ;
+  link_says = ( C_noactions "."* " "* ((quoted_mtext | mtext_including_quotes | mtext_noquotes) -- '":') ) >A %{ STORE("name"); } ;
   link_says_noquotes_noactions = ( C_noquotes_noactions "."* " "* ((mtext_noquotes) -- '":') ) ;
   link = ( '"' link_says '":' %A uri %{ STORE_URL("href"); } ) >X ;
   link_noquotes_noactions = ( '"' link_says_noquotes_noactions '":' uri ) ;
   bracketed_link = ( '["' link_says '":' %A uri %{ STORE("href"); } :> "]" ) >X ;
 
   # images
-  image_src = ( uri ) >A %{ STORE("src"); } ;
-  image_is = ( A2 C ". "? image_src :> title? ) ;
+  image_title = ( '(' mtext ')' ) ;
+  image_is = ( A2 C ". "? (uri image_title?) >A %{ STORE("src"); } ) ;
   image_link = ( ":" uri >A %{ STORE_URL("href"); } ) ;
-  image = ( "["? "!" image_is "!" %A image_link? "]"? ) >X ;
+  image = ( "!" image_is "!" %A image_link? ) >X ;
+  bracketed_image = ( "[!" image_is "!" %A image_link? "]" ) >X ;
 
   # footnotes
   footno = "[" >X %A digit+ %T "]" ;
@@ -29,17 +30,14 @@
   # markup
   end_markup_phrase = (" " | PUNCT | EOF | LF) @{ fhold; };
   code = "["? "@" >X mtext >A %T :> "@" "]"? ;
-  code_tag_start = "<code" [^>]* ">" ;
-  code_tag_end = "</code>" ;
   script_tag = ( "<script" [^>]* ">" (default+ -- "</script>") "</script>" LF? ) >X >A %T ;
-  notextile = "<notextile>" >X (default+ -- "</notextile>") >A %T "</notextile>";
   strong = "["? "*" >X mtext >A %T :> "*" "]"? ;
   b = "["? "**" >X mtext >A %T :> "**" "]"? ;
   em = "["? "_" >X mtext >A %T :> "_" "]"? ;
   i = "["? "__" >X mtext >A %T :> "__" "]"? ;
   del = "[-" >X C ( mtext ) >A %T :>> "-]" ;
   emdash_parenthetical_phrase_with_spaces = " -- " mtext " -- " ;
-  del_phrase = (( " " >A %{ STORE("beginning_space"); } "-") >X C ( mtext ) >A %T :>> ( "-" end_markup_phrase )) - emdash_parenthetical_phrase_with_spaces ;
+  del_phrase = (( " " >A %{ STORE("beginning_space"); } "-" | "-" when starts_line) >X C ( mtext ) >A %T :>> ( "-" end_markup_phrase )) - emdash_parenthetical_phrase_with_spaces ;
   ins = "["? "+" >X mtext >A %T :> "+" "]"? ;
   sup = "[^" >X mtext >A %T :> "^]" ;
   sup_phrase = ( "^" when starts_phrase) >X ( mtext ) >A %T :>> ( "^" end_markup_phrase ) ;
@@ -97,10 +95,11 @@
 
   main := |*
     
-    image { INLINE(block, "image"); };
+    image { PARSE_IMAGE_ATTR("src"); INLINE(block, "image"); };
+    bracketed_image { PARSE_IMAGE_ATTR("src"); INLINE(block, "image"); };
     
-    link { PARSE_LINK_ATTR("link_text"); PASS(block, "name", "link"); };
-    bracketed_link { PARSE_LINK_ATTR("link_text"); PASS(block, "name", "link"); };
+    link { PARSE_LINK_ATTR("name"); PASS(block, "name", "link"); };
+    bracketed_link { PARSE_LINK_ATTR("name"); PASS(block, "name", "link"); };
     
     code { PARSE_ATTR("text"); PASS_CODE(block, "text", "code", opts); };
     code_tag_start { CAT(block); fgoto code_tag; };

data/ext/redcloth_scan/redcloth_scan.c.rl

@@ -1,7 +1,7 @@
 /*
  * redcloth_scan.c.rl
  *
- * Copyright (C) 2008 Jason Garber
+ * Copyright (C) 2009 Jason Garber
  */
 #define redcloth_scan_c
 
@@ -31,11 +31,11 @@ redcloth_transform(self, p, pe, refs)
   VALUE refs;
 {
   char *orig_p = p, *orig_pe = pe;
-  int cs, act, nest;
+  int cs, act, nest = 0;
   char *ts = NULL, *te = NULL, *reg = NULL, *bck = NULL, *eof = NULL;
-  VALUE html = rb_str_new2("");
-  VALUE table = rb_str_new2("");
-  VALUE block = rb_str_new2("");
+  VALUE html = STR_NEW2("");
+  VALUE table = STR_NEW2("");
+  VALUE block = STR_NEW2("");
   VALUE regs; CLEAR_REGS()
   
   
@@ -84,7 +84,7 @@ redcloth_html_esc(int argc, VALUE* argv, VALUE self) //(self, str, level)
   
   rb_scan_args(argc, argv, "11", &str, &level);
   
-  VALUE new_str = rb_str_new2("");
+  VALUE new_str = STR_NEW2("");
   if (str == Qnil)
     return new_str;
     
@@ -95,7 +95,7 @@ redcloth_html_esc(int argc, VALUE* argv, VALUE self) //(self, str, level)
   
   char *ts = RSTRING_PTR(str), *te = RSTRING_PTR(str) + RSTRING_LEN(str);
   char *t = ts, *t2 = ts, *ch = NULL;
-  if (te <= ts) return;
+  if (te <= ts) return Qnil;
 
   while (t2 < te) {
     ch = NULL;
@@ -142,7 +142,7 @@ redcloth_html_esc(int argc, VALUE* argv, VALUE self) //(self, str, level)
 static VALUE
 redcloth_latex_esc(VALUE self, VALUE str)
 {  
-  VALUE new_str = rb_str_new2("");
+  VALUE new_str = STR_NEW2("");
   
   if (str == Qnil)
     return new_str;
@@ -154,7 +154,7 @@ redcloth_latex_esc(VALUE self, VALUE str)
   
   char *ts = RSTRING_PTR(str), *te = RSTRING_PTR(str) + RSTRING_LEN(str);
   char *t = ts, *t2 = ts, *ch = NULL;
-  if (te <= ts) return;
+  if (te <= ts) return Qnil;
 
   while (t2 < te) {
     ch = NULL;
@@ -181,7 +181,7 @@ redcloth_latex_esc(VALUE self, VALUE str)
       if (t2 > t)
         rb_str_cat(new_str, t, t2-t);
       VALUE opts = rb_hash_new();
-      rb_hash_aset(opts, ID2SYM(rb_intern("text")), rb_str_new2(ch));
+      rb_hash_aset(opts, ID2SYM(rb_intern("text")), STR_NEW2(ch));
       rb_str_concat(new_str, rb_funcall(self, rb_intern("entity"), 1, opts));
       t = t2 + 1;
     }
@@ -201,12 +201,10 @@ static VALUE
 redcloth_to(self, formatter)
   VALUE self, formatter;
 {
-  char *pe, *p;
-  int len = 0;
-  
-  rb_funcall(self, rb_intern("delete!"), 1, rb_str_new2("\r"));
+  rb_funcall(self, rb_intern("delete!"), 1, STR_NEW2("\r"));
   VALUE working_copy = rb_obj_clone(self);
   rb_extend_object(working_copy, formatter);
+  
   if (rb_funcall(working_copy, rb_intern("lite_mode"), 0) == Qtrue) {
     return redcloth_inline2(working_copy, self, rb_hash_new());
   } else {

data/ext/redcloth_scan/redcloth_scan.java.rl

@@ -1,7 +1,7 @@
 /*
  * redcloth_scan.java.rl
  *
- * Copyright (C) 2008 Jason Garber
+ * Copyright (C) 2009 Jason Garber
  */
 import java.io.IOException;
 
@@ -108,8 +108,20 @@ public class RedclothScanService implements BasicLibraryService {
         boolean punct = true;
         while(p > reg && punct) {
           switch(data[p - 1]) {
+            case ')':
+              int tempP = p - 1;
+              int level = -1;
+              while(tempP > reg) {
+                switch(data[tempP - 1]) {
+                  case '(': ++level; break;
+                  case ')': --level; break;
+                }
+                --tempP;
+              }
+              if (level == 0) { punct = false; } else { --p; }
+              break;
             case '!': case '"': case '#': case '$': case '%': case ']': case '[': case '&': case '\'':
-            case '*': case '+': case ',': case '-': case '.': case ')': case '(': case ':':
+            case '*': case '+': case ',': case '-': case '.': case '(': case ':':
             case ';': case '=': case '?': case '@': case '\\': case '^': case '_':
             case '`': case '|': case '~': p--; break;
             default: punct = false;
@@ -160,7 +172,8 @@ public class RedclothScanService implements BasicLibraryService {
           ((RubyHash)regs).aset(sym_text, inline2(self, block, refs));
         }
 
-        if(self.respondsTo(method.asJavaString())) {
+        IRubyObject formatterMethods = ((RubyObject)self).callMethod(runtime.getCurrentContext(), "formatter_methods");
+        if( ((RubyArray)formatterMethods).includes(runtime.getCurrentContext(), method) ) {
           block = self.callMethod(runtime.getCurrentContext(), method.asJavaString(), regs);
         } else {
           IRubyObject fallback = ((RubyHash)regs).aref(runtime.newSymbol("fallback"));
@@ -229,6 +242,10 @@ public class RedclothScanService implements BasicLibraryService {
       ((RubyString)H).append(self.callMethod(runtime.getCurrentContext(), T, regs));
     }
 
+    public void RSTRIP_BANG(IRubyObject H) {
+      ((RubyString)H).callMethod(runtime.getCurrentContext(), "rstrip!");
+    }
+
     public void DONE(IRubyObject H) {
       ((RubyString)html).append(H);
       CLEAR(H);
@@ -403,6 +420,11 @@ public class RedclothScanService implements BasicLibraryService {
 
     ((RubyObject)workingCopy).extend(new IRubyObject[]{formatter});
     
+    IRubyObject workingCopyMethods = workingCopy.callMethod(runtime.getCurrentContext(), "methods");
+    IRubyObject classInstanceMethods = workingCopy.getType().callMethod(runtime.getCurrentContext(), "instance_methods");
+    IRubyObject customTags = workingCopyMethods.callMethod(runtime.getCurrentContext(), "-", classInstanceMethods);
+    ((RubyObject)workingCopy).setInstanceVariable("@custom_tags", customTags);
+    
     if(workingCopy.callMethod(runtime.getCurrentContext(), "lite_mode").isTrue()) { 
       return inline2(workingCopy, self, RubyHash.newHash(runtime));
     } else {