RedCloth 4.0.1 → 4.0.2

data/ext/redcloth_scan/redcloth_scan.rl

@@ -9,7 +9,7 @@
 #include "redcloth.h"
 
 VALUE mRedCloth, super_ParseError, super_RedCloth, super_HTML, super_LATEX;
-int SYM_escape_preformatted;
+int SYM_escape_preformatted, SYM_escape_attributes;
 
 %%{
 
@@ -45,7 +45,7 @@ int SYM_escape_preformatted;
   long_dd  = dd_start " "* LF %{ ADD_BLOCK(); ASET(type, dd); } any+ >A %{ TRANSFORM(text) } :>> "=:" ;
   dl_start = (dt_start mtext (LF dt_start mtext)* " "* dd_start)  ;
   blank_line = LF;
-  link_alias = ( "[" >{ ASET(type, ignore) } %A phrase %T "]" %A uri %{ STORE_URL(href); } ) ;
+  link_alias = ( "[" >{ ASET(type, ignore) } %A chars %T "]" %A uri %{ STORE_URL(href); } ) ;
   
   # image lookahead
   IMG_A_LEFT = "<" %{ ASET(float, left) } ;
@@ -60,7 +60,7 @@ int SYM_escape_preformatted;
   html_start = indent >B %{STORE_B(indent_before_start)} block_start_tag >B %{STORE_B(start_tag)}  indent >B %{STORE_B(indent_after_start)} ;
   html_end = indent >B %{STORE_B(indent_before_end)} block_end_tag >B %{STORE_B(end_tag)} (indent LF?) >B %{STORE_B(indent_after_end)} ;
   standalone_html = indent (block_start_tag | block_empty_tag | block_end_tag) indent LF+;
-  html_end_terminating_block = ( indent block_end_tag ) >A @{ p = reg - 1; } ;
+  html_end_terminating_block = ( LF indent block_end_tag ) >A @{ p = reg - 1; } ;
 
   # tables
   para = ( default+ ) -- LF ;
@@ -71,7 +71,7 @@ int SYM_escape_preformatted;
   tr = ( trdef? "|" %{INLINE(table, tr_open);} td+ ) >X %{INLINE(table, tr_close);} ;
   trows = ( tr (LF >X tr)* ) ;
   tdef = ( "table" >X A C :> dotspace LF ) ;
-  table = ( tdef? trows >{INLINE(table, table_open);} ) >{ reg = NULL; } ;
+  table = ( tdef? trows >{table = rb_str_new2(""); INLINE(table, table_open);} ) >{ reg = NULL; } ;
 
   # info
   redcloth_version = ("RedCloth" >A ("::" | " " ) "VERSION"i ":"? " ")? %{STORE(prefix)} "RedCloth::VERSION" (LF* EOF | double_return) ;
@@ -419,9 +419,11 @@ redcloth_html_esc(int argc, VALUE* argv, VALUE self) //(self, str, level)
     if (level != SYM_escape_preformatted) {
       switch (*t2)
       {
-        case '"':  ch = "quot";   break;
-        case '\'': ch = "squot";  break;
         case '\n': ch = "br";     break;
+        case '"' : ch = "quot";   break;
+        case '\'': 
+          ch = (level == SYM_escape_attributes) ? "apos" : "squot";
+          break;
       }
     }
     
@@ -521,4 +523,5 @@ void Init_redcloth_scan()
   rb_define_method(super_RedCloth, "html_esc", redcloth_html_esc, -1);
   rb_define_method(super_RedCloth, "latex_esc", redcloth_latex_esc, 1);
   SYM_escape_preformatted   = ID2SYM(rb_intern("html_escape_preformatted"));
+  SYM_escape_attributes     = ID2SYM(rb_intern("html_escape_attributes"));
 }

data/lib/redcloth.rb

@@ -1,5 +1,7 @@
 $:.unshift(File.dirname(__FILE__))
 
+Object.send(:remove_const, :RedCloth) if Object.const_defined?(:RedCloth) # in case this is a frozen gem in Rails 2.1 and RedCloth 3.0.4 was already loaded by Rails' ActionView::Helpers::TextHelper.  This appears to be fixed in Edge Rails [51e4106].
+
 require 'redcloth_scan'
 require 'redcloth/version'
 require 'redcloth/textile_doc'

data/lib/redcloth/formatters/base.rb

@@ -16,7 +16,7 @@ module RedCloth::Formatters
         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}=\"#{ opts[a] }\"" if opts[a]
