RedCloth 4.2.2-x86-mswin32-60 → 4.2.3-x86-mswin32-60

data/CHANGELOG

@@ -1,3 +1,14 @@
+=== 4.2.3 / March 1, 2010
+
+* Allow quotes in styles so you can do things like listing font-families. [Jason Garber]
+* Fix uninitialized constant Gem::Specification::PLATFORM_CROSS_TARGETS in Rails [Jason Garber]
+* Allow uppercase letters in class and ID attributes even though it's invalid [Jason Garber]
+* Fix compatibility with newer Echoe, by using full-name for Platform [Flameeyes]
+* Fixes for PPC/PPC64 [Flameeyes]
+* Added a modified copy of 'Textile Reference' to a doc folder [codesponge]
+* Add footnote return links [Jonathan Rudenberg]
+* Add bug report link to the README
+
 === 4.2.2 / June 30, 2009
 
 * Fix regression where percent wasn't accepted in style attribute. [Jason Garber]

data/README

@@ -40,6 +40,10 @@ incompatible with Ruby 1.9. The JRuby and pure-Ruby extensions don't support
 multi-byte characters. The RedCloth::EXTENSION_LANGUAGE constant indicates in
 which language your copy of RedCloth is compiled.
 
+== Bugs
+
+Please submit bugs to http://jgarber.lighthouseapp.com/projects/13054-redcloth/overview
+
 == Using RedCloth
 
 RedCloth is simply an extension of the String class, which can handle

data/Rakefile

@@ -1,6 +1,6 @@
 require 'lib/redcloth/version'
 require 'rubygems'
-gem 'echoe', '>= 3.0.1'
+gem 'echoe', '>= 4.1'
 require 'echoe'
 Dir["#{File.dirname(__FILE__)}/lib/tasks/*.rake"].sort.each { |ext| load(ext) }
 
@@ -17,9 +17,9 @@ e = Echoe.new('RedCloth', RedCloth::VERSION.to_s) do |p|
   p.extension_pattern = nil
   p.development_dependencies = [] # remove echoe from development dependencies
   
-  if Platform.gcc?
+  if Echoe::Platform.gcc?
     p.platform = 'x86-mswin32-60'
-  elsif Platform.java?
+  elsif Echoe::Platform.java?
     p.platform = 'universal-java'
   elsif RUBY_PLATFORM == 'pureruby'
     p.platform = 'ruby'
@@ -56,16 +56,18 @@ def move_extensions
   Dir["ext/**/*.{bundle,so,jar}"].each { |file| mv file, "lib/" }
 end
 
-def java_classpath_arg
-  # A myriad of ways to discover the JRuby classpath
-  classpath = begin
-    require 'java'
-    # Already running in a JRuby JVM
-    Java::java.lang.System.getProperty('java.class.path')
-  rescue LoadError
-    ENV['JRUBY_PARENT_CLASSPATH'] || ENV['JRUBY_HOME'] && FileList["#{ENV['JRUBY_HOME']}/lib/*.jar"].join(File::PATH_SEPARATOR)
+def java_classpath_arg # myriad of ways to discover JRuby classpath
+  begin
+    cpath  = Java::java.lang.System.getProperty('java.class.path').split(File::PATH_SEPARATOR)
+    cpath += Java::java.lang.System.getProperty('sun.boot.class.path').split(File::PATH_SEPARATOR)
+    jruby_cpath = cpath.compact.join(File::PATH_SEPARATOR)
+  rescue => e
+  end
+  unless jruby_cpath
+    jruby_cpath = ENV['JRUBY_PARENT_CLASSPATH'] || ENV['JRUBY_HOME'] &&
+      FileList["#{ENV['JRUBY_HOME']}/lib/*.jar"].join(File::PATH_SEPARATOR)
   end
-  classpath ? "-cp #{classpath}" : ""
+  jruby_cpath ? "-cp \"#{jruby_cpath}\"" : ""
 end
 
 ext = "ext/redcloth_scan"

