RedCloth 4.1.9-universal-java → 4.2.0-universal-java

data/CHANGELOG

@@ -1,3 +1,58 @@
+=== Edge
+
+* Fixed image with title, href, and text afterward not being made a link. [Jason Garber]
+
+* Pass string encoding through in Ruby 1.9. [Jason Garber]
+
+* Allow two-letter acronyms. [Jason Garber]
+
+* Removed vertical alignment in lists. It doesn't make sense and it conflicts with other things. [Jason Garber]
+
+* Allow table cells to be empty. [Jason Garber]
+
+* Resolve conflict between table signature and blocks beginning with t. [Jason Garber]
+
+* Enable code signature to capture trailing space when in square brackets. [Jason Garber]
+
+* Allow emphasized phrases to include underscores. [Jason Garber]
+
+* Include an ending question mark in a citation. [Jason Garber]
+
+* Fix <notextile> blocks being included in following paragraph. [Jason Garber]
+
+* Preserve leading whitespace in pre and bc blocks. [Jason Garber]
+
+* Don't add hard break after preexisting <br />. [Jason Garber]
+
+* Switched tests from Test::Unit to Rspec. [Jason Garber]
+
+* Accept multiline content in table cells. [Jason Garber]
+
+* Change to list attributes so you can give style/class to list items (taken from PyTextile).  Breaks backwards compatibility.
+  
+  Before, the style applied to the first list item applied to the entire list.  Now, class/id/style placed
+  before the list applies to the list element and after the hash or asterisk applies to the list item.  For
+  example:
+                                   <ul id="groceries">
+    (#groceries)# Milk               <li>milk</li>
+    # Eggs                           <li>eggs</li>
+    #(optional) granola              <li class="optional">granola</li>
+                                   </ul>
+
+* Separated attributes out to have their own mark/store variable and regs.  This way, they won't conflict with captured text or backtracked text. [Jason Garber]
+
+* Added a RedCloth::EXTENSION_LANGUAGE constant so you can tell what version of the parser you are using. [Jason Garber]
+
+* Added a NotCompiledError to give a friendlier message when people just unpack RedCloth into their projects. [Jason Garber]
+
+* Added a pure-ruby version of the parser for times when you can't compile the C or Java extensions.  You should avoid using it if at all possible because it is 32 times slower (and has some other problems, too)! [Jason Garber]
+
+* Ignore spaces and tabs on blank lines between blocks. #120 [Jason Garber]
+
+* Allow HTML tags with quoted attributes to be inside link text.  To do this, I had to remove the possibility that attributes in HTML tags could have spaces around the equals sign or unquoted attributes.  This change also greatly expands the complexity of the state machine, so compilation takes a long time. Sorry. [Jason Garber]
+
+* Many improvements to the LaTeX formatter by Bil Kleb, a NASA scientist who's been working with LaTeX for 20 years.  Thanks, Bil!
+
 === 4.1.9 / February 20, 2009
 
 * Make compatible with Ruby 1.9.

data/Manifest

@@ -1,22 +1,8 @@
 bin/redcloth
 CHANGELOG
 COPYING
-ext/mingw-rbconfig.rb
 ext/redcloth_scan/extconf.rb
 ext/redcloth_scan/redcloth.h
-ext/redcloth_scan/redcloth_attributes.c.rl
-ext/redcloth_scan/redcloth_attributes.java.rl
-ext/redcloth_scan/redcloth_attributes.rl
-ext/redcloth_scan/redcloth_common.c.rl
-ext/redcloth_scan/redcloth_common.java.rl
-ext/redcloth_scan/redcloth_common.rl
-ext/redcloth_scan/redcloth_inline.c.rl
-ext/redcloth_scan/redcloth_inline.java.rl
-ext/redcloth_scan/redcloth_inline.rl
-ext/redcloth_scan/redcloth_scan.c.rl
-ext/redcloth_scan/redcloth_scan.java.rl
-ext/redcloth_scan/redcloth_scan.rl
-extras/ragel_profiler.rb
 lib/case_sensitive_require/RedCloth.rb
 lib/redcloth/erb_extension.rb
 lib/redcloth/formatters/base.rb
@@ -26,31 +12,41 @@ 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
-test/basic.yml
-test/code.yml
-test/definitions.yml
-test/extra_whitespace.yml
-test/filter_html.yml
-test/filter_pba.yml
-test/helper.rb
-test/html.yml
-test/images.yml
-test/instiki.yml
-test/links.yml
-test/lists.yml
-test/poignant.yml
-test/sanitize_html.yml
-test/table.yml
-test/test_custom_tags.rb
-test/test_erb.rb
-test/test_extensions.rb
-test/test_formatters.rb
-test/test_parser.rb
-test/test_restrictions.rb
-test/textism.yml
-test/threshold.yml
-test/validate_fixtures.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

data/README

@@ -17,16 +17,28 @@ RedCloth can be installed via RubyGems:
 
   gem install RedCloth
 
-It will install the appropriate Ruby, JRuby, or Win32 gem.  If using JRuby, version 1.1.5 or greater is required.
+It will install the appropriate Ruby, JRuby, or Win32 gem. If using JRuby,
+version 1.1.5 or greater is required.
 
 == Compiling
 
-If you just want to use RedCloth, you do NOT need to build/compile it.  It is compiled from C sources automatically when you install the gem on the ruby platform.  Binary gems are provided for JRuby and Win32 platforms.
+If you just want to use RedCloth, you do NOT need to build/compile it. It is
+compiled from C sources automatically when you install the gem on the ruby
+platform. Precompiled binary gems are provided for JRuby and Win32 platforms.
 
-RedCloth can be compiled with <tt>rake compile</tt>.  Ragel 6.3 or greater and the 
-echoe gem are needed to build, compile, and package RedCloth.  Again, Ragel and echoe are NOT needed to simply use RedCloth.
+RedCloth can be compiled with <tt>rake compile</tt>. Ragel 6.3 or greater and
+the echoe gem are needed to build, compile, and package RedCloth. Again, Ragel
+and echoe are NOT needed to simply use RedCloth.
 
-You can cross-compile for JRuby with rake java compile and for Win32 with rake mingw compile.
+=== Supported platforms
+
+By default, the rake compile task builds a native C Ruby extension that works
+with Ruby 1.8 or 1.9. You can cross-compile for JRuby 1.3 with rake java
+compile and for Win32 with rake mingw compile. A pure Ruby version can be
+generated with rake pureruby compile, but the parser it produces is slow and
+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.
 
 == Using RedCloth
 

data/Rakefile

@@ -2,12 +2,13 @@ require 'lib/redcloth/version'
 require 'rubygems'
 gem 'echoe', '>= 3.0.1'
 require 'echoe'
+Dir["#{File.dirname(__FILE__)}/lib/tasks/*.rake"].sort.each { |ext| load(ext) }
 
 e = Echoe.new('RedCloth', RedCloth::VERSION.to_s) do |p|
   p.summary = RedCloth::DESCRIPTION
   p.author = "Jason Garber"
   p.email = 'redcloth-upwards@rubyforge.org'
-  p.clean_pattern += ['ext/redcloth_scan/**/*.{bundle,so,obj,pdb,lib,def,exp,c,o,xml,class,jar,java}', 'lib/*.{bundle,so,o,obj,pdb,lib,def,exp,jar}', 'ext/redcloth_scan/Makefile']
+  p.clean_pattern += ['ext/redcloth_scan/**/*.{bundle,so,obj,pdb,lib,def,exp,c,o,xml,class,jar,java}', 'lib/*.{bundle,so,o,obj,pdb,lib,def,exp,jar}', 'ext/redcloth_scan/**/redcloth_*.rb', 'lib/redcloth_scan.rb', 'ext/redcloth_scan/Makefile']
   p.url = "http://redcloth.org"
   p.project = "redcloth"
   p.rdoc_pattern = ['README', 'COPING', 'CHANGELOG', 'lib/**/*.rb', 'doc/**/*.rdoc']
@@ -20,10 +21,14 @@ e = Echoe.new('RedCloth', RedCloth::VERSION.to_s) do |p|
     p.platform = 'x86-mswin32-60'
   elsif Platform.java?
     p.platform = 'universal-java'
+  elsif RUBY_PLATFORM == 'pureruby'
+    p.platform = 'ruby'
   end
   
   if RUBY_PLATFORM =~ /mingw|mswin|java/
     p.need_tar_gz = false
+  elsif RUBY_PLATFORM == 'pureruby'
+    p.need_gem = false
   else
     p.need_zip = true
     p.need_tar_gz = true
@@ -36,6 +41,8 @@ e = Echoe.new('RedCloth', RedCloth::VERSION.to_s) do |p|
       self.files += ['lib/redcloth_scan.so']
     when /java/
       self.files += ['lib/redcloth_scan.jar']
+    when 'pureruby'
+      self.files += ['lib/redcloth_scan.rb']
     else
       self.files += %w[attributes inline scan].map {|f| "ext/redcloth_scan/redcloth_#{f}.c"}
     end
@@ -45,8 +52,6 @@ e = Echoe.new('RedCloth', RedCloth::VERSION.to_s) do |p|
 
 end
 
-#### Pre-compiled extensions for alternative platforms
-
 def move_extensions
   Dir["ext/**/*.{bundle,so,jar}"].each { |file| mv file, "lib/" }
 end
@@ -89,16 +94,39 @@ when /java/
     move_extensions
   end
   
+when /pureruby/
+  filename = "lib/redcloth_scan.rb"
+  file filename => FileList["#{ext}/redcloth_scan.rb", "#{ext}/redcloth_inline.rb", "#{ext}/redcloth_attributes.rb"] do |task|
+    
+    sources = task.prerequisites.join(' ')
+    sh "cat #{sources} > #{filename}"
+  end
+  
 else
   filename = "#{ext}/redcloth_scan.#{Config::CONFIG['DLEXT']}"
   file filename => FileList["#{ext}/redcloth_scan.c", "#{ext}/redcloth_inline.c", "#{ext}/redcloth_attributes.c"]
 end
 
-task :compile => [filename]
+task :compile => [:remove_other_platforms, filename]
 
 def ragel(target_file, source_file)
-  host_language = (target_file =~ /java$/) ? "J" : "C"
-  code_style = (host_language == "C") ? " -" + (@code_style || "T0") : ""
+  host_language = case target_file
+  when /java$/
+    "J"
+  when /rb$/
+    "R"
+  else
+    "C"
+  end
+  preferred_code_style = case host_language
+  when "R"
+    "F1"
+  when "C"
+    "T0"
+  else
+    nil
+  end
+  code_style = preferred_code_style ? " -" + (@code_style || preferred_code_style) : ""
   ensure_ragel_version(target_file) do
     sh %{ragel #{source_file} -#{host_language}#{code_style} -o #{target_file}}
   end
@@ -129,23 +157,39 @@ file "#{ext}/RedclothAttributes.java" =>  ["#{ext}/redcloth_attributes.java.rl",
   ragel "#{ext}/RedclothAttributes.java", "#{ext}/redcloth_attributes.java.rl"
 end
 
+# Ragel-generated pureruby files
+file "#{ext}/redcloth_scan.rb" =>  ["#{ext}/redcloth_scan.rb.rl",   "#{ext}/redcloth_scan.rl", "#{ext}/redcloth_common.rb.rl",   "#{ext}/redcloth_common.rl"] do
+  ragel "#{ext}/redcloth_scan.rb", "#{ext}/redcloth_scan.rb.rl"
+end
+file "#{ext}/redcloth_inline.rb" =>  ["#{ext}/redcloth_inline.rb.rl",   "#{ext}/redcloth_inline.rl", "#{ext}/redcloth_common.rb.rl",   "#{ext}/redcloth_common.rl"] do
+  ragel "#{ext}/redcloth_inline.rb", "#{ext}/redcloth_inline.rb.rl"
+end
+file "#{ext}/redcloth_attributes.rb" =>  ["#{ext}/redcloth_attributes.rb.rl",   "#{ext}/redcloth_attributes.rl", "#{ext}/redcloth_common.rb.rl",   "#{ext}/redcloth_common.rl"] do
+  ragel "#{ext}/redcloth_attributes.rb", "#{ext}/redcloth_attributes.rb.rl"
+end
+
 
 #### Optimization
 
+# C/Ruby code styles
 RAGEL_CODE_GENERATION_STYLES = {
   'T0' => "Table driven FSM (default)",
   'T1' => "Faster table driven FSM",
   'F0' => "Flat table driven FSM",
-  'F1' => "Faster flat table-driven FSM",
+  'F1' => "Faster flat table-driven FSM"
+}
+# C only code styles
+RAGEL_CODE_GENERATION_STYLES.merge!({
   'G0' => "Goto-driven FSM",
   'G1' => "Faster goto-driven FSM",
   'G2' => "Really fast goto-driven FSM"
-}
+}) if RUBY_PLATFORM !~ /pureruby/
 
 desc "Find the fastest code generation style for Ragel"
 task :optimize do
-  require 'extras/ragel_profiler'
+  require 'test/ragel_profiler'
   results = []
+  
   RAGEL_CODE_GENERATION_STYLES.each do |style, name|
     @code_style = style
     profiler = RagelProfiler.new(style + " " + name)
@@ -162,7 +206,7 @@ task :optimize do
     profiler.measure(:test) do
       Rake::Task['test'].invoke
     end
-    profiler.ext_size(ext_so)
+    profiler.ext_size(filename)
     
   end
   puts RagelProfiler.results
@@ -171,30 +215,35 @@ end
 
 #### Custom testing tasks
 
-task :test => [:compile]
-
-# Run specific tests or test files
-# 
-# rake test:parser
-# => Runs the full TestParser unit test
-# 
-# rake test:parser:textism
-# => Runs the tests matching /textism/ in the TestParser unit test
-rule "" do |t|
-  # test:file:method
-  if /test:(.*)(:([^.]+))?$/.match(t.name)
-    arguments = t.name.split(":")[1..-1]
-    file_name = arguments.first
-    test_name = arguments[1..-1] 
-    
-    if File.exist?("test/test_#{file_name}.rb")
-      run_file_name = "test_#{file_name}.rb"
+require 'rubygems' 
+require 'spec/rake/spectask'
+Rake::Task[:default].prerequisites.clear
+Spec::Rake::SpecTask.new do |t|
+  t.spec_opts = ["--options #{File.dirname(__FILE__) + '/spec/spec.opts'}"] 
+  t.spec_files = FileList['spec/**/*_spec.rb'] 
+end 
+
+task :default => :spec
+task :spec => [:ensure_diff_lcs, :compile]
+
+task :ensure_diff_lcs do
+  # A little insurance against rake on JRuby not passing the error from load-diff-lcs.rb
+  begin
+    require 'diff/lcs'
+  rescue LoadError
+    begin
+      require 'rubygems' unless ENV['NO_RUBYGEMS']
+      require 'diff/lcs'
+    rescue LoadError
+      raise "You must gem install diff-lcs to run the specs."
     end
-    
-    sh "ruby -Ilib:test test/#{run_file_name} -n /#{test_name}/" 
   end
 end
 
+task :remove_other_platforms do
+  Dir["lib/redcloth_scan.{bundle,so,jar,rb}"].each { |file| rm file }
+end
+
 def ensure_ragel_version(name)
   @ragel_v ||= `ragel -v`[/(version )(\S*)/,2].split('.').map{|s| s.to_i}
   if @ragel_v[0] > 6 || (@ragel_v[0] == 6 && @ragel_v[1] >= 3)

data/RedCloth.gemspec

@@ -2,31 +2,30 @@
 
 Gem::Specification.new do |s|
   s.name = %q{RedCloth}
-  s.version = "4.1.9"
+  s.version = "4.2.0"
   s.platform = %q{universal-java}
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jason Garber"]
-  s.date = %q{2009-02-20}
+  s.date = %q{2009-06-10}
   s.default_executable = %q{redcloth}
-  s.description = %q{RedCloth-4.1.9 - Textile parser for Ruby. http://redcloth.org/}
+  s.description = %q{RedCloth-4.2.0 - 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/mingw-rbconfig.rb", "ext/redcloth_scan/extconf.rb", "ext/redcloth_scan/redcloth.h", "ext/redcloth_scan/redcloth_attributes.c.rl", "ext/redcloth_scan/redcloth_attributes.java.rl", "ext/redcloth_scan/redcloth_attributes.rl", "ext/redcloth_scan/redcloth_common.c.rl", "ext/redcloth_scan/redcloth_common.java.rl", "ext/redcloth_scan/redcloth_common.rl", "ext/redcloth_scan/redcloth_inline.c.rl", "ext/redcloth_scan/redcloth_inline.java.rl", "ext/redcloth_scan/redcloth_inline.rl", "ext/redcloth_scan/redcloth_scan.c.rl", "ext/redcloth_scan/redcloth_scan.java.rl", "ext/redcloth_scan/redcloth_scan.rl", "extras/ragel_profiler.rb", "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", "Manifest", "Rakefile", "README", "setup.rb", "test/basic.yml", "test/code.yml", "test/definitions.yml", "test/extra_whitespace.yml", "test/filter_html.yml", "test/filter_pba.yml", "test/helper.rb", "test/html.yml", "test/images.yml", "test/instiki.yml", "test/links.yml", "test/lists.yml", "test/poignant.yml", "test/sanitize_html.yml", "test/table.yml", "test/test_custom_tags.rb", "test/test_erb.rb", "test/test_extensions.rb", "test/test_formatters.rb", "test/test_parser.rb", "test/test_restrictions.rb", "test/textism.yml", "test/threshold.yml", "test/validate_fixtures.rb", "RedCloth.gemspec", "lib/redcloth_scan.jar"]
-  s.has_rdoc = true
+  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.jar"]
   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.1.9 - Textile parser for Ruby. http://redcloth.org/}
-  s.test_files = ["test/test_custom_tags.rb", "test/test_erb.rb", "test/test_extensions.rb", "test/test_formatters.rb", "test/test_parser.rb", "test/test_restrictions.rb"]
+  s.rubygems_version = %q{1.3.3}
+  s.summary = %q{RedCloth-4.2.0 - 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

@@ -14,8 +14,8 @@
 // For Ruby 1.9
 #ifdef HAVE_RUBY_ENCODING_H
 #include "ruby/encoding.h"
-#define STR_NEW(p,n) rb_enc_str_new((p),(n),rb_utf8_encoding())
-#define STR_NEW2(p) rb_enc_str_new((p),strlen(p),rb_utf8_encoding())
+#define STR_NEW(p,n) rb_enc_str_new((p),(n),rb_enc_from_index(ENCODING_GET(self)))
+#define STR_NEW2(p) rb_enc_str_new((p),strlen(p),rb_enc_from_index(ENCODING_GET(self)))
 
 // For Ruby 1.8
 #else
@@ -39,7 +39,7 @@ VALUE redcloth_inline2(VALUE, VALUE, VALUE);
 VALUE redcloth_attribute_parser(int, VALUE, char *, char *);
 VALUE redcloth_attributes(VALUE, VALUE);
 VALUE redcloth_link_attributes(VALUE, VALUE);
-VALUE red_parse_title(VALUE, VALUE);
+VALUE red_parse_title(VALUE, VALUE, VALUE);
 VALUE redcloth_transform(VALUE, char *, char *, VALUE);
 VALUE redcloth_transform2(VALUE, VALUE);
 void red_inc(VALUE, VALUE);
@@ -49,8 +49,11 @@ VALUE red_pass(VALUE, VALUE, VALUE, ID, VALUE);
 VALUE red_pass_code(VALUE, VALUE, VALUE, ID);
 
 /* parser macros */
-#define CLEAR_REGS()   regs = rb_hash_new();
+#define CLEAR_REGS()   regs = rb_hash_new(); attr_regs = rb_hash_new();
 #define RESET_REG()    reg = NULL
+#define MARK()         reg = p;
+#define MARK_B()       bck = p;
+#define MARK_ATTR()    attr_reg = p;
 #define CAT(H)         rb_str_cat(H, ts, te-ts)
 #define CLEAR(H)       H = STR_NEW2("")
 #define RSTRIP_BANG(H)      rb_funcall(H, rb_intern("rstrip!"), 0)
@@ -62,7 +65,7 @@ VALUE red_pass_code(VALUE, VALUE, VALUE, ID);
 #define PARSE_ATTR(A)  red_parse_attr(self, regs, ID2SYM(rb_intern(A)))
 #define PARSE_LINK_ATTR(A)  red_parse_link_attr(self, regs, ID2SYM(rb_intern(A)))
 #define PARSE_IMAGE_ATTR(A)  red_parse_image_attr(self, regs, ID2SYM(rb_intern(A)))
-#define PASS_CODE(H, A, T, O) rb_str_append(H, red_pass_code(self, regs, ID2SYM(rb_intern(A)), rb_intern(T)))
+#define PASS_CODE(H, A, T) rb_str_append(H, red_pass_code(self, regs, ID2SYM(rb_intern(A)), rb_intern(T)))
 #define ADD_BLOCK() \
   rb_str_append(html, red_block(self, regs, block, refs)); \
   extend = Qnil; \
@@ -70,16 +73,19 @@ VALUE red_pass_code(VALUE, VALUE, VALUE, ID);
   CLEAR_REGS()
 #define ADD_EXTENDED_BLOCK()    rb_str_append(html, red_block(self, regs, block, refs)); CLEAR(block);
 #define END_EXTENDED()     extend = Qnil; CLEAR_REGS();
-#define IS_NOT_EXTENDED()     NIL_P(extend)
 #define ADD_BLOCKCODE()    rb_str_append(html, red_blockcode(self, regs, block)); CLEAR(block); CLEAR_REGS()
 #define ADD_EXTENDED_BLOCKCODE()    rb_str_append(html, red_blockcode(self, regs, block)); CLEAR(block);
 #define ASET(T, V)     rb_hash_aset(regs, ID2SYM(rb_intern(T)), STR_NEW2(V));
-#define AINC(T)        red_inc(regs, ID2SYM(rb_intern(T)));
+#define ATTR_SET(T, V) rb_hash_aset(attr_regs, ID2SYM(rb_intern(T)), STR_NEW2(V));
+#define ATTR_INC(T)        red_inc(attr_regs, ID2SYM(rb_intern(T)));
+#define INC(N)         N++;
 #define SET_ATTRIBUTES() \
   SET_ATTRIBUTE("class_buf", "class"); \
   SET_ATTRIBUTE("id_buf", "id"); \
   SET_ATTRIBUTE("lang_buf", "lang"); \
-  SET_ATTRIBUTE("style_buf", "style");
+  SET_ATTRIBUTE("style_buf", "style"); \
+  rb_funcall(regs, rb_intern("merge!"), 1, attr_regs); \
+  attr_regs = rb_hash_new();
 #define SET_ATTRIBUTE(B, A) \
   if (rb_hash_aref(regs, ID2SYM(rb_intern(B))) != Qnil) rb_hash_aset(regs, ID2SYM(rb_intern(A)), rb_hash_aref(regs, ID2SYM(rb_intern(B))));
 #define TRANSFORM(T) \
@@ -106,6 +112,15 @@ VALUE red_pass_code(VALUE, VALUE, VALUE, ID);
   } else { \
     rb_hash_aset(regs, ID2SYM(rb_intern(T)), Qnil); \
   }
+#define STORE_ATTR(T)  \
+  if (p > attr_reg && attr_reg >= ts) { \
+    VALUE str = STR_NEW(attr_reg, p-attr_reg); \
+    rb_hash_aset(attr_regs, ID2SYM(rb_intern(T)), str); \
+    /*printf("STORE_B(" T ") '%s' (p:'%s' reg:'%s')\n", RSTRING_PTR(str), p, reg);*/  \
+  } else { \
+    rb_hash_aset(attr_regs, ID2SYM(rb_intern(T)), Qnil); \
+  }
+
 #define STORE_URL(T) \
   if (p > reg && reg >= ts) { \
     char punct = 1; \
@@ -141,20 +156,24 @@ VALUE red_pass_code(VALUE, VALUE, VALUE, ID);
 #define STORE_LINK_ALIAS() \
   rb_hash_aset(refs_found, rb_hash_aref(regs, ID2SYM(rb_intern("text"))), rb_hash_aref(regs, ID2SYM(rb_intern("href"))))
 #define CLEAR_LIST() list_layout = rb_ary_new()
-#define LIST_ITEM() \
+#define SET_LIST_TYPE(T) list_type = T;
+#define NEST() nest ++;
+#define RESET_NEST() nest = 0;
+#define LIST_LAYOUT() \
     int aint = 0; \
     VALUE aval = rb_ary_entry(list_index, nest-1); \
     if (aval != Qnil) aint = NUM2INT(aval); \
-    if (strcmp(list_type, "ol") == 0) \
+    if (strcmp(list_type, "ol") == 0 && nest > 0) \
     { \
       rb_ary_store(list_index, nest-1, INT2NUM(aint + 1)); \
     } \
     if (nest > RARRAY_LEN(list_layout)) \
     { \
+      SET_ATTRIBUTES(); \
       sprintf(listm, "%s_open", list_type); \
-      if (list_continue == 1) \
+      if (!NIL_P(rb_hash_aref(regs, ID2SYM(rb_intern("list_continue"))))) \
       { \
-        list_continue = 0; \
+        rb_hash_aset(regs, ID2SYM(rb_intern("list_continue")), Qnil); \
         rb_hash_aset(regs, ID2SYM(rb_intern("start")), rb_ary_entry(list_index, nest-1)); \
       } \
       else \
@@ -177,8 +196,13 @@ VALUE red_pass_code(VALUE, VALUE, VALUE, ID);
       ASET("first", "true"); \
     } \
     LIST_CLOSE(); \
+    if (nest != 0) LIST_ITEM_CLOSE(); \
+    CLEAR_REGS(); \
     rb_hash_aset(regs, ID2SYM(rb_intern("nest")), INT2NUM(RARRAY_LEN(list_layout))); \
-    ASET("type", "li_open")
+    ASET("type", "li_open");
+#define LIST_ITEM_CLOSE() \
+    if ( rb_hash_aref(regs, ID2SYM(rb_intern("first"))) == Qnil ) \
+      rb_str_append(html, rb_funcall(self, rb_intern("li_close"), 1, regs));
 #define LIST_CLOSE() \
     while (nest < RARRAY_LEN(list_layout)) \
     { \
@@ -188,6 +212,7 @@ VALUE red_pass_code(VALUE, VALUE, VALUE, ID);
       { \
         StringValue(end_list); \
         sprintf(listm, "%s_close", RSTRING_PTR(end_list)); \
+        LIST_ITEM_CLOSE(); \
         rb_str_append(html, rb_funcall(self, rb_intern(listm), 1, regs)); \
       } \
     }