+        atts << " #{a}=\"#{ html_esc(opts[a].to_s, :html_escape_attributes) }\"" if opts[a]
       end
       atts
     end
@@ -27,13 +27,20 @@ module RedCloth::Formatters
     alias_method :notextile, :ignore
     
     def redcloth_version(opts)
-      p(:text => "#{opts[:prefix]}#{RedCloth::VERSION::STRING}")
+      p(:text => "#{opts[:prefix]}#{RedCloth::VERSION}")
     end
 
     def inline_redcloth_version(opts)
       RedCloth::VERSION::STRING
     end
     
+    [:del_phrase, :sup_phrase, :sub_phrase].each do |phrase_method|
+      method = phrase_method.to_s[0..2]
+      define_method(phrase_method) do |opts|
+        "#{opts[:beginning_space]}#{self.send(method, opts)}"
+      end
+    end
+    
     def method_missing(method, opts)
       opts[:text] || ""
     end

data/lib/redcloth/formatters/html.rb

@@ -11,6 +11,11 @@ module RedCloth::Formatters::HTML
     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
@@ -47,10 +52,6 @@ module RedCloth::Formatters::HTML
     "<del#{pba(opts)}>#{opts[:text]}</del>"
   end
   
-  def del_phrase(opts)
-    " #{del(opts)}"
-  end
-  
   [:ol, :ul].each do |m|
     define_method("#{m}_open") do |opts|
       opts[:block] = true
@@ -116,7 +117,7 @@ module RedCloth::Formatters::HTML
   
   def bq_open(opts)
     opts[:block] = true
-    cite = opts[:cite] ? " cite=\"#{ opts[:cite] }\"" : ''
+    cite = opts[:cite] ? " cite=\"#{ escape_attribute opts[:cite] }\"" : ''
     "<blockquote#{cite}#{pba(opts)}>\n"
   end
   
@@ -136,14 +137,14 @@ module RedCloth::Formatters::HTML
       opts[:name] = md[1]
       opts[:title] = md[2]
     end
-    "<a href=\"#{opts[:href].gsub(/&/, '&#38;')}\"#{pba(opts)}>#{opts[:name]}</a>"
+    "<a href=\"#{escape_attribute opts[:href]}\"#{pba(opts)}>#{opts[:name]}</a>"
   end
   
   def image(opts)
     opts.delete(:align)
     opts[:alt] = opts[:title]
-    img = "<img src=\"#{urlesc opts[:src]}\"#{pba(opts)} alt=\"#{opts[:alt]}\" />"  
-    img = "<a href=\"#{urlesc opts[:href]}\">#{img}</a>" if opts[:href]
+    img = "<img src=\"#{escape_attribute opts[:src]}\"#{pba(opts)} alt=\"#{escape_attribute opts[:alt].to_s}\" />"  
+    img = "<a href=\"#{escape_attribute opts[:href]}\">#{img}</a>" if opts[:href]
     img
   end
   
@@ -188,8 +189,10 @@ module RedCloth::Formatters::HTML
   end
   
   def dim(opts)
-    space = opts[:space] ? " " : ''
-    "#{opts[:text]}#{space}&#215;#{space}"
+    opts[:text].gsub!('x', '&#215;')
+    opts[:text].gsub!("'", '&#8242;')
+    opts[:text].gsub!('"', '&#8243;')
+    opts[:text]
   end
   
   def trademark(opts)
@@ -208,10 +211,6 @@ module RedCloth::Formatters::HTML
     "&#{opts[:text]};"
   end
   
-  def urlesc(txt)
-    txt.gsub(/&/, '&amp;')
-  end
-  
   def amp(opts)
     "&amp;"
   end
@@ -240,6 +239,10 @@ module RedCloth::Formatters::HTML
     "&#8217;"
   end
   
+  def apos(opts)
+    "&#39;"
+  end
+  
   def html(opts)
     "#{opts[:text]}\n"
   end

data/lib/redcloth/formatters/latex.rb

@@ -68,10 +68,6 @@ module RedCloth::Formatters::LATEX
     end
   end
   
-  def del_phrase(opts)
-    " #{del(opts)}"
-  end
-  
   { :ol => 'enumerate',
     :ul => 'itemize',
     }.each do |m, env|

data/lib/redcloth/version.rb

@@ -2,12 +2,22 @@ module RedCloth
   module VERSION
     MAJOR = 4
     MINOR = 0
