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

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

data/lib/redcloth/textile_doc.rb

@@ -30,9 +30,7 @@ module RedCloth
     # Traditional RedCloth converted single newlines
     # to HTML break tags, but later versions required
     # +:hard_breaks+ be set to enable this behavior.
-    # +:hard_breaks+ is once again the default. The
-    # accessor is deprecated and will be removed in a
-    # future version.
+    # +:hard_breaks+ is once again the default.
     #
     attr_accessor :hard_breaks
 

data/lib/redcloth/version.rb

@@ -2,7 +2,7 @@ module RedCloth
   module VERSION
     MAJOR = 4
     MINOR = 1
-    TINY  = 1
+    TINY  = 9
     RELEASE_CANDIDATE = nil
 
     STRING = [MAJOR, MINOR, TINY].join('.')

data/test/basic.yml

@@ -164,27 +164,33 @@ name: dimension sign
 desc: The letter 'x' becomes a dimension sign when used between digits.
 in: "Observe: 2x3."
 html: "<p>Observe: 2&#215;3.</p>"
+latex: "Observe: $2\\times3$.\n\n"
 --- 
 name: dimension sign with space after
 in: "The room is 2x3 inches big."
 html: "<p>The room is 2&#215;3 inches big.</p>"
+latex: "The room is $2\\times3$ inches big.\n\n"
 --- 
 name: dimension sign with spaces
 in: "Observe: 2 x 4."
 html: "<p>Observe: 2 &#215; 4.</p>"
+latex: "Observe: $2 \\times 4$.\n\n"
 --- 
 name: dimension signs chained
 in: "Observe: 2x3x4."
 html: "<p>Observe: 2&#215;3&#215;4.</p>"
 lite_mode_html: "Observe: 2&#215;3&#215;4."
+latex: "Observe: $2\\times3\\times4$.\n\n"
 --- 
 name: dimension signs with double primes
 in: 'My mouse: 2.5" x 4".'
 html: '<p>My mouse: 2.5&#8243; &#215; 4&#8243;.</p>'
+latex: "My mouse: $2.5'' \\times 4''$.\n\n"
 --- 
 name: dimension signs with single primes
 in: "My office: 5' x 4.5'."
 html: "<p>My office: 5&#8242; &#215; 4.5&#8242;.</p>"
+latex: "My office: $5' \\times 4.5'$.\n\n"
 --- 
 name: trademark and copyright
 desc: Conversion of trademark and copyright symbols.
@@ -266,7 +272,11 @@ html: <p>Please email why@domain.com or jason@domain.com.</p>
 name: del
 desc: To indicate a passage which has been deleted, surround the passage with hypens.
 in: I'm -sure- not sure.
-html: <p>I&#8217;m <del>sure</del> not sure.</p>
+html: "<p>I&#8217;m <del>sure</del> not sure.</p>"
+--- 
+name: del beginning a phrase
+in: -delete-
+html: "<p><del>delete</del></p>"
 --- 
 name: ins
 desc: Pluses around a passage indicate its insertion.
@@ -915,4 +925,8 @@ in: |-
 html: |-
   <p>Just some <em>_</em> text</p>
   <hr />
-  <p>Some more text.</p>
+  <p>Some more text.</p>
+---
+name: lang attribute cannot contain square brackets
+in: "some @[[code]]@"
+html: "<p>some <code>[[code]]</code></p>"

data/test/code.yml

@@ -96,7 +96,10 @@ in: |-
   <notextile>
   # *test*
 html: |-
-  # *test*
+  <p><notextile></p>
+  <ol>
+  	<li><strong>test</strong></li>
+  </ol>
 valid_html: false
 ---
 name: unfinished script tag
@@ -140,9 +143,7 @@ html: |-
   <pre><code>./foo.pl%
   &lt;p&gt;foo outputs an HTML paragraph&lt;/p&gt;</code>
 
-  <code>&lt;p&gt;block of code keeps going until a different block signature is encountered&lt;/p&gt;</code>
-
-  </pre>
+  <code>&lt;p&gt;block of code keeps going until a different block signature is encountered&lt;/p&gt;</code></pre>
   <p>And then go back with a normal paragraph.</p>
 ---
 name: extended block code preserves leading whitespace after blank line
