BBRedCloth 0.8.4 → 0.9.0.alpha1

data/BBRedCloth.gemspec

@@ -1,31 +1,28 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{BBRedCloth}
-  s.version = "0.8.4"
+  s.name = "BBRedCloth"
+  s.version = "0.9.0.alpha1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Alyea"]
-  s.date = %q{2011-06-12}
-  s.default_executable = %q{redcloth}
-  s.description = %q{BBRedCloth-0.8.4 - Textile parser for Ruby. Includes BBCode additions.
-http://redcloth.org/}
-  s.email = %q{ryan@fangamer.com}
+  s.date = "2021-01-02"
+  s.description = "BBRedCloth-0.9.0.alpha1 - Textile parser for Ruby. Includes BBCode additions.\nhttp://redcloth.org/"
+  s.email = "ryan@fangamer.com"
   s.executables = ["redcloth"]
   s.extensions = ["ext/redcloth_scan/extconf.rb"]
   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.textile"]
-  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_bbcode.c.rl", "ext/redcloth_scan/redcloth_bbcode.rl", "ext/redcloth_scan/redcloth_bbcode_inline.rl", "ext/redcloth_scan/redcloth_bbcode_inline.c.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.textile", "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", "BBRedCloth.gemspec", "ext/redcloth_scan/redcloth_attributes.c", "ext/redcloth_scan/redcloth_inline.c", "ext/redcloth_scan/redcloth_scan.c", "ext/redcloth_scan/redcloth_bbcode.c", "ext/redcloth_scan/redcloth_bbcode_inline.c"]
-  s.homepage = %q{http://redcloth.org}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "BBRedCloth", "--main", "README.textile"]
+  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", "Manifest", "Rakefile", "README.textile", "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", "BBRedCloth.gemspec", "ext/redcloth_scan/redcloth_attributes.c", "ext/redcloth_scan/redcloth_inline.c", "ext/redcloth_scan/redcloth_scan.c", "ext/redcloth_scan/redcloth_bbcode.c", "ext/redcloth_scan/redcloth_bbcode_inline.c"]
+  s.homepage = "http://redcloth.org"
+  s.rdoc_options = ["--line-numbers", "--title", "BBRedCloth", "--main", "README.textile"]
   s.require_paths = ["lib", "ext", "lib/case_sensitive_require"]
   s.required_ruby_version = Gem::Requirement.new(">= 1.8.4")
-  s.rubyforge_project = %q{bbredcloth}
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{BBRedCloth-0.8.4 - Textile parser for Ruby. Includes BBCode additions. 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.rubyforge_project = "bbredcloth"
+  s.rubygems_version = "1.8.23.2"
+  s.summary = "BBRedCloth-0.9.0.alpha1 - Textile parser for Ruby. Includes BBCode additions. http://redcloth.org/"
+  s.test_files = ["test/test_formatters.rb", "test/test_custom_tags.rb", "test/test_extensions.rb", "test/test_restrictions.rb", "test/test_erb.rb", "test/test_parser.rb"]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/CHANGELOG

@@ -1,4 +1,161 @@
-=== Edge
+== 4.3.1 / May 17th, 2016
+
+* Fix additional case for CVE-2012-6684 [Joshua Siler]
+
+== 4.3.0 / April 29th, 2016
+
+* Remove JRuby and Windows cross compilation and support
+* Add Ruby 2.2.3 testing and support
+
+* include CVE-2012-6684 fix [Tomas Pospisek]
+  * fix by [Antonio Terceiro] 
+    * see http://sources.debian.net/src/ruby-redcloth/4.2.9-4/debian/patches/0001-Filter-out-javascript-links-when-using-filter_html-o.patch/
+  * vulnerability reported by [Kousuke Ebihara] 
+    * see http://co3k.org/blog/redcloth-unfixed-xss-en
+
+== 4.2.9.1 / February 24, 2015
+
+* Lazy-load latex_entities.yml [Charlie Somerville]
+
+== 4.2.9 / November 25, 2011
+
+* Fix RbConfig / Config warning in Ruby 1.9.3. [Steve Purcell, Robert Gleeson, and unclaimedbaggage]
+* Use RSTRING_NOT_MODIFIED header for Rubinius [Dirkjan Bussink]
+
+== 4.2.8 / August 17, 2011
+
+* Do not treat warnings as errors so it compiles cleanly. [Tomasz Wałkuski]
+
+== 4.2.7 / February 10, 2011
+
+* Fixed typo in gemspec to make case-sensitive require work. [Gabe da Silveira]
+* Tested installing the gem and requiring it with both cases on Ubuntu 8.04, 10.10 and OS X Version 10.6.6.
+* Have spaces around the en-dash in LaTeX [Benjamin Quorning]
+* Turned double-quote close to smart quotes in LaTeX [Jonathan D. Blake]
+
+=== 4.2.6 / February 9, 2011
+
+* Add case-sensitive require back into the gemspec.
+* Fix rdoc options in gemspec.
+
+=== 4.2.5 / February 7, 2011
+
+* Fix bundler and rubygems-test incompatibilities. Working around bug:
+    https://github.com/carlhuda/bundler/issues/issue/1021
+
+=== 4.2.4 / February 7, 2011
+
+* Add .gemtest to opt-in to rubygems-test program (gem install rubygems-test to participate)
+* Allow attributes to be set on hr and br tags [Jesse Stormier]
+* Fix dangling <li> [Stephen Bannasch]
+* Switch to bundler and rake-compiler for gem management/compilation
+* Fix invalid YAML for Ruby 1.9.2 [Aaron Patterson]
+
+=== 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 [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]
+
+=== 4.2.1 / June 16, 2009
+
+* Fix regression where period wasn't accepted in style attribute. [Jason Garber]
+
+=== 4.2.0 / June 10, 2009
+
+* 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.
+
+* Image URLs and image titles can now contain parentheses. #71
+
+* Handle caps properly in link titles. #77
+
+* Remove extra preformatted line breaks after extended block code. #79
+
+* Fix inline <notextile> being recognized as block <notextile>. #81
+
+* Allow leading spaces on lists for backward compatibility with RedCloth 3.x. #89
+
+* Recognize deleted phrases when they start at the beginning of a line. #83
+
+* Fix escaped <code> tag when it has the class attribute and is in a <pre> tag. #95
+
+* Fix dimensions and primes for LaTeX. #103
+
+* Don't allow square brackets inside lang attribute so double square brackets are interpreted like Textile 2 and RedCloth 3. #101
+
+* Improve LaTeX output for tables. #96
+
+* Fix bad parsing of bracketed image links (which would hang the interpreter in some cases). #97
+
+* Handle links containing parentheses.  Brackets are no longer required. #82 [Ryan Alyea]
+
+* Made italics use the correct LaTeX tag: textit rather than emph. #98
+
+* Fixed custom block signatures calling built-in Ruby String methods. #92
 
 * Mentioned the three supported platforms and what's necessary to build RedCloth in the README file.
 
@@ -25,7 +182,7 @@
   To compile the jruby version of the gem: jruby -S rake compile
 
 * Added textilize ERB utility method. [edraut]
-  Use it in an ERB template like this: <%=t my_textile_string %> or 
+  Use it in an ERB template like this: <%=t my_textile_string %> or
   <%=r %{Some *textile* if you please!} %>
 
 * Fix extended blockcode stripping whitespace following blank line. #78
@@ -120,4 +277,4 @@
 
 * Over 500 tests prevent regression
 
-* It's 40 times faster than the previous version.
+* It's 40 times faster than the previous version.

data/Manifest

@@ -1,26 +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_bbcode.c.rl
-ext/redcloth_scan/redcloth_bbcode.rl
-ext/redcloth_scan/redcloth_bbcode_inline.rl
-ext/redcloth_scan/redcloth_bbcode_inline.c.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

data/README.textile

@@ -9,9 +9,24 @@ License::   MIT
 
 (See http://redcloth.org/textile/ for a Textile reference.)
 
+h2. Latest Updates
+
+Holy crap, it's 2021?
+
+* Updated version to 0.9.0.alpha1. The minor version bump is due to minor breaking changes listed below.
+* Cherry-picked every major update from RedCloth until this post, which RedCloth has not been updated since 2018. (Nothing wrong with that. Don't fix what ain't broke.) I did not port the RSpec, gem-building, or other new meta elements. But the base engine is still the same so there's no need because the gem-building at least originally was for building on Windows and Java which BBRedCloth does not support.
+* Includes CVE-2012-6684. Although I highly, *highly* recommend using an html sanitizer on top of this because Textile lets you some EVIL things in CSS.
+* YouTube and Vimeo support was removed. It used the super old flash version anyway.
+* Removed the swear filter, it wasn't perfect.
+* All tests pass. NOTE: Malformed BBCode currently produces non-ideal but valid and secure HTML code. Don't mess up your BBCode and it's all fine.
+* Confirmed working on Ruby 3.0.0
+* If you are using BBRedCloth, simply including the pre-packaged gem file is fine. Due to the reliance on Ragel, you cannot just include a Github project.
+** Since I have not yet ported the build system, you need the last version of echoe gem and Ruby 1.9.3 to actually build the gem using @rake package@. Sorry, not sorry. You can still build Ruby 1.9.3 on macOS Big Sur if you remove or use the super insecure old OpenSSL 1.0.2t, so it's not like super-hard.
+** Once you have the .gem file, later version of Ruby such as 3.0.0 can then build the native extension normally like any gem.
+
 h2. BBRedCloth
 
-BBRedCloth is a Ruby library for converting Textile into HTML. While fundamentally based on RedCloth, it also contains the ability to convert 
+BBRedCloth is a Ruby library for converting Textile into HTML. While fundamentally based on RedCloth, it also contains the ability to convert standard "BBCode" also, which is useful for forums which use this style of markup since, well... forever. As a drop-in replacement for RedCloth, it plays well such that Textile and BBCode can work side-by-side without much effort for the implementer.
 
 h2. Installing
 
@@ -26,7 +41,7 @@ It will install the appropriate Ruby gem. JRuby is not supported, nor is the pur
 If you wish to use BBRedCloth in your Rails 3 project, just add the following to your Gemfile:
 
 <pre>
-gem 'BBRedCloth', :require=>"RedCloth"
+gem 'BBRedCloth', require:'redcloth'
 </pre>
 
 == Compiling

data/Rakefile

@@ -1,6 +1,6 @@
 require './lib/redcloth/version'
 require 'rubygems'
-gem 'echoe', '>= 3.0.1'
+gem 'echoe', '>= 4.1'
 require 'echoe'
 
 # Platform missing from Echoe >= 3.2?
@@ -51,9 +51,9 @@ e = Echoe.new('BBRedCloth', RedCloth::VERSION.to_s) do |p|
   p.ruby_version = '>=1.8.4'
   p.extension_pattern = nil
   
-  if Platform.gcc?
+  if Echoe::Platform.gcc?
     p.platform = 'x86-mswin32-60'
-  elsif Platform.java?
+  elsif Echoe::Platform.java?
     p.platform = 'universal-java'
   end
   
@@ -86,16 +86,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
-  classpath ? "-cp #{classpath}" : ""
+  unless jruby_cpath
+    jruby_cpath = ENV['JRUBY_PARENT_CLASSPATH'] || ENV['JRUBY_HOME'] &&
+      FileList["#{ENV['JRUBY_HOME']}/lib/*.jar"].join(File::PATH_SEPARATOR)
+  end
+  jruby_cpath ? "-cp \"#{jruby_cpath}\"" : ""
 end
 
 ext = "ext/redcloth_scan"

data/ext/redcloth_scan/redcloth.h

@@ -15,6 +15,22 @@
 #define RARRAY_PTR(x) (RARRAY(x)->ptr)
 #endif
 
+// Different string conversions for ruby 1.8 and ruby 1.9. For 1.9, 
+// we need to set the encoding of the string.
+
+// 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_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
+#define STR_NEW(p,n) rb_str_new((p),(n))
+#define STR_NEW2(p) rb_str_new2((p))
+
+#endif
+
 /* variable defs */
 #ifndef redcloth_scan_c
 extern VALUE super_ParseError, mRedCloth, super_RedCloth;
@@ -30,6 +46,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);
 VALUE redcloth_transform(VALUE, char *, char *, VALUE);
 VALUE redcloth_transform2(VALUE, VALUE);
 void red_inc(VALUE, VALUE);
@@ -49,43 +66,49 @@ VALUE redcloth_bbcode_inline2(VALUE, VALUE, VALUE);
   if (rb_funcall(rb_funcall(self, rb_intern("disable_inline"), 0),rb_intern("include?"), 1,ID2SYM(rb_intern(#T))) != Qtrue) { F }
 #define UNLESS_DISABLED_INLINE(H, T, F) \
   if (rb_funcall(rb_funcall(self, rb_intern("disable_inline"), 0),rb_intern("include?"), 1,ID2SYM(rb_intern(#T))) == Qtrue) { rb_str_append(H,red_passthrough(self, ts, te, refs)); } \
-  else {   /*VALUE test = rb_str_new(ts,te-ts); printf("\nred_passthrough_else() '%s'\n", RSTRING(test)->ptr);*/ F }
+  else {   /*VALUE test = STR_NEW(ts,te-ts); printf("\nred_passthrough_else() '%s'\n", RSTRING(test)->ptr);*/ F }
 #define UNLESS_DISABLED_ATTRIBUTE(T, F) \
   if (!(rb_funcall(rb_funcall(self, rb_intern("disable_inline"), 0),rb_intern("include?"), 1,ID2SYM(rb_intern(#T))) == Qtrue)) { F } //if !(rb_funcall(rb_funcall(self, rb_intern("disable_inline"), 0),rb_intern("include?"), 1,ID2SYM(rb_intern(#T))) == Qtrue) { F }
-#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 = rb_str_new2("")
-#define SET_PLAIN_BLOCK(T) plain_block = rb_str_new2(T)
+#define CLEAR(H)       H = STR_NEW2("")
+#define RSTRIP_BANG(H)      rb_funcall(H, rb_intern("rstrip!"), 0)
+#define SET_PLAIN_BLOCK(T) plain_block = STR_NEW2(T)
 #define RESET_TYPE(T)  rb_hash_aset(regs, ID2SYM(rb_intern("type")), plain_block)
 #define INLINE(H, T)   rb_str_append(H, rb_funcall(self, rb_intern(T), 1, regs))
 #define DONE(H)        rb_str_append(html, H); CLEAR(H); CLEAR_REGS()
-#define BBDONE()       failed_start = rb_str_new2(""); html = rb_str_new2(""); CLEAR_REGS(); RESET_REG();
+#define BBDONE()       failed_start = STR_NEW2(""); html = STR_NEW2(""); CLEAR_REGS(); RESET_REG();
 #define PASS(H, A, T)  rb_str_append(H, red_pass(self, regs, ID2SYM(rb_intern(A)), rb_intern(T), refs))
 #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 PASS_CODE(H, A, T, O) rb_str_append(H, red_pass_code(self, regs, ID2SYM(rb_intern(A)), rb_intern(T)))
+#define PARSE_IMAGE_ATTR(A)  red_parse_image_attr(self, regs, ID2SYM(rb_intern(A)))
+#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; \
   CLEAR(block); \
   CLEAR_REGS()
-#define ADD_EXTENDED_BLOCK()    rb_str_append(html, red_block(self, regs, block, refs)); CLEAR(block);
+#define ADD_EXTENDED_BLOCK()    rb_str_append(html, red_block(self, regs, block, refs)); CLEAR(block); rb_hash_aset(regs,ID2SYM(rb_intern("fallback")),Qnil); 
 #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)), rb_str_new2(V));
-#define AINC(T)        red_inc(regs, ID2SYM(rb_intern(T)));
+#define ASET(T, V)     rb_hash_aset(regs, ID2SYM(rb_intern(T)), STR_NEW2(V));
+#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() \
-  VALUE buf = Qnil; \
   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) \
-  buf = rb_hash_aref(regs, ID2SYM(rb_intern(B))); \
-  if (buf != Qnil) rb_hash_aset(regs, ID2SYM(rb_intern(A)), buf);
+  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) \
   if (p > reg && reg >= ts) { \
     VALUE str = redcloth_transform(self, reg, p, refs); \
@@ -96,7 +119,7 @@ VALUE redcloth_bbcode_inline2(VALUE, VALUE, VALUE);
   }
 #define STORE(T)  \
   if (p > reg && reg >= ts) { \
-    VALUE str = rb_str_new(reg, p-reg); \
+    VALUE str = STR_NEW(reg, p-reg); \
     rb_hash_aset(regs, ID2SYM(rb_intern(T)), str); \
   /*  printf("STORE(" T ") '%s' (p:'%d' reg:'%d')\n", RSTRING(str)->ptr, p, reg);*/  \
   } else { \
@@ -104,13 +127,22 @@ VALUE redcloth_bbcode_inline2(VALUE, VALUE, VALUE);
   }
 #define STORE_B(T)  \
   if (p > bck && bck >= ts) { \
-    VALUE str = rb_str_new(bck, p-bck); \
+    VALUE str = STR_NEW(bck, p-bck); \
     rb_hash_aset(regs, ID2SYM(rb_intern(T)), str); \
   /*  printf("STORE_B(" T ") '%s' (p:'%d' reg:'%d')\n", RSTRING(str)->ptr, p, reg);*/  \
   } else { \
     rb_hash_aset(regs, ID2SYM(rb_intern(T)), Qnil); \
   }
 #define BBCODE_ENABLED() rb_funcall(self, rb_intern("bbcode"), 0) == Qtrue
+#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; \
@@ -119,7 +151,7 @@ VALUE redcloth_bbcode_inline2(VALUE, VALUE, VALUE);
         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; \
@@ -146,20 +178,24 @@ VALUE redcloth_bbcode_inline2(VALUE, VALUE, VALUE);
 #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,13 +213,18 @@ VALUE redcloth_bbcode_inline2(VALUE, VALUE, VALUE);
       } \
       rb_hash_aset(regs, ID2SYM(rb_intern("nest")), INT2NUM(nest)); \
       rb_str_append(html, rb_funcall(self, rb_intern(listm), 1, regs)); \
-      rb_ary_store(list_layout, nest-1, rb_str_new2(list_type)); \
+      rb_ary_store(list_layout, nest-1, STR_NEW2(list_type)); \
       CLEAR_REGS(); \
       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)) \
     { \
@@ -193,6 +234,7 @@ VALUE redcloth_bbcode_inline2(VALUE, VALUE, VALUE);
       { \
         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)); \
       } \
     }