-    TINY  = 1
+    TINY  = 2
     RELEASE_CANDIDATE = nil
 
     STRING = [MAJOR, MINOR, TINY].join('.')
     TAG = "REL_#{[MAJOR, MINOR, TINY, RELEASE_CANDIDATE].compact.join('_')}".upcase.gsub(/\.|-/, '_')
     FULL_VERSION = "#{[MAJOR, MINOR, TINY, RELEASE_CANDIDATE].compact.join('.')}"
+    
+    class << self
+      def to_s
+        STRING
+      end
+      
+      def ==(arg)
+        STRING == arg
+      end
+    end
   end
   
   NAME = "RedCloth"

data/test/basic.yml

@@ -166,13 +166,13 @@ in: "Observe: 2x3x4."
 html: "<p>Observe: 2&#215;3&#215;4.</p>"
 lite_mode_html: "Observe: 2&#215;3&#215;4."
 --- 
-name: dimension sign with double quotes
+name: dimension signs with double primes
 in: 'My mouse: 2.5" x 4".'
-html: '<p>My mouse: 2.5&quot; &#215; 4&quot;.</p>'
+html: '<p>My mouse: 2.5&#8243; &#215; 4&#8243;.</p>'
 --- 
-name: dimension sign with single quotes
+name: dimension signs with single primes
 in: "My office: 5' x 4.5'."
-html: "<p>My office: 5&#8217; &#215; 4.5&#8217;.</p>"
+html: "<p>My office: 5&#8242; &#215; 4.5&#8242;.</p>"
 --- 
 name: trademark and copyright
 desc: Conversion of trademark and copyright symbols.
@@ -265,6 +265,11 @@ name: subscript
 desc: To subscript, surround with tildes.
 in: log ~2~ x
 html: <p>log <sub>2</sub> x</p>
+---
+name: tight superscript and subscript
+desc: if you want your superscript or subscript to not be surrounded by spaces, you must use square brackets
+in: f(x, n) = log[~4~]x[^n^]
+html: '<p>f(x, n) = log<sub>4</sub>x<sup>n</sup></p>'
 --- 
 name: span
 desc: Lastly, if you find yourself needing to customize the style of a passage, use percent symbols to translate the passage as an HTML span.

data/test/code.yml

@@ -17,6 +17,10 @@ name: inlne code escapement describing textile paragraph styling
 in: 'This paragraph is aligned left but if you add this: @p>.@ to the beginning it will be aligned right.'
 html: '<p>This paragraph is aligned left but if you add this: <code>p&gt;.</code> to the beginning it will be aligned right.</p>'
 ---
+name: escapes code snippet containing html tag
+in: 'At the top of each page, please put @<h2>Title</h2>@ in the HTML.'
+html: '<p>At the top of each page, please put <code>&lt;h2&gt;Title&lt;/h2&gt;</code> in the <span class="caps">HTML</span>.</p>'
+---
 name: escaping in blockcode
 in: 'bc. This is within a block of code, so < and > should be entities.  You can talk about a <p class="foo"> tag if you wish and it will be properly escaped.'
 html: '<pre><code>This is within a block of code, so &lt; and &gt; should be entities.  You can talk about a &lt;p class="foo"&gt; tag if you wish and it will be properly escaped.</code></pre>'
@@ -164,6 +168,10 @@ html: |-
   
   <code>I saw a ship. It ate my elephant.</code></pre>
 ---
+name: block containing html tags
+in: bc. Can I talk about <h2>Headings</h2> here?
+html: '<pre><code>Can I talk about &lt;h2&gt;Headings&lt;/h2&gt; here?</code></pre>'
+---
 name: escape latex standard symbols 
 in: "standard symbols # $ % & _ { }" 
 latex: "standard symbols \\# \\$ \\% \\& \\_ \\{ \\}\n\n" 

data/test/filter_pba.yml

@@ -9,4 +9,12 @@ class_filtered_html: "<p>Test</p>"
 ---
 name: filter ids
 in: "p(#myid). Test"
-id_filtered_html: "<p>Test</p>"
+id_filtered_html: "<p>Test</p>"
+---
+name: correct application of double quote entity when using styles
+in: 'p{background: #white url("../chunky_bacon.jpg")}. The quick brown "cartoon" fox jumps over the lazy dog'
+html: '<p style="background: #white url(&quot;../chunky_bacon.jpg&quot;);">The quick brown &#8220;cartoon&#8221; fox jumps over the lazy dog</p>'
+---
+name: correct application of single quote entity when using styles
+in: "p{background: #white url('../chunky_bacon.jpg')}. The quick brown 'cartoon' fox jumps over the lazy dog"
+html: '<p style="background: #white url(&#39;../chunky_bacon.jpg&#39;);">The quick brown &#8216;cartoon&#8217; fox jumps over the lazy dog</p>'

