RedCloth 4.1.0-universal-java → 4.1.1-universal-java

data/CHANGELOG

@@ -1,3 +1,17 @@
+=== 4.1.1 / November 19, 2008
+
+* Added 'lib/case_sensitive_require' back into gemspec.  It got left out in the conversion to echoe, so "require 'RedCloth'" didn't work. #88
+
+* Fixed <embed> being recognized as a block-level element when using the twice-cooked method of flash embedding. #87
+
+* Added horizontal rules from RedCloth 3.  Three or more asterisks, dashes, or underscores between blocks triggers the HR tag.
+
+* echoe was not being properly registered as a development dependency; a bug in RubyGems was making it a runtime dependency
+
+* Fixed "No definition for redcloth_to Installing RDoc documentation"
+
+* Fixed wrong platform names when cross-compiling java and win32 versions
+
 === 4.1.0 / October 31, 2008
 
 * JRuby support!  [olabini]

data/Manifest

@@ -29,7 +29,6 @@ lib/redcloth.rb
 Manifest
 Rakefile
 README
-RedCloth.gemspec
 setup.rb
 test/basic.yml
 test/code.yml

data/Rakefile

@@ -1,12 +1,7 @@
 require 'lib/redcloth/version'
-
-begin
-  require 'rubygems'
-  gem 'echoe', '>=2.7.11'
-  require 'echoe'
-rescue LoadError
-  abort "You'll need to have `echoe' installed to use RedCloth's Rakefile"
-end
+require 'rubygems'
+gem 'echoe', '>= 3.0.1'
+require 'echoe'
 
 e = Echoe.new('RedCloth', RedCloth::VERSION.to_s) do |p|
   p.summary = RedCloth::DESCRIPTION
@@ -20,6 +15,11 @@ e = Echoe.new('RedCloth', RedCloth::VERSION.to_s) do |p|
   p.ruby_version = '>=1.8.4'
   p.extension_pattern = nil
   
+  if Platform.gcc?
+    p.platform = 'x86-mswin32-60'
+  elsif Platform.java?
+    p.platform = 'universal-java'
+  end
   
   if RUBY_PLATFORM =~ /mingw|mswin|java/
     p.need_tar_gz = false
@@ -33,13 +33,13 @@ e = Echoe.new('RedCloth', RedCloth::VERSION.to_s) do |p|
     case RUBY_PLATFORM
     when /mingw/
       self.files += ['lib/redcloth_scan.so']
-      self.platform = 'x86-mswin32-60'
     when /java/
       self.files += ['lib/redcloth_scan.jar']
-      self.platform = 'universal-java'
     else
       self.files += %w[attributes inline scan].map {|f| "ext/redcloth_scan/redcloth_#{f}.c"}
     end
+    
+    self.require_paths << "lib/case_sensitive_require"
   end
 
 end

data/RedCloth.gemspec

@@ -1,5 +1,5 @@
 
-# Gem::Specification for Redcloth-4.1.0
+# Gem::Specification for Redcloth-4.1.1
 # Originally generated by Echoe
 
 --- !ruby/object:Gem::Specification 
@@ -9,9 +9,9 @@ homepage: http://redcloth.org
 executables: 
 - redcloth
 version: !ruby/object:Gem::Version 
-  version: 4.1.0
+  version: 4.1.1
 post_install_message: 
-date: 2008-11-03 05:00:00 +00:00
+date: 2008-11-19 05:00:00 +00:00
 files: 
 - bin/redcloth
 - CHANGELOG
@@ -44,7 +44,6 @@ files:
 - Manifest
 - Rakefile
 - README
-- RedCloth.gemspec
 - setup.rb
 - test/basic.yml
 - test/code.yml
@@ -70,6 +69,7 @@ files:
 - test/textism.yml
 - test/threshold.yml
 - test/validate_fixtures.rb
+- RedCloth.gemspec
 - lib/redcloth_scan.jar
 rubygems_version: 1.2.0
 rdoc_options: 
