RedCloth 4.1.1 → 4.1.9

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 {

data/ext/redcloth_scan/redcloth_scan.rl

@@ -1,19 +1,18 @@
 /*
  * redcloth_scan.rl
  *
- * Copyright (C) 2008 Jason Garber
+ * Copyright (C) 2009 Jason Garber
  */
 %%{
 
   machine redcloth_scan;
 
   # blocks
-  notextile_tag_start = "<notextile>" ;
-  notextile_tag_end = "</notextile>" LF? ;
+  notextile_tag = notextile (LF | EOF) ;
   noparagraph_line_start = " "+ ;
   notextile_block_start = ( "notextile" >A %{ STORE("type"); } A C :> "." ( "." %extend | "" ) " "+ ) ;
-  pre_tag_start = "<pre" [^>]* ">" (space* "<code>")? ;
-  pre_tag_end = ("</code>" space*)? "</pre>" LF? ;
+  pre_tag_start = "<pre" [^>]* ">" (space* code_tag_start)? ;
+  pre_tag_end = (code_tag_end space*)? "</pre>" LF? ;
   pre_block_start = ( "pre" >A %{ STORE("type"); } A C :> "." ( "." %extend | "" ) " "+ ) ;
   bc_start = ( "bc" >A %{ STORE("type"); } A C :> "." ( "." %extend | "" ) " "+ ) ;
   bq_start = ( "bq" >A %{ STORE("type"); } A C :> "." ( "." %extend | "" ) ( ":" %A uri %{ STORE("cite"); } )? " "+ ) ;
@@ -30,7 +29,7 @@
   ol = "#" %{nest++; list_type = "ol";};
   ul_start  = ( ul | ol )* ul A C :> " "+   ;
   ol_start  = ( ul | ol )* ol N A C :> " "+ ;
-  list_start  = ( ul_start | ol_start ) >{nest = 0;} ;
+  list_start  = " "* ( ul_start | ol_start ) >{nest = 0;} ;
   dt_start = "-" . " "+ ;
   dd_start = ":=" ;
   long_dd  = dd_start " "* LF %{ ADD_BLOCK(); ASET("type", "dd"); } any+ >A %{ TRANSFORM("text"); } :>> "=:" ;
@@ -109,11 +108,6 @@
     LF  { ADD_BLOCK(); fgoto main; };
     default => cat;
   *|;
-
-  notextile_tag := |*
-    notextile_tag_end   { ADD_BLOCK(); fgoto main; };
-    default => cat;
-  *|;
   
   notextile_block := |*
     EOF {
@@ -178,6 +172,7 @@
       } else { 
         ADD_EXTENDED_BLOCKCODE(); 
         CAT(html); 
+        RSTRIP_BANG(html);
         INLINE(html, "bc_close"); 
         SET_PLAIN_BLOCK("p");
         END_EXTENDED(); 
@@ -293,7 +288,7 @@
 
   main := |*
     noparagraph_line_start  { ASET("type", "ignored_line"); fgoto noparagraph_line; };
-    notextile_tag_start { ASET("type", "notextile"); fgoto notextile_tag; };
+    notextile_tag   { INLINE(block, "notextile"); };
     notextile_block_start { ASET("type", "notextile"); fgoto notextile_block; };
     script_tag_start { CAT(block); fgoto script_tag; };
     pre_tag_start       { ASET("type", "notextile"); CAT(block); fgoto pre_tag; };

data/lib/redcloth/formatters/base.rb

@@ -1,26 +1,6 @@
 module RedCloth::Formatters
   module Base
     
-    def pba(opts)
-      opts.delete(:style) if filter_styles
-      opts.delete(:class) if filter_classes
-      opts.delete(:id) if filter_ids
-
-      atts = ''
-      opts[:"text-align"] = opts.delete(:align)
-      opts[:style] += ';' if opts[:style] && (opts[:style][-1..-1] != ';')
-      [:float, :"text-align", :"vertical-align"].each do |a|
-        opts[:style] = "#{a}:#{opts[a]};#{opts[:style]}" if opts[a]
-      end
-      [:"padding-right", :"padding-left"].each do |a|
-        opts[:style] = "#{a}:#{opts[a]}em;#{opts[:style]}" if opts[a]
-      end
-      [:style, :class, :lang, :id, :colspan, :rowspan, :title, :start, :align].each do |a|
-        atts << " #{a}=\"#{ html_esc(opts[a].to_s, :html_escape_attributes) }\"" if opts[a]
-      end
-      atts
-    end
-    
     def ignore(opts)
       opts[:text]
     end
@@ -41,6 +21,28 @@ module RedCloth::Formatters
       end
     end
     
+  private
+    
+    def pba(opts)
+      opts.delete(:style) if filter_styles
+      opts.delete(:class) if filter_classes
+      opts.delete(:id) if filter_ids
+
+      atts = ''
+      opts[:"text-align"] = opts.delete(:align)
+      opts[:style] += ';' if opts[:style] && (opts[:style][-1..-1] != ';')
+      [:float, :"text-align", :"vertical-align"].each do |a|
+        opts[:style] = "#{a}:#{opts[a]};#{opts[:style]}" if opts[a]
+      end
+      [:"padding-right", :"padding-left"].each do |a|
+        opts[:style] = "#{a}:#{opts[a]}em;#{opts[:style]}" if opts[a]
+      end
+      [:style, :class, :lang, :id, :colspan, :rowspan, :title, :start, :align].each do |a|
+        atts << " #{a}=\"#{ html_esc(opts[a].to_s, :html_escape_attributes) }\"" if opts[a]
+      end
+      atts
+    end
+    
     def method_missing(method, opts)
       opts[:text] || ""
     end
@@ -52,6 +54,10 @@ module RedCloth::Formatters
     def after_transform(text)
       
     end
+    
+    def formatter_methods
+      singleton_methods.map! {|method| method.to_sym }
+    end
 
   end
 end

data/lib/redcloth/formatters/html.rb

@@ -1,25 +1,6 @@
 module RedCloth::Formatters::HTML
   include RedCloth::Formatters::Base
   
-  # escapement for regular HTML (not in PRE tag)
-  def escape(text)
-    html_esc(text)
-  end
-
-  # escapement for HTML in a PRE tag
-  def escape_pre(text)
-    html_esc(text, :html_escape_preformatted)
-  end
-  
-  # escaping for HTML attributes
-  def escape_attribute(text)
-    html_esc(text, :html_escape_attributes)
-  end
-  
-  def after_transform(text)
-    text.chomp!
-  end
-    
   [:h1, :h2, :h3, :h4, :h5, :h6, :p, :pre, :div].each do |m|
     define_method(m) do |opts|
       "<#{m}#{pba(opts)}>#{opts[:text]}</#{m}>\n"
@@ -129,18 +110,7 @@ module RedCloth::Formatters::HTML
     "</blockquote>\n"
   end
   
-  LINK_TEXT_WITH_TITLE_RE = /
-          ([^"]+?)         # $text
-          \s?
-          \(([^)]+?)\)     # $title
-          $
-      /x
   def link(opts)
-    if opts[:name] =~ LINK_TEXT_WITH_TITLE_RE
-      md = LINK_TEXT_WITH_TITLE_RE.match(opts[:name])
-      opts[:name] = md[1]
-      opts[:title] = md[2]
-    end
     "<a href=\"#{escape_attribute opts[:href]}\"#{pba(opts)}>#{opts[:name]}</a>"
   end
   
@@ -281,6 +251,28 @@ module RedCloth::Formatters::HTML
     opts[:text] + "\n"
   end
   
+private
+  
+  # escapement for regular HTML (not in PRE tag)
+  def escape(text)
+    html_esc(text)
+  end
+
+  # escapement for HTML in a PRE tag
+  def escape_pre(text)
+    html_esc(text, :html_escape_preformatted)
+  end
+  
+  # escaping for HTML attributes
+  def escape_attribute(text)
+    html_esc(text, :html_escape_attributes)
+  end
+  
+  def after_transform(text)
+    text.chomp!
+  end
+  
+  
   def before_transform(text)
     clean_html(text) if sanitize_html
   end

data/lib/redcloth/formatters/latex.rb

@@ -14,14 +14,6 @@ module RedCloth::Formatters::LATEX
 
   RedCloth::TextileDoc.send(:include, Settings)
   
-  def escape(text)
-    latex_esc(text)
-  end
-
-  def escape_pre(text)
-    text
-  end
-  
   # headers
   { :h1 => 'section*',
     :h2 => 'subsection*',
@@ -38,7 +30,7 @@ module RedCloth::Formatters::LATEX
   # commands 
   { :strong => 'textbf',
     :em => 'emph',
-    :i  => 'emph',
+    :i  => 'textit',
     :b  => 'textbf',
     :ins => 'underline',
     :del => 'sout',
@@ -102,24 +94,50 @@ module RedCloth::Formatters::LATEX
   end
   
   def td(opts)
-    "\t\t\t#{opts[:text]} &\n"
+    column = @table_row.size
+    if opts[:colspan]
+      opts[:text] = "\\multicolumn{#{opts[:colspan]}}{ #{"l " * opts[:colspan].to_i}}{#{opts[:text]}}"
+    end
+    if opts[:rowspan]
+      @table_multirow_next[column] = opts[:rowspan].to_i - 1
+      opts[:text] = "\\multirow{#{opts[:rowspan]}}{*}{#{opts[:text]}}"
+    end
+    @table_row.push(opts[:text])
+    return ""
   end
   
   def tr_open(opts)
-    "\t\t"
+    @table_row = []
+    return ""
   end
   
   def tr_close(opts)
-    "\t\t\\\\\n"
+    multirow_columns = @table_multirow.find_all {|c,n| n > 0}
+    multirow_columns.each do |c,n|
+      @table_row.insert(c,"")
+      @table_multirow[c] -= 1
+    end
+    @table_multirow.merge!(@table_multirow_next)
+    @table_multirow_next = {}
+    @table.push(@table_row)
+    return ""
   end
   
-  # FIXME: we need to know the column count before opening tabular context.
+  # We need to know the column count before opening tabular context.
   def table_open(opts)
-    "\\begin{align*}\n"
+    @table = []
+    @table_multirow = {}
+    @table_multirow_next = {}
+    return ""
   end
   
   def table_close(opts)
-    "\t\\end{align*}\n"
+    output = "\\begin{tabular}{ #{"l " * @table[0].size }}\n"
+    @table.each do |row|
+      output << "  #{row.join(" & ")} \\\\\n"
+    end
+    output << "\\end{tabular}\n"
+    output
   end
 
   def bc_open(opts)
@@ -222,12 +240,22 @@ module RedCloth::Formatters::LATEX
   end
   
   def dim(opts)
-    space = opts[:space] ? " " : ''
-    "#{opts[:text]}#{space}\\texttimes{}#{space}"
+    opts[:text].gsub!('x', '\times')
+    opts[:text].gsub!('"', "''")
+    period = opts[:text].slice!(/\.$/)
+    "$#{opts[:text]}$#{period}"
   end
   
   private
   
+  def escape(text)
+    latex_esc(text)
+  end
+
+  def escape_pre(text)
+    text
+  end
+  
   # Use this for block level commands that use \begin
   def begin_chunk(type)
     chunk_counter[type] += 1