data/test/html.yml

@@ -268,4 +268,32 @@ html: |-
   <blockquote>
   <p>This is a blockquote.</p>
   </blockquote>
-  </div>
+  </div>
+---
+name: before table does not affect table
+in: |-
+  <div>
+  
+  h2. heading
+  
+  |a|b|c|
+  |d|e|f|
+html: |-
+  <div>
+  <h2>heading</h2>
+  <table>
+  	<tr>
+  		<td>a</td>
+  		<td>b</td>
+  		<td>c</td>
+  	</tr>
+  	<tr>
+  		<td>d</td>
+  		<td>e</td>
+  		<td>f</td>
+  	</tr>
+  </table>
+---
+name: tilde in innerHTML is not altered
+in: '<a href="http://foo.com/bar?something=1~2~3">http://foo.com/bar?something=1~2~3</a>'
+html: '<p><a href="http://foo.com/bar?something=1~2~3">http://foo.com/bar?something=1~2~3</a></p>'

data/test/images.yml

@@ -200,3 +200,15 @@ html: <p><img src="image.jpg" style="color:red;" alt="" /></p>
 name: image with style and dotspace
 in: "!{color:red}. image.jpg!"
 html: <p><img src="image.jpg" style="color:red;" alt="" /></p>
+---
+name: image attributes has ampersand html entity in alt and title
+in: "!/pictures/cat_and_fox.jpg(Trady Blix & The cartoon fox)!"
+html: '<p><img src="/pictures/cat_and_fox.jpg" title="Trady Blix &amp; The cartoon fox" alt="Trady Blix &amp; The cartoon fox" /></p>'
+---
+name: image attributes has double 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: &quot;Have some chunky bacon&quot;" alt="The fox said: &quot;Have some chunky bacon&quot;" /></p>'
+---
+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>'

data/test/links.yml

@@ -75,19 +75,19 @@ in: '"link text":http://example.com/?foo=bar#a10'
 html: <p><a href="http://example.com/?foo=bar#a10">link text</a></p>
 ---
 in: '"link text":http://example.com/?foo=bar&a=b'
-html: <p><a href="http://example.com/?foo=bar&#38;a=b">link text</a></p>
+html: <p><a href="http://example.com/?foo=bar&amp;a=b">link text</a></p>
 ---
 in: '"link text":http://example.com/?foo=bar&a=b#1'
-html: <p><a href="http://example.com/?foo=bar&#38;a=b#1">link text</a></p>
+html: <p><a href="http://example.com/?foo=bar&amp;a=b#1">link text</a></p>
 ---
 in: '"link text":http://example.com/?foo=bar&a=b#a'
-html: <p><a href="http://example.com/?foo=bar&#38;a=b#a">link text</a></p>
+html: <p><a href="http://example.com/?foo=bar&amp;a=b#a">link text</a></p>
 ---
 in: '"link text":http://example.com/?foo=bar&a=b#a1'
-html: <p><a href="http://example.com/?foo=bar&#38;a=b#a1">link text</a></p>
+html: <p><a href="http://example.com/?foo=bar&amp;a=b#a1">link text</a></p>
 ---
 in: '"link text":http://example.com/?foo=bar&a=b#a10'
-html: <p><a href="http://example.com/?foo=bar&#38;a=b#a10">link text</a></p>
+html: <p><a href="http://example.com/?foo=bar&amp;a=b#a10">link text</a></p>
 ---
 in: 'This is a "link":http://example.com/'
 html: <p>This is a <a href="http://example.com/">link</a></p>
@@ -154,13 +154,13 @@ in: '"Lab Exercises":../lab/exercises/exercises.html.'
 html: <p><a href="../lab/exercises/exercises.html">Lab Exercises</a>.</p>
 ---
 in: 'Go to "discuss":http://www.dreammoods.com/cgibin/cutecast/cutecast.pl?forum=1&thread=26627 to discuss.'