@@ -83,7 +83,7 @@ rdoc_options:
 name: RedCloth
 has_rdoc: true
 platform: universal-java
-summary: RedCloth-4.1.0 - Textile parser for Ruby. http://redcloth.org/
+summary: RedCloth-4.1.1 - Textile parser for Ruby. http://redcloth.org/
 default_executable: 
 bindir: bin
 required_rubygems_version: !ruby/object:Gem::Requirement 
@@ -101,6 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
 require_paths: 
 - lib
 - ext
+- lib/case_sensitive_require
 specification_version: 2
 test_files: 
 - test/test_custom_tags.rb
@@ -120,7 +121,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version 
         version: "0"
-description: RedCloth-4.1.0 - Textile parser for Ruby. http://redcloth.org/
+description: RedCloth-4.1.1 - Textile parser for Ruby. http://redcloth.org/
 email: redcloth-upwards@rubyforge.org
 authors: 
 - Jason Garber

data/ext/redcloth_scan/redcloth_scan.c.rl

@@ -194,6 +194,9 @@ redcloth_latex_esc(VALUE self, VALUE str)
   return new_str;
 }
 
+/*
+ * Transforms a Textile document with +formatter+
+ */
 static VALUE
 redcloth_to(self, formatter)
   VALUE self, formatter;

data/ext/redcloth_scan/redcloth_scan.rl

@@ -37,6 +37,7 @@
   dl_start = (dt_start mtext (LF dt_start mtext)* " "* dd_start)  ;
   blank_line = LF;
   link_alias = ( "[" >{ ASET("type", "ignore"); } %A chars %T "]" %A uri %{ STORE_URL("href"); } ) ;
+  horizontal_rule = '*'{3,} | '-'{3,} | '_'{3,} ;
   
   # image lookahead
   IMG_A_LEFT = "<" %{ ASET("float", "left"); } ;
@@ -44,7 +45,7 @@
   aligned_image = ( "["? "!" (IMG_A_LEFT | IMG_A_RIGHT) ) >A @{ p = reg - 1; } ;
   
   # html blocks
-  BlockTagName = Name - ("pre" | "notextile" | "a" | "applet" | "basefont" | "bdo" | "br" | "font" | "iframe" | "img" | "map" | "object" | "param" | "q" | "script" | "span" | "sub" | "sup" | "abbr" | "acronym" | "cite" | "code" | "del" | "dfn" | "em" | "ins" | "kbd" | "samp" | "strong" | "var" | "b" | "big" | "i" | "s" | "small" | "strike" | "tt" | "u");
+  BlockTagName = Name - ("pre" | "notextile" | "a" | "applet" | "basefont" | "bdo" | "br" | "font" | "iframe" | "img" | "map" | "object" | "param" | "embed" | "q" | "script" | "span" | "sub" | "sup" | "abbr" | "acronym" | "cite" | "code" | "del" | "dfn" | "em" | "ins" | "kbd" | "samp" | "strong" | "var" | "b" | "big" | "i" | "s" | "small" | "strike" | "tt" | "u");
   block_start_tag = "<" BlockTagName space+ AttrSet* (AttrEnd)? ">" | "<" BlockTagName ">";
   block_empty_tag = "<" BlockTagName space+ AttrSet* (AttrEnd)? "/>" | "<" BlockTagName "/>" ;
   block_end_tag = "</" BlockTagName space* ">" ;
@@ -303,6 +304,7 @@
     bq_start        { INLINE(html, "bq_open"); ASET("type", "p"); fgoto bq; };
     block_start     { fgoto block; };
     footnote_start  { fgoto footnote; };
+    horizontal_rule { INLINE(html, "hr"); };
     list_start      { CLEAR_LIST(); LIST_ITEM(); fgoto list; };
     dl_start        { p = ts; INLINE(html, "dl_open"); ASET("type", "dt"); fgoto dl; };
     table           { INLINE(table, "table_close"); DONE(table); fgoto block; };