data/RedCloth.gemspec

@@ -2,30 +2,30 @@
 
 Gem::Specification.new do |s|
   s.name = %q{RedCloth}
-  s.version = "4.2.2"
+  s.version = "4.2.3"
   s.platform = %q{x86-mswin32-60}
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jason Garber"]
-  s.date = %q{2009-06-30}
+  s.date = %q{2010-03-01}
   s.default_executable = %q{redcloth}
-  s.description = %q{RedCloth-4.2.2 - Textile parser for Ruby. http://redcloth.org/}
+  s.description = %q{RedCloth-4.2.3 - Textile parser for Ruby.
+http://redcloth.org/}
   s.email = %q{redcloth-upwards@rubyforge.org}
   s.executables = ["redcloth"]
   s.extra_rdoc_files = ["CHANGELOG", "lib/case_sensitive_require/RedCloth.rb", "lib/redcloth/erb_extension.rb", "lib/redcloth/formatters/base.rb", "lib/redcloth/formatters/html.rb", "lib/redcloth/formatters/latex.rb", "lib/redcloth/textile_doc.rb", "lib/redcloth/version.rb", "lib/redcloth.rb", "README"]
   s.files = ["bin/redcloth", "CHANGELOG", "COPYING", "ext/redcloth_scan/extconf.rb", "ext/redcloth_scan/redcloth.h", "lib/case_sensitive_require/RedCloth.rb", "lib/redcloth/erb_extension.rb", "lib/redcloth/formatters/base.rb", "lib/redcloth/formatters/html.rb", "lib/redcloth/formatters/latex.rb", "lib/redcloth/formatters/latex_entities.yml", "lib/redcloth/textile_doc.rb", "lib/redcloth/version.rb", "lib/redcloth.rb", "lib/tasks/pureruby.rake", "Manifest", "Rakefile", "README", "setup.rb", "spec/custom_tags_spec.rb", "spec/differs/inline.rb", "spec/erb_spec.rb", "spec/extension_spec.rb", "spec/fixtures/basic.yml", "spec/fixtures/code.yml", "spec/fixtures/definitions.yml", "spec/fixtures/extra_whitespace.yml", "spec/fixtures/filter_html.yml", "spec/fixtures/filter_pba.yml", "spec/fixtures/html.yml", "spec/fixtures/images.yml", "spec/fixtures/instiki.yml", "spec/fixtures/links.yml", "spec/fixtures/lists.yml", "spec/fixtures/poignant.yml", "spec/fixtures/sanitize_html.yml", "spec/fixtures/table.yml", "spec/fixtures/textism.yml", "spec/fixtures/threshold.yml", "spec/formatters/class_filtered_html_spec.rb", "spec/formatters/filtered_html_spec.rb", "spec/formatters/html_no_breaks_spec.rb", "spec/formatters/html_spec.rb", "spec/formatters/id_filtered_html_spec.rb", "spec/formatters/latex_spec.rb", "spec/formatters/lite_mode_html_spec.rb", "spec/formatters/no_span_caps_html_spec.rb", "spec/formatters/sanitized_html_spec.rb", "spec/formatters/style_filtered_html_spec.rb", "spec/parser_spec.rb", "spec/spec.opts", "spec/spec_helper.rb", "RedCloth.gemspec", "lib/redcloth_scan.so"]
-  s.has_rdoc = true
   s.homepage = %q{http://redcloth.org}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "RedCloth", "--main", "README"]
   s.require_paths = ["lib", "ext", "lib/case_sensitive_require"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.8.4")
   s.rubyforge_project = %q{redcloth}
-  s.rubygems_version = %q{1.3.1}
-  s.summary = %q{RedCloth-4.2.2 - Textile parser for Ruby. http://redcloth.org/}
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{RedCloth-4.2.3 - Textile parser for Ruby. http://redcloth.org/}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
     else

data/ext/redcloth_scan/redcloth.h

@@ -129,7 +129,7 @@ VALUE red_pass_code(VALUE, VALUE, VALUE, ID);
         case ')': \
           { /*needed to keep inside chars scoped for less memory usage*/\
             char *temp_p = p - 1; \
-            char level = -1; \
+            signed char level = -1; \
             while (temp_p > reg) { \
               switch(*(temp_p - 1)) { \
                 case '(': ++level; break; \

data/lib/redcloth/formatters/html.rb

@@ -124,14 +124,14 @@ module RedCloth::Formatters::HTML
   
   def footno(opts)
     opts[:id] ||= opts[:text]
-    %Q{<sup class="footnote"><a href=\"#fn#{opts[:id]}\">#{opts[:text]}</a></sup>}
+    %Q{<sup class="footnote" id=\"fnr#{opts[:id]}\"><a href=\"#fn#{opts[:id]}\">#{opts[:text]}</a></sup>}
   end
   
   def fn(opts)
     no = opts[:id]
     opts[:id] = "fn#{no}"
     opts[:class] = ["footnote", opts[:class]].compact.join(" ")
-    "<p#{pba(opts)}><sup>#{no}</sup> #{opts[:text]}</p>\n"
+    "<p#{pba(opts)}><a href=\"#fnr#{no}\"><sup>#{no}</sup></a> #{opts[:text]}</p>\n"
   end
   
   def snip(opts)

data/lib/redcloth/version.rb

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

data/lib/tasks/pureruby.rake

@@ -1,12 +1,17 @@
-Gem::Specification::PLATFORM_CROSS_TARGETS << "pureruby"
+# Apparently this file gets loaded by Rails. Only want to define the pureruby
+# task in the context of RedCloth compilation (echoe loaded).
 
-task 'pureruby' do
-  reset_target 'pureruby'
-end
+if Gem::Specification.const_defined?(:PLATFORM_CROSS_TARGETS)
+  Gem::Specification::PLATFORM_CROSS_TARGETS << "pureruby"
 
-if target = ARGV.detect do |arg| 
-  # Hack to get the platform set before the Rakefile evaluates
-    Gem::Specification::PLATFORM_CROSS_TARGETS.include? arg
+  task 'pureruby' do
+    reset_target 'pureruby'
   end
-  reset_target target
-end
+
+  if target = ARGV.detect do |arg| 
+    # Hack to get the platform set before the Rakefile evaluates
+      Gem::Specification::PLATFORM_CROSS_TARGETS.include? arg
+    end
+    reset_target target
+  end
+end

data/spec/fixtures/basic.yml

@@ -247,12 +247,12 @@ html: |-
 name: footnote reference
 desc: Numeric references within text to footnotes appear between square brackets.
 in: This is covered elsewhere[1].
-html: <p>This is covered elsewhere<sup class="footnote"><a href="#fn1">1</a></sup>.</p>
+html: <p>This is covered elsewhere<sup class="footnote" id="fnr1"><a href="#fn1">1</a></sup>.</p>
 --- 
 name: footnote
 desc: To create the footnote that corresponds to its reference within the text, begin a new paragraph with fn and the footnote&#8217;s number, followed by a dot and a space.
 in: fn1. Down here, in fact.
-html: <p class="footnote" id="fn1"><sup>1</sup> Down here, in fact.</p>
+html: <p class="footnote" id="fn1"><a href="#fnr1"><sup>1</sup></a> Down here, in fact.</p>
 --- 
 name: em
 desc: Emphasis to text is added by surrounding a phrase with underscores.  In HTML, this often appears as <em>italics</em>.
@@ -367,7 +367,17 @@ name: css id
 desc: An element ID can be given by prefixing the ID with a pound symbol and using it in place of the class.
 in: p(#big-red). Red here
 html: <p id="big-red">Red here</p>
---- 
+---
+name: css id with initial uppercase
+desc: CSS IDs are supposed to be lowercase, but Textile understands the invalid capitalization nonetheless
+in: p(#Foo). bar
+html: <p id="Foo">bar</p>
+---
+name: css class uppercase
+desc: CSS classes are supposed to be lowercase, but Textile understands the invalid capitalization nonetheless
+in: p(fooBar). baz
+html: <p class="fooBar">baz</p>
+---
 name: class and id combined
 desc: Class and ID can be combined by placing the class first.
 in: p(example1#big-red2). Red here
@@ -375,8 +385,8 @@ html: <p class="example1" id="big-red2">Red here</p>
 --- 
 name: css style
 desc: Style settings can be provided directly by surrounding them in curly braces.
-in: p{color:blue;margin:30px;font-size:120%;}. Spacey blue
-html: <p style="color:blue;margin:30px;font-size:120%;">Spacey blue</p>
+in: p{color:blue;margin:30px;font-size:120%;font-family:'Comic Sans'}. Spacey blue
+html: <p style="color:blue;margin:30px;font-size:120%;font-family:&#39;Comic Sans&#39;;">Spacey blue</p>
 --- 
 name: language designations
 desc: Language designations can be given between angel brackets.

data/spec/fixtures/threshold.yml

@@ -252,8 +252,8 @@ in: |-
   
   fn1. The footnote.
 html: |-
-  <p>A footnote reference<sup class="footnote"><a href="#fn1">1</a></sup>.</p>
-  <p class="footnote" id="fn1"><sup>1</sup> The footnote.</p>
+  <p>A footnote reference<sup class="footnote" id="fnr1"><a href="#fn1">1</a></sup>.</p>
+  <p class="footnote" id="fn1"><a href="#fnr1"><sup>1</sup></a> The footnote.</p>
 # html: |-
 #   <p>A footnote reference<sup class="footnote"><a href="#fn1216642796463b1223ae29d">1</a></sup>.</p>
 #   <p class="footnote" id="fn1216642796463b1223ae29d"><sup>1</sup> The footnote.</p>
@@ -755,7 +755,7 @@ in: |-
 html: |-
   <p>A close<img src="/img.gif" alt="" />image.<br />
   A tight<a href="http://thresholdstate.com/">text</a>link.<br />
-  A <a href="http://thresholdstate.com/">footnoted link</a><sup class="footnote"><a href="#fn1">1</a></sup>.</p>
+  A <a href="http://thresholdstate.com/">footnoted link</a><sup class="footnote" id="fnr1"><a href="#fn1">1</a></sup>.</p>
 # html: |-
 #   <p>A close<img src="/img.gif" alt="" />image.<br />
 #   A tight<a href="http://thresholdstate.com/">text</a>link.<br />

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: RedCloth
 version: !ruby/object:Gem::Version 
-  version: 4.2.2
+  prerelease: false
+  segments: 
+  - 4
+  - 2
+  - 3
+  version: 4.2.3
 platform: x86-mswin32-60
 authors: 
 - Jason Garber
@@ -9,11 +14,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-30 00:00:00 -04:00
+date: 2010-03-01 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
-description: RedCloth-4.2.2 - Textile parser for Ruby. http://redcloth.org/
+description: |-
+  RedCloth-4.2.3 - Textile parser for Ruby.
+  http://redcloth.org/
 email: redcloth-upwards@rubyforge.org
 executables: 
 - redcloth
@@ -87,6 +94,8 @@ files:
 - lib/redcloth_scan.so
 has_rdoc: true
 homepage: http://redcloth.org
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --line-numbers
@@ -103,20 +112,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 8
+      - 4
       version: 1.8.4
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 2
       version: "1.2"
-  version: 
 requirements: []
 
 rubyforge_project: redcloth
-rubygems_version: 1.3.1
+rubygems_version: 1.3.6
 signing_key: 
-specification_version: 2
-summary: RedCloth-4.2.2 - Textile parser for Ruby. http://redcloth.org/
+specification_version: 3
+summary: RedCloth-4.2.3 - Textile parser for Ruby. http://redcloth.org/
 test_files: []