-html: <p>Go to <a href="http://www.dreammoods.com/cgibin/cutecast/cutecast.pl?forum=1&#38;thread=26627">discuss</a> to discuss.</p>
+html: <p>Go to <a href="http://www.dreammoods.com/cgibin/cutecast/cutecast.pl?forum=1&amp;thread=26627">discuss</a> to discuss.</p>
 ---
 in: '* "rubylang":http://www.ruby-lang.org/en/'
 html: "<ul>\n\t<li><a href=\"http://www.ruby-lang.org/en/\">rubylang</a></li>\n</ul>"
 ---
 in: 'The ION coding style document found at "IONCodingStyleGuide.doc":http://perforce:8081/@md=d&cd=//&c=82E@//depot/systest/system/main/pub/doc/IONCodingStyleGuide.doc?ac=22 codifies a couple of rules to ensure reasonably consistent code and documentation of libraries in ION. Test text'
-html: <p>The <span class="caps">ION</span> coding style document found at <a href="http://perforce:8081/@md=d&#38;cd=//&#38;c=82E@//depot/systest/system/main/pub/doc/IONCodingStyleGuide.doc?ac=22">IONCodingStyleGuide.doc</a> codifies a couple of rules to ensure reasonably consistent code and documentation of libraries in <span class="caps">ION</span>. Test text</p>
+html: <p>The <span class="caps">ION</span> coding style document found at <a href="http://perforce:8081/@md=d&amp;cd=//&amp;c=82E@//depot/systest/system/main/pub/doc/IONCodingStyleGuide.doc?ac=22">IONCodingStyleGuide.doc</a> codifies a couple of rules to ensure reasonably consistent code and documentation of libraries in <span class="caps">ION</span>. Test text</p>
 ---
 in: '"testing":'
 html: "<p>&#8220;testing&#8221;:</p>"
@@ -220,4 +220,12 @@ html: '<p>This is a regular link (but in parentheses: <a href="http://www.google
 name: quotes and follow link
 in: 'Some "text" followed by a "link":http://redcloth.org.'
 html: '<p>Some &#8220;text&#8221; followed by a <a href="http://redcloth.org">link</a>.</p>'
-lite_mode_html: 'Some &#8220;text&#8221; followed by a <a href="http://redcloth.org">link</a>.'
+lite_mode_html: 'Some &#8220;text&#8221; followed by a <a href="http://redcloth.org">link</a>.'
+---
+name: link alias containing dashes
+in: |-
+  "link":google-rocks
+  
+  [google-rocks]http://google.com
+html: |-
+  <p><a href="http://google.com">link</a></p>

data/test/test_parser.rb

@@ -15,16 +15,21 @@ class TestParser < Test::Unit::TestCase
     assert RedCloth::VERSION.const_defined?("STRING")
   end
   
+  def test_redcloth_version_to_s
+    assert_equal RedCloth::VERSION::STRING, RedCloth::VERSION.to_s
+    assert RedCloth::VERSION == RedCloth::VERSION::STRING
+  end
+  
   def test_badly_formatted_table_does_not_segfault
-    assert_match /td/, RedCloth.new(%Q{| one | two |\nthree | four |}).to_html
+    assert_match(/td/, RedCloth.new(%Q{| one | two |\nthree | four |}).to_html)
   end
   
   def test_table_without_block_end_does_not_segfault
-    assert_match /h3/, RedCloth.new("| a | b |\n| c | d |\nh3. foo").to_html
+    assert_match(/h3/, RedCloth.new("| a | b |\n| c | d |\nh3. foo").to_html)
   end
   
   def test_table_with_empty_cells_does_not_segfault
-    assert_match /td/, RedCloth.new(%Q{|one || |\nthree | four |}).to_html
+    assert_match(/td/, RedCloth.new(%Q{|one || |\nthree | four |}).to_html)
   end
   
   def test_unfinished_html_block_does_not_segfault_with_filter_html

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: RedCloth
 version: !ruby/object:Gem::Version 
-  version: 4.0.1
+  version: 4.0.2
 platform: ruby
 authors: 
 - Jason Garber
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-24 00:00:00 -04:00
+date: 2008-08-15 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
-description: RedCloth-4.0.1 - Textile parser for Ruby. http://redcloth.org/
+description: RedCloth-4.0.2 - Textile parser for Ruby. http://redcloth.org/
 email: redcloth-upwards@rubyforge.org
 executables: 
 - redcloth
@@ -101,6 +101,6 @@ rubyforge_project: redcloth
 rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
-summary: RedCloth-4.0.1 - Textile parser for Ruby. http://redcloth.org/
+summary: RedCloth-4.0.2 - Textile parser for Ruby. http://redcloth.org/
 test_files: []