@@ -167,9 +168,7 @@ html: |-
   <code>    def baz
           'baz'
       end
-  end</code>
-  
-  </pre>
+  end</code></pre>
   <p>That&#8217;s it!</p>
 ---
 name: block code containing code avoids nesting code tags

data/test/html.yml

@@ -308,4 +308,18 @@ name: objects in paragraphs are not modified
 in: |-
   <p><object width="340" height="280"><param name="movie" value="http://www.youtube.com/v/iUbK1cBHm6E"></param><param name="wmode" value="opaque"></param><param name="allowScriptAccess" value="sameDomain"></param><embed src="http://www.youtube.com/v/iUbK1cBHm6E" type="application/x-shockwave-flash" width="340" height="280" wmode="opaque" allowScriptAccess="sameDomain"></embed></object></p>
 html: |-
-  <p><object width="340" height="280"><param name="movie" value="http://www.youtube.com/v/iUbK1cBHm6E"></param><param name="wmode" value="opaque"></param><param name="allowScriptAccess" value="sameDomain"></param><embed src="http://www.youtube.com/v/iUbK1cBHm6E" type="application/x-shockwave-flash" width="340" height="280" wmode="opaque" allowScriptAccess="sameDomain"></embed></object></p>
+  <p><object width="340" height="280"><param name="movie" value="http://www.youtube.com/v/iUbK1cBHm6E"></param><param name="wmode" value="opaque"></param><param name="allowScriptAccess" value="sameDomain"></param><embed src="http://www.youtube.com/v/iUbK1cBHm6E" type="application/x-shockwave-flash" width="340" height="280" wmode="opaque" allowScriptAccess="sameDomain"></embed></object></p>
+---
+name: in code escaped properly
+in: "<pre><code>some <b>bold</b> text</code></pre>"
+html: "<pre><code>some &lt;b&gt;bold&lt;/b&gt; text</code></pre>"
+---
+name: in code with class attribute escaped properly
+in: "<pre><code class='myclass'>some <b>bold</b> text</code></pre>"
+html: "<pre><code class='myclass'>some &lt;b&gt;bold&lt;/b&gt; text</code></pre>"
+---
+name: notextile beginning the line
+in: |-
+  <notextile><a href="http://a.com">Sir Bobby Robson</a></notextile>, is a famous footballer
+html: |-
+  <p><a href="http://a.com">Sir Bobby Robson</a>, is a famous footballer</p>

data/test/images.yml

@@ -244,3 +244,26 @@ latex: |+
 name: image attributes has single quote html entity in alt and title
 in: "!/pictures/bacon.jpg(The fox said: 'Have some chunky bacon')!"
 html: '<p><img src="/pictures/bacon.jpg" title="The fox said: &#39;Have some chunky bacon&#39;" alt="The fox said: &#39;Have some chunky bacon&#39;" /></p>'
+---
+name: in square brackets
+in:  This is an [!image.jpg!] you see.
+html: <p>This is an <img src="image.jpg" alt="" /> you see.</p>
+---
+name: with link in square brackets
+in:  This is an [!image.jpg!:http://example.com/] you see.
+html: <p>This is an <a href="http://example.com/"><img src="image.jpg" alt="" /></a> you see.</p>
+---
+name: url containing parentheses
+in: "!http://commons.wikimedia.org/wiki/File:Rubis_sur_calcite_2(Vietnam).jpg!"
+html: |-
+  <p><img src="http://commons.wikimedia.org/wiki/File:Rubis_sur_calcite_2(Vietnam).jpg" alt="" /></p>
+---
+name: with alt and url containing parentheses
+in: "!http://commons.wikimedia.org/wiki/File:Rubis_sur_calcite_2(Vietnam).jpg(a big rock)!"
+html: |-
+  <p><img src="http://commons.wikimedia.org/wiki/File:Rubis_sur_calcite_2(Vietnam).jpg" title="a big rock" alt="a big rock" /></p>
+---
+name: with link that contains parentheses
+in: "!image.jpg(Alt text with (parentheses).)!"
+html: |-
+  <p><img src="image.jpg" title="Alt text with (parentheses)." alt="Alt text with (parentheses)." /></p>