data/lib/redcloth/formatters/html.rb

@@ -33,6 +33,10 @@ module RedCloth::Formatters::HTML
     end
   end
   
+  def hr(opts)
+    "<hr />\n"
+  end
+  
   def acronym(opts)
     opts[:block] = true
     "<acronym#{pba(opts)}>#{caps(:text => opts[:text])}</acronym>"

data/lib/redcloth/version.rb

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

data/test/basic.yml

@@ -868,3 +868,51 @@ in: |-
 html: |-
   <p>citation [&#8220;(Berk.) Hilton&#8221;], see<br />
   [Papers &#8220;blah blah.&#8221;]</p>
+---
+name: horizontal rule using asterisks
+in: |-
+  Just some *** text
+  
+  ***
+  
+  Some more text.
+html: |-
+  <p>Just some <strong>*</strong> text</p>
+  <hr />
+  <p>Some more text.</p>
+---
+name: horizontal rule using more than three asterisks
+in: |-
+  Just some **** text
+
+  ****
+
+  Some more text.
+html: |-
+  <p>Just some **** text</p>
+  <hr />
+  <p>Some more text.</p>
+---
+name: horizontal rule using dashes
+in: |-
+  Just some --- text
+
+  ---
+
+  Some more text.
+html: |-
+  <p>Just some <del>-</del> text</p>
+  <hr />
+  <p>Some more text.</p>
+---
+name: horizontal rule using underscores
+in: |-
+  Just some ___ text
+
+  ___
+
+  Some more text.
+html: |-
+  <p>Just some <em>_</em> text</p>
+  <hr />
+  <p>Some more text.</p>

data/test/html.yml

@@ -300,6 +300,12 @@ html: '<p><a href="http://foo.com/bar?something=1~2~3">http://foo.com/bar?someth
 ---
 name: empty block
 in: |-
-  <embed src="test.swf"></embed>
+  <div class="test"></div>
 html: |-
-  <embed src="test.swf"></embed>
+  <div class="test"></div>
+---
+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>

metadata

@@ -5,9 +5,9 @@ homepage: http://redcloth.org
 executables: 
 - redcloth
 version: !ruby/object:Gem::Version 
-  version: 4.1.0
+  version: 4.1.1
 post_install_message: 
-date: 2008-11-03 05:00:00 +00:00
+date: 2008-11-19 05:00:00 +00:00
 files: 
 - bin/redcloth
 - CHANGELOG
@@ -40,7 +40,6 @@ files:
 - Manifest
 - Rakefile
 - README
-- RedCloth.gemspec
 - setup.rb
 - test/basic.yml
 - test/code.yml
@@ -66,6 +65,7 @@ files:
 - test/textism.yml
 - test/threshold.yml
 - test/validate_fixtures.rb
+- RedCloth.gemspec
 - lib/redcloth_scan.jar
 rubygems_version: 1.2.0
 rdoc_options: 
@@ -81,7 +81,7 @@ cert_chain: []
 name: RedCloth
 has_rdoc: true
 platform: universal-java
-summary: RedCloth-4.1.0 - Textile parser for Ruby. http://redcloth.org/
+summary: RedCloth-4.1.1 - Textile parser for Ruby. http://redcloth.org/
 default_executable: 
 bindir: bin
 required_rubygems_version: !ruby/object:Gem::Requirement 
@@ -99,6 +99,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
 require_paths: 
 - lib
 - ext
+- lib/case_sensitive_require
 specification_version: 2
 test_files: 
 - test/test_custom_tags.rb
@@ -118,7 +119,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version 
         version: "0"
-description: RedCloth-4.1.0 - Textile parser for Ruby. http://redcloth.org/
+description: RedCloth-4.1.1 - Textile parser for Ruby. http://redcloth.org/
 email: redcloth-upwards@rubyforge.org
 authors: 
 - Jason Garber