diff -Nru libhpricot-ruby-0.8/CHANGELOG libhpricot-ruby-0.8.2/CHANGELOG
--- libhpricot-ruby-0.8/CHANGELOG	2009-03-24 19:43:02.000000000 +0000
+++ libhpricot-ruby-0.8.2/CHANGELOG	2009-12-13 23:54:10.000000000 +0000
@@ -1,3 +1,23 @@
+= 0.8.2
+=== 5 November, 2009
+* Bring JRuby support up to speed, including Java-based hpricot_css support
+* Change JRuby fast_xs to have same escaping behavior as C fast_xs
+
+= 0.8.1
+=== 3 April, 2009
+* fix for issue #2, downcasing of html attributes inside the parser.
+* solve issue #3 with bogus etags being preserved in `to_s` rather than just `to_original_html`.
+* fix error when attempting to reparent cleared node. (issue #5)
+* Hpricot::Attributes proxy object for using `ele.attributes[k] = v` directly.
+  however, it is preferred to use the jquery-like `elements.attr(k, v)`.
+
+= 0.8
+=== 31st March, 2009
+* Saving memory and speed by using RStruct-based elements in the C extension.
+* Bug in tag parsing, causing runaway <script> and <style> tags in HTML.
+* Problem compiling under Ruby 1.9, due to our_rb_hash_lookup function meant for Ruby 1.8.
+* CData was missing inner_text method.
+
 = 0.7
 === 17th March, 2009
 * Rewritten parser routine, much lighter on memory, quite a bit faster.
diff -Nru /tmp/aPeI5X1Iz5/libhpricot-ruby-0.8/debian/changelog /tmp/kCvPnLCzlr/libhpricot-ruby-0.8.2/debian/changelog
--- libhpricot-ruby-0.8/debian/changelog	2009-12-14 09:12:40.000000000 +0000
+++ libhpricot-ruby-0.8.2/debian/changelog	2009-12-14 09:12:40.000000000 +0000
@@ -1,3 +1,17 @@
+libhpricot-ruby (0.8.2-1) karmic; urgency=low
+
+  * New Upstream Version
+
+ -- Cathal Mc Ginley <cathal.alexandria@gnostai.org>  Sun, 13 Dec 2009 23:54:11 +0000
+
+libhpricot-ruby (0.8.1-1) unstable; urgency=low
+
+  * New upstream release
+  * Bump Standards-Version (no changes)
+  * Add myself to uploaders
+
+ -- Micah Anderson <micah@debian.org>  Wed, 19 Aug 2009 17:09:56 -0400
+
 libhpricot-ruby (0.8-2) unstable; urgency=low
 
   * build ext/fast_xs too (Closes: #532949)
diff -Nru /tmp/aPeI5X1Iz5/libhpricot-ruby-0.8/debian/control /tmp/kCvPnLCzlr/libhpricot-ruby-0.8.2/debian/control
--- libhpricot-ruby-0.8/debian/control	2009-12-14 09:12:40.000000000 +0000
+++ libhpricot-ruby-0.8.2/debian/control	2009-12-14 09:12:40.000000000 +0000
@@ -1,12 +1,14 @@
 Source: libhpricot-ruby
-Section: ruby
+Section: interpreters
 Priority: extra
 Maintainer: Ryan Niebur <ryanryan52@gmail.com>
-Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers@lists.alioth.debian.org>
+Uploaders: Debian Ruby Extras Maintainers <pkg-ruby-extras-maintainers@lists.alioth.debian.org>, Micah Anderson <micah@debian.org>
 DM-Upload-Allowed: yes
 Build-Depends: cdbs, debhelper (>= 5), ruby-pkg-tools (>= 0.8), 
  ruby1.8, ruby1.8-dev, ruby1.9, ruby1.9-dev
-Standards-Version: 3.8.1
+Vcs-Svn: svn://svn.debian.org/svn/pkg-ruby-extras/trunk/libhpricot-ruby/
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-ruby-extras/trunk/libhpricot-ruby/
+Standards-Version: 3.8.3
 Homepage: http://wiki.github.com/why/hpricot
 
 Package: libhpricot-ruby
diff -Nru /tmp/aPeI5X1Iz5/libhpricot-ruby-0.8/debian/watch /tmp/kCvPnLCzlr/libhpricot-ruby-0.8.2/debian/watch
--- libhpricot-ruby-0.8/debian/watch	2009-12-14 09:12:40.000000000 +0000
+++ libhpricot-ruby-0.8.2/debian/watch	2009-12-14 09:12:40.000000000 +0000
@@ -1,2 +1,2 @@
 version=3
-http://githubredir.debian.net/github/why/hpricot .*/(.*)\.tar\.gz
+http://rubyforge.org/frs/?group_id=215 .*hpricot-(.*)\.tgz
diff -Nru /tmp/aPeI5X1Iz5/libhpricot-ruby-0.8/ext/fast_xs/fast_xs.c /tmp/kCvPnLCzlr/libhpricot-ruby-0.8.2/ext/fast_xs/fast_xs.c
--- libhpricot-ruby-0.8/ext/fast_xs/fast_xs.c	2009-03-24 19:43:02.000000000 +0000
+++ libhpricot-ruby-0.8.2/ext/fast_xs/fast_xs.c	2009-12-13 23:54:10.000000000 +0000
@@ -6,6 +6,7 @@
 
 #ifndef RARRAY_LEN
 #define RARRAY_LEN(arr)  RARRAY(arr)->len
+#define RARRAY_PTR(arr)  RARRAY(arr)->ptr
 #define RSTRING_LEN(str) RSTRING(str)->len
 #define RSTRING_PTR(str) RSTRING(str)->ptr
 #endif
diff -Nru /tmp/aPeI5X1Iz5/libhpricot-ruby-0.8/ext/fast_xs/FastXsService.java /tmp/kCvPnLCzlr/libhpricot-ruby-0.8.2/ext/fast_xs/FastXsService.java
--- libhpricot-ruby-0.8/ext/fast_xs/FastXsService.java	2009-03-24 19:43:02.000000000 +0000
+++ libhpricot-ruby-0.8.2/ext/fast_xs/FastXsService.java	2009-12-13 23:54:10.000000000 +0000
@@ -25,7 +25,7 @@
         String string = recv.convertToString().getUnicodeValue();
         StringWriter writer = new StringWriter ((int)(string.length() * 1.5));
         try {
-            Entities.XML.escape(writer, string);
+            Entities.FAST_XS.escape(writer, string);
             return recv.getRuntime().newString(writer.toString());
         } catch (IOException e) {
             throw recv.getRuntime().newIOErrorFromException(e);
@@ -398,6 +398,13 @@
      */
     public static final Entities HTML40;
 
+    /**
+     * <p>
+     * The set of entities supported by the Ruby fast_xs extension.
+     * </p>
+     */
+    public static final Entities FAST_XS;
+
     static {
         XML = new Entities();
         XML.addEntities(BASIC_ARRAY);
@@ -415,6 +422,11 @@
         fillWithHtml40Entities(HTML40);
     }
 
+    static {
+        FAST_XS = new Entities();
+        FAST_XS.addEntities(BASIC_ARRAY);
+    }
+
     /**
      * <p>
      * Fills the specified entities instance with HTML 40 entities.
diff -Nru /tmp/aPeI5X1Iz5/libhpricot-ruby-0.8/ext/hpricot_scan/hpricot_css.c /tmp/kCvPnLCzlr/libhpricot-ruby-0.8.2/ext/hpricot_scan/hpricot_css.c
--- libhpricot-ruby-0.8/ext/hpricot_scan/hpricot_css.c	2009-03-24 19:43:02.000000000 +0000
+++ libhpricot-ruby-0.8.2/ext/hpricot_scan/hpricot_css.c	2009-12-13 23:54:10.000000000 +0000
@@ -22,10 +22,10 @@
 
 
 #line 25 "hpricot_css.c"
-static const int hpricot_css_start = 85;
+static const int hpricot_css_start = 87;
 static const int hpricot_css_error = 0;
 
-static const int hpricot_css_en_main = 85;
+static const int hpricot_css_en_main = 87;
 
 #line 87 "hpricot_css.rl"
 
@@ -67,10 +67,6 @@
 	switch ( cs )
 	{
 tr0:
-#line 83 "hpricot_css.rl"
-	{{p = ((te))-1;}}
-	goto st85;
-tr10:
 #line 1 "hpricot_css.rl"
 	{	switch( act ) {
 	case 0:
@@ -94,14 +90,19 @@
 	case 9:
 	{{p = ((te))-1;} FILTER(PSUEDO); }
 	break;
+	default: break;
 	}
 	}
-	goto st85;
-tr38:
+	goto st87;
+tr4:
+#line 83 "hpricot_css.rl"
+	{{p = ((te))-1;}}
+	goto st87;
+tr41:
 #line 80 "hpricot_css.rl"
 	{{p = ((te))-1;}{ FILTER(PSUEDO); }}
-	goto st85;
-tr43:
+	goto st87;
+tr46:
 #line 25 "hpricot_css.rl"
 	{
     aps = p;
@@ -113,8 +114,8 @@
   }
 #line 80 "hpricot_css.rl"
 	{te = p+1;{ FILTER(PSUEDO); }}
-	goto st85;
-tr45:
+	goto st87;
+tr48:
 #line 29 "hpricot_css.rl"
 	{
     ape = p;
@@ -122,11 +123,11 @@
   }
 #line 80 "hpricot_css.rl"
 	{te = p+1;{ FILTER(PSUEDO); }}
-	goto st85;
+	goto st87;
 tr62:
 #line 79 "hpricot_css.rl"
 	{{p = ((te))-1;}{ FILTER(POS); }}
-	goto st85;
+	goto st87;
 tr64:
 #line 29 "hpricot_css.rl"
 	{
@@ -135,11 +136,11 @@
   }
 #line 79 "hpricot_css.rl"
 	{te = p+1;{ FILTER(POS); }}
-	goto st85;
+	goto st87;
 tr66:
 #line 78 "hpricot_css.rl"
 	{{p = ((te))-1;}{ FILTER(CHILD); }}
-	goto st85;
+	goto st87;
 tr67:
 #line 25 "hpricot_css.rl"
 	{
@@ -152,7 +153,7 @@
   }
 #line 78 "hpricot_css.rl"
 	{te = p+1;{ FILTER(CHILD); }}
-	goto st85;
+	goto st87;
 tr71:
 #line 29 "hpricot_css.rl"
 	{
@@ -161,16 +162,16 @@
   }
 #line 78 "hpricot_css.rl"
 	{te = p+1;{ FILTER(CHILD); }}
-	goto st85;
-tr99:
+	goto st87;
+tr100:
 #line 75 "hpricot_css.rl"
 	{te = p+1;{ FILTER(ATTR); }}
-	goto st85;
-tr104:
+	goto st87;
+tr105:
 #line 75 "hpricot_css.rl"
 	{{p = ((te))-1;}{ FILTER(ATTR); }}
-	goto st85;
-tr126:
+	goto st87;
+tr132:
 #line 29 "hpricot_css.rl"
 	{
     ape = p;
@@ -178,20 +179,29 @@
   }
 #line 74 "hpricot_css.rl"
 	{te = p+1;{ FILTER(NAME); }}
-	goto st85;
-tr139:
+	goto st87;
+tr143:
 #line 82 "hpricot_css.rl"
 	{te = p+1;{ FILTERAUTO(); }}
-	goto st85;
+	goto st87;
 tr149:
+#line 29 "hpricot_css.rl"
+	{
+    ape = p;
+    PUSH(aps, ape); 
+  }
+#line 76 "hpricot_css.rl"
+	{te = p;p--;{ FILTER(TAG); }}
+	goto st87;
+tr153:
 #line 83 "hpricot_css.rl"
 	{te = p;p--;}
-	goto st85;
-tr150:
+	goto st87;
+tr154:
 #line 81 "hpricot_css.rl"
 	{te = p;p--;{ focus = rb_ary_new3(1, node); }}
-	goto st85;
-tr151:
+	goto st87;
+tr155:
 #line 29 "hpricot_css.rl"
 	{
     ape = p;
@@ -199,20 +209,11 @@
   }
 #line 72 "hpricot_css.rl"
 	{te = p;p--;{ FILTER(ID); }}
-	goto st85;
-tr155:
+	goto st87;
+tr159:
 #line 77 "hpricot_css.rl"
 	{te = p;p--;{ FILTER(MOD); }}
-	goto st85;
-tr156:
-#line 29 "hpricot_css.rl"
-	{
-    ape = p;
-    PUSH(aps, ape); 
-  }
-#line 76 "hpricot_css.rl"
-	{te = p;p--;{ FILTER(TAG); }}
-	goto st85;
+	goto st87;
 tr162:
 #line 29 "hpricot_css.rl"
 	{
@@ -221,7 +222,7 @@
   }
 #line 73 "hpricot_css.rl"
 	{te = p;p--;{ FILTER(CLASS); }}
-	goto st85;
+	goto st87;
 tr166:
 #line 29 "hpricot_css.rl"
 	{
@@ -230,7 +231,7 @@
   }
 #line 80 "hpricot_css.rl"
 	{te = p;p--;{ FILTER(PSUEDO); }}
-	goto st85;
+	goto st87;
 tr173:
 #line 29 "hpricot_css.rl"
 	{
@@ -239,8 +240,8 @@
   }
 #line 79 "hpricot_css.rl"
 	{te = p;p--;{ FILTER(POS); }}
-	goto st85;
-tr188:
+	goto st87;
+tr192:
 #line 29 "hpricot_css.rl"
 	{
     ape = p;
@@ -248,174 +249,138 @@
   }
 #line 78 "hpricot_css.rl"
 	{te = p;p--;{ FILTER(CHILD); }}
-	goto st85;
-tr196:
+	goto st87;
+tr200:
 #line 75 "hpricot_css.rl"
 	{te = p;p--;{ FILTER(ATTR); }}
-	goto st85;
-st85:
+	goto st87;
+st87:
 #line 1 "hpricot_css.rl"
 	{ts = 0;}
 #line 1 "hpricot_css.rl"
 	{act = 0;}
 	if ( ++p == pe )
-		goto _test_eof85;
-case 85:
+		goto _test_eof87;
+case 87:
 #line 1 "hpricot_css.rl"
 	{ts = p;}
-#line 267 "hpricot_css.c"
+#line 268 "hpricot_css.c"
 	switch( (*p) ) {
-		case 32: goto tr133;
-		case 35: goto st2;
-		case 43: goto st89;
-		case 44: goto st87;
-		case 45: goto tr136;
+		case -60: goto tr133;
+		case 32: goto tr137;
+		case 35: goto st7;
+		case 43: goto st92;
+		case 44: goto st90;
+		case 45: goto tr140;
 		case 46: goto st13;
 		case 58: goto st19;
-		case 62: goto tr139;
+		case 62: goto tr143;
 		case 91: goto st52;
-		case 92: goto tr142;
-		case 95: goto tr140;
-		case 101: goto tr143;
-		case 110: goto tr136;
-		case 111: goto tr144;
-		case 126: goto tr139;
-		case 4294967236: goto tr145;
-	}
-	if ( (*p) < 97 ) {
-		if ( (*p) < 48 ) {
-			if ( 9 <= (*p) && (*p) <= 13 )
-				goto tr133;
-		} else if ( (*p) > 57 ) {
-			if ( 65 <= (*p) && (*p) <= 90 )
+		case 92: goto tr146;
+		case 95: goto tr144;
+		case 101: goto tr147;
+		case 110: goto tr140;
+		case 111: goto tr148;
+		case 126: goto tr143;
+	}
+	if ( (*p) < 9 ) {
+		if ( (*p) < -32 ) {
+			if ( -59 <= (*p) && (*p) <= -33 )
+				goto tr134;
+		} else if ( (*p) > -17 ) {
+			if ( -16 <= (*p) && (*p) <= -12 )
+				goto tr136;
+		} else
+			goto tr135;
+	} else if ( (*p) > 13 ) {
+		if ( (*p) < 65 ) {
+			if ( 48 <= (*p) && (*p) <= 57 )
 				goto tr140;
+		} else if ( (*p) > 90 ) {
+			if ( 97 <= (*p) && (*p) <= 122 )
+				goto tr144;
 		} else
-			goto tr136;
-	} else if ( (*p) > 122 ) {
-		if ( (*p) < 4294967264 ) {
-			if ( 4294967237 <= (*p) && (*p) <= 4294967263 )
-				goto tr146;
-		} else if ( (*p) > 4294967279 ) {
-			if ( 4294967280 <= (*p) && (*p) <= 4294967284 )
-				goto tr148;
-		} else
-			goto tr147;
+			goto tr144;
 	} else
-		goto tr140;
+		goto tr137;
 	goto st0;
 st0:
 cs = 0;
 	goto _out;
 tr133:
-#line 1 "hpricot_css.rl"
-	{te = p+1;}
-	goto st86;
-st86:
-	if ( ++p == pe )
-		goto _test_eof86;
-case 86:
-#line 318 "hpricot_css.c"
-	switch( (*p) ) {
-		case 32: goto st1;
-		case 44: goto st87;
-	}
-	if ( 9 <= (*p) && (*p) <= 13 )
-		goto st1;
-	goto tr149;
+#line 25 "hpricot_css.rl"
+	{
+    aps = p;
+  }
+	goto st1;
 st1:
 	if ( ++p == pe )
 		goto _test_eof1;
 case 1:
-	switch( (*p) ) {
-		case 32: goto st1;
-		case 44: goto st87;
-	}
-	if ( 9 <= (*p) && (*p) <= 13 )
-		goto st1;
+#line 321 "hpricot_css.c"
+	if ( -88 <= (*p) && (*p) <= -65 )
+		goto tr1;
 	goto tr0;
-st87:
-	if ( ++p == pe )
-		goto _test_eof87;
-case 87:
-	if ( (*p) == 32 )
-		goto st87;
-	if ( 9 <= (*p) && (*p) <= 13 )
-		goto st87;
-	goto tr150;
-st2:
-	if ( ++p == pe )
-		goto _test_eof2;
-case 2:
-	switch( (*p) ) {
-		case 45: goto tr3;
-		case 92: goto tr5;
-		case 95: goto tr3;
-		case 4294967236: goto tr6;
-	}
-	if ( (*p) < 97 ) {
-		if ( (*p) > 57 ) {
-			if ( 65 <= (*p) && (*p) <= 90 )
-				goto tr3;
-		} else if ( (*p) >= 48 )
-			goto tr3;
-	} else if ( (*p) > 122 ) {
-		if ( (*p) < 4294967264 ) {
-			if ( 4294967237 <= (*p) && (*p) <= 4294967263 )
-				goto tr7;
-		} else if ( (*p) > 4294967279 ) {
-			if ( 4294967280 <= (*p) && (*p) <= 4294967284 )
-				goto tr9;
-		} else
-			goto tr8;
-	} else
-		goto tr3;
-	goto st0;
-tr3:
+tr1:
+#line 1 "hpricot_css.rl"
+	{te = p+1;}
+#line 76 "hpricot_css.rl"
+	{act = 5;}
+	goto st88;
+tr144:
 #line 1 "hpricot_css.rl"
 	{te = p+1;}
 #line 25 "hpricot_css.rl"
 	{
     aps = p;
   }
-#line 72 "hpricot_css.rl"
-	{act = 1;}
-	goto st88;
-tr11:
-#line 1 "hpricot_css.rl"
-	{te = p+1;}
-#line 72 "hpricot_css.rl"
-	{act = 1;}
+#line 76 "hpricot_css.rl"
+	{act = 5;}
 	goto st88;
 st88:
 	if ( ++p == pe )
 		goto _test_eof88;
 case 88:
-#line 394 "hpricot_css.c"
+#line 345 "hpricot_css.c"
 	switch( (*p) ) {
-		case 45: goto tr11;
-		case 92: goto st3;
-		case 95: goto tr11;
-		case 4294967236: goto st4;
-	}
-	if ( (*p) < 97 ) {
-		if ( (*p) > 57 ) {
-			if ( 65 <= (*p) && (*p) <= 90 )
-				goto tr11;
-		} else if ( (*p) >= 48 )
-			goto tr11;
-	} else if ( (*p) > 122 ) {
-		if ( (*p) < 4294967264 ) {
-			if ( 4294967237 <= (*p) && (*p) <= 4294967263 )
-				goto st5;
-		} else if ( (*p) > 4294967279 ) {
-			if ( 4294967280 <= (*p) && (*p) <= 4294967284 )
-				goto st7;
+		case -60: goto st1;
+		case 45: goto tr1;
+		case 92: goto st5;
+		case 95: goto tr1;
+	}
+	if ( (*p) < -16 ) {
+		if ( (*p) > -33 ) {
+			if ( -32 <= (*p) && (*p) <= -17 )
+				goto st3;
+		} else if ( (*p) >= -59 )
+			goto st2;
+	} else if ( (*p) > -12 ) {
+		if ( (*p) < 65 ) {
+			if ( 48 <= (*p) && (*p) <= 57 )
+				goto tr1;
+		} else if ( (*p) > 90 ) {
+			if ( 97 <= (*p) && (*p) <= 122 )
+				goto tr1;
 		} else
-			goto st6;
+			goto tr1;
 	} else
-		goto tr11;
-	goto tr151;
-tr5:
+		goto st4;
+	goto tr149;
+tr134:
+#line 25 "hpricot_css.rl"
+	{
+    aps = p;
+  }
+	goto st2;
+st2:
+	if ( ++p == pe )
+		goto _test_eof2;
+case 2:
+#line 380 "hpricot_css.c"
+	if ( (*p) <= -65 )
+		goto tr1;
+	goto tr0;
+tr135:
 #line 25 "hpricot_css.rl"
 	{
     aps = p;
@@ -425,11 +390,11 @@
 	if ( ++p == pe )
 		goto _test_eof3;
 case 3:
-#line 429 "hpricot_css.c"
-	if ( (*p) == 46 )
-		goto tr11;
-	goto tr10;
-tr6:
+#line 394 "hpricot_css.c"
+	if ( (*p) <= -65 )
+		goto st2;
+	goto tr0;
+tr136:
 #line 25 "hpricot_css.rl"
 	{
     aps = p;
@@ -439,11 +404,11 @@
 	if ( ++p == pe )
 		goto _test_eof4;
 case 4:
-#line 443 "hpricot_css.c"
-	if ( 4294967208 <= (*p) && (*p) <= 4294967231 )
-		goto tr11;
-	goto tr10;
-tr7:
+#line 408 "hpricot_css.c"
+	if ( (*p) <= -65 )
+		goto st3;
+	goto tr0;
+tr146:
 #line 25 "hpricot_css.rl"
 	{
     aps = p;
@@ -453,165 +418,134 @@
 	if ( ++p == pe )
 		goto _test_eof5;
 case 5:
-#line 457 "hpricot_css.c"
-	if ( 4294967168 <= (*p) && (*p) <= 4294967231 )
-		goto tr11;
-	goto tr10;
-tr8:
-#line 25 "hpricot_css.rl"
-	{
-    aps = p;
-  }
-	goto st6;
-st6:
-	if ( ++p == pe )
-		goto _test_eof6;
-case 6:
-#line 471 "hpricot_css.c"
-	if ( 4294967168 <= (*p) && (*p) <= 4294967231 )
-		goto st5;
-	goto tr10;
-tr9:
-#line 25 "hpricot_css.rl"
-	{
-    aps = p;
-  }
-	goto st7;
-st7:
-	if ( ++p == pe )
-		goto _test_eof7;
-case 7:
-#line 485 "hpricot_css.c"
-	if ( 4294967168 <= (*p) && (*p) <= 4294967231 )
-		goto st6;
-	goto tr10;
-tr157:
-#line 29 "hpricot_css.rl"
-	{
-    ape = p;
-    PUSH(aps, ape); 
-  }
+#line 422 "hpricot_css.c"
+	if ( (*p) == 46 )
+		goto tr1;
+	goto tr0;
+tr137:
+#line 1 "hpricot_css.rl"
+	{te = p+1;}
 	goto st89;
 st89:
 	if ( ++p == pe )
 		goto _test_eof89;
 case 89:
-#line 500 "hpricot_css.c"
+#line 434 "hpricot_css.c"
 	switch( (*p) ) {
-		case 43: goto st89;
-		case 45: goto st89;
-		case 110: goto st89;
+		case 32: goto st6;
+		case 44: goto st90;
 	}
-	if ( 48 <= (*p) && (*p) <= 57 )
-		goto st89;
-	goto tr155;
-tr158:
-#line 1 "hpricot_css.rl"
-	{te = p+1;}
-#line 76 "hpricot_css.rl"
-	{act = 5;}
-	goto st90;
-tr136:
-#line 1 "hpricot_css.rl"
-	{te = p+1;}
-#line 25 "hpricot_css.rl"
-	{
-    aps = p;
-  }
-#line 76 "hpricot_css.rl"
-	{act = 5;}
-	goto st90;
+	if ( 9 <= (*p) && (*p) <= 13 )
+		goto st6;
+	goto tr153;
+st6:
+	if ( ++p == pe )
+		goto _test_eof6;
+case 6:
+	switch( (*p) ) {
+		case 32: goto st6;
+		case 44: goto st90;
+	}
+	if ( 9 <= (*p) && (*p) <= 13 )
+		goto st6;
+	goto tr4;
 st90:
 	if ( ++p == pe )
 		goto _test_eof90;
 case 90:
-#line 529 "hpricot_css.c"
+	if ( (*p) == 32 )
+		goto st90;
+	if ( 9 <= (*p) && (*p) <= 13 )
+		goto st90;
+	goto tr154;
+st7:
+	if ( ++p == pe )
+		goto _test_eof7;
+case 7:
 	switch( (*p) ) {
-		case 43: goto tr157;
-		case 45: goto tr158;
-		case 92: goto st8;
-		case 95: goto tr14;
-		case 110: goto tr158;
-		case 4294967236: goto st9;
-	}
-	if ( (*p) < 97 ) {
-		if ( (*p) > 57 ) {
-			if ( 65 <= (*p) && (*p) <= 90 )
-				goto tr14;
-		} else if ( (*p) >= 48 )
-			goto tr158;
-	} else if ( (*p) > 122 ) {
-		if ( (*p) < 4294967264 ) {
-			if ( 4294967237 <= (*p) && (*p) <= 4294967263 )
-				goto st10;
-		} else if ( (*p) > 4294967279 ) {
-			if ( 4294967280 <= (*p) && (*p) <= 4294967284 )
-				goto st12;
+		case -60: goto tr7;
+		case 45: goto tr12;
+		case 92: goto tr13;
+		case 95: goto tr12;
+	}
+	if ( (*p) < -16 ) {
+		if ( (*p) > -33 ) {
+			if ( -32 <= (*p) && (*p) <= -17 )
+				goto tr10;
+		} else if ( (*p) >= -59 )
+			goto tr9;
+	} else if ( (*p) > -12 ) {
+		if ( (*p) < 65 ) {
+			if ( 48 <= (*p) && (*p) <= 57 )
+				goto tr12;
+		} else if ( (*p) > 90 ) {
+			if ( 97 <= (*p) && (*p) <= 122 )
+				goto tr12;
 		} else
-			goto st11;
+			goto tr12;
 	} else
+		goto tr11;
+	goto st0;
+tr7:
+#line 25 "hpricot_css.rl"
+	{
+    aps = p;
+  }
+	goto st8;
+st8:
+	if ( ++p == pe )
+		goto _test_eof8;
+case 8:
+#line 500 "hpricot_css.c"
+	if ( -88 <= (*p) && (*p) <= -65 )
 		goto tr14;
-	goto tr156;
-tr14:
-#line 1 "hpricot_css.rl"
-	{te = p+1;}
-#line 76 "hpricot_css.rl"
-	{act = 5;}
-	goto st91;
-tr140:
+	goto tr0;
+tr12:
 #line 1 "hpricot_css.rl"
 	{te = p+1;}
 #line 25 "hpricot_css.rl"
 	{
     aps = p;
   }
-#line 76 "hpricot_css.rl"
-	{act = 5;}
+#line 72 "hpricot_css.rl"
+	{act = 1;}
+	goto st91;
+tr14:
+#line 1 "hpricot_css.rl"
+	{te = p+1;}
+#line 72 "hpricot_css.rl"
+	{act = 1;}
 	goto st91;
 st91:
 	if ( ++p == pe )
 		goto _test_eof91;
 case 91:
-#line 576 "hpricot_css.c"
+#line 524 "hpricot_css.c"
 	switch( (*p) ) {
+		case -60: goto st8;
 		case 45: goto tr14;
-		case 92: goto st8;
+		case 92: goto st12;
 		case 95: goto tr14;
-		case 4294967236: goto st9;
 	}
-	if ( (*p) < 97 ) {
-		if ( (*p) > 57 ) {
-			if ( 65 <= (*p) && (*p) <= 90 )
-				goto tr14;
-		} else if ( (*p) >= 48 )
-			goto tr14;
-	} else if ( (*p) > 122 ) {
-		if ( (*p) < 4294967264 ) {
-			if ( 4294967237 <= (*p) && (*p) <= 4294967263 )
+	if ( (*p) < -16 ) {
+		if ( (*p) > -33 ) {
+			if ( -32 <= (*p) && (*p) <= -17 )
 				goto st10;
-		} else if ( (*p) > 4294967279 ) {
-			if ( 4294967280 <= (*p) && (*p) <= 4294967284 )
-				goto st12;
+		} else if ( (*p) >= -59 )
+			goto st9;
+	} else if ( (*p) > -12 ) {
+		if ( (*p) < 65 ) {
+			if ( 48 <= (*p) && (*p) <= 57 )
+				goto tr14;
+		} else if ( (*p) > 90 ) {
+			if ( 97 <= (*p) && (*p) <= 122 )
+				goto tr14;
 		} else
-			goto st11;
+			goto tr14;
 	} else
-		goto tr14;
-	goto tr156;
-tr142:
-#line 25 "hpricot_css.rl"
-	{
-    aps = p;
-  }
-	goto st8;
-st8:
-	if ( ++p == pe )
-		goto _test_eof8;
-case 8:
-#line 611 "hpricot_css.c"
-	if ( (*p) == 46 )
-		goto tr14;
-	goto tr10;
-tr145:
+		goto st11;
+	goto tr155;
+tr9:
 #line 25 "hpricot_css.rl"
 	{
     aps = p;
@@ -621,11 +555,11 @@
 	if ( ++p == pe )
 		goto _test_eof9;
 case 9:
-#line 625 "hpricot_css.c"
-	if ( 4294967208 <= (*p) && (*p) <= 4294967231 )
+#line 559 "hpricot_css.c"
+	if ( (*p) <= -65 )
 		goto tr14;
-	goto tr10;
-tr146:
+	goto tr0;
+tr10:
 #line 25 "hpricot_css.rl"
 	{
     aps = p;
@@ -635,11 +569,11 @@
 	if ( ++p == pe )
 		goto _test_eof10;
 case 10:
-#line 639 "hpricot_css.c"
-	if ( 4294967168 <= (*p) && (*p) <= 4294967231 )
-		goto tr14;
-	goto tr10;
-tr147:
+#line 573 "hpricot_css.c"
+	if ( (*p) <= -65 )
+		goto st9;
+	goto tr0;
+tr11:
 #line 25 "hpricot_css.rl"
 	{
     aps = p;
@@ -649,11 +583,11 @@
 	if ( ++p == pe )
 		goto _test_eof11;
 case 11:
-#line 653 "hpricot_css.c"
-	if ( 4294967168 <= (*p) && (*p) <= 4294967231 )
+#line 587 "hpricot_css.c"
+	if ( (*p) <= -65 )
 		goto st10;
-	goto tr10;
-tr148:
+	goto tr0;
+tr13:
 #line 25 "hpricot_css.rl"
 	{
     aps = p;
@@ -663,39 +597,120 @@
 	if ( ++p == pe )
 		goto _test_eof12;
 case 12:
-#line 667 "hpricot_css.c"
-	if ( 4294967168 <= (*p) && (*p) <= 4294967231 )
-		goto st11;
-	goto tr10;
-st13:
+#line 601 "hpricot_css.c"
+	if ( (*p) == 46 )
+		goto tr14;
+	goto tr0;
+tr160:
+#line 29 "hpricot_css.rl"
+	{
+    ape = p;
+    PUSH(aps, ape); 
+  }
+	goto st92;
+st92:
+	if ( ++p == pe )
+		goto _test_eof92;
+case 92:
+#line 616 "hpricot_css.c"
+	switch( (*p) ) {
+		case 43: goto st92;
+		case 45: goto st92;
+		case 110: goto st92;
+	}
+	if ( 48 <= (*p) && (*p) <= 57 )
+		goto st92;
+	goto tr159;
+tr161:
+#line 1 "hpricot_css.rl"
+	{te = p+1;}
+#line 76 "hpricot_css.rl"
+	{act = 5;}
+	goto st93;
+tr140:
+#line 1 "hpricot_css.rl"
+	{te = p+1;}
+#line 25 "hpricot_css.rl"
+	{
+    aps = p;
+  }
+#line 76 "hpricot_css.rl"
+	{act = 5;}
+	goto st93;
+st93:
+	if ( ++p == pe )
+		goto _test_eof93;
+case 93:
+#line 645 "hpricot_css.c"
+	switch( (*p) ) {
+		case -60: goto st1;
+		case 43: goto tr160;
+		case 45: goto tr161;
+		case 92: goto st5;
+		case 95: goto tr1;
+		case 110: goto tr161;
+	}
+	if ( (*p) < -16 ) {
+		if ( (*p) > -33 ) {
+			if ( -32 <= (*p) && (*p) <= -17 )
+				goto st3;
+		} else if ( (*p) >= -59 )
+			goto st2;
+	} else if ( (*p) > -12 ) {
+		if ( (*p) < 65 ) {
+			if ( 48 <= (*p) && (*p) <= 57 )
+				goto tr161;
+		} else if ( (*p) > 90 ) {
+			if ( 97 <= (*p) && (*p) <= 122 )
+				goto tr1;
+		} else
+			goto tr1;
+	} else
+		goto st4;
+	goto tr149;
+st13:
 	if ( ++p == pe )
 		goto _test_eof13;
 case 13:
 	switch( (*p) ) {
-		case 45: goto tr17;
-		case 92: goto tr18;
-		case 95: goto tr17;
-		case 4294967236: goto tr19;
-	}
-	if ( (*p) < 97 ) {
-		if ( (*p) > 57 ) {
-			if ( 65 <= (*p) && (*p) <= 90 )
-				goto tr17;
-		} else if ( (*p) >= 48 )
-			goto tr17;
-	} else if ( (*p) > 122 ) {
-		if ( (*p) < 4294967264 ) {
-			if ( 4294967237 <= (*p) && (*p) <= 4294967263 )
-				goto tr20;
-		} else if ( (*p) > 4294967279 ) {
-			if ( 4294967280 <= (*p) && (*p) <= 4294967284 )
-				goto tr22;
+		case -60: goto tr17;
+		case 45: goto tr21;
+		case 92: goto tr22;
+		case 95: goto tr21;
+	}
+	if ( (*p) < -16 ) {
+		if ( (*p) > -33 ) {
+			if ( -32 <= (*p) && (*p) <= -17 )
+				goto tr19;
+		} else if ( (*p) >= -59 )
+			goto tr18;
+	} else if ( (*p) > -12 ) {
+		if ( (*p) < 65 ) {
+			if ( 48 <= (*p) && (*p) <= 57 )
+				goto tr21;
+		} else if ( (*p) > 90 ) {
+			if ( 97 <= (*p) && (*p) <= 122 )
+				goto tr21;
 		} else
 			goto tr21;
 	} else
-		goto tr17;
+		goto tr20;
 	goto st0;
 tr17:
+#line 25 "hpricot_css.rl"
+	{
+    aps = p;
+  }
+	goto st14;
+st14:
+	if ( ++p == pe )
+		goto _test_eof14;
+case 14:
+#line 710 "hpricot_css.c"
+	if ( -88 <= (*p) && (*p) <= -65 )
+		goto tr23;
+	goto tr0;
+tr21:
 #line 1 "hpricot_css.rl"
 	{te = p+1;}
 #line 25 "hpricot_css.rl"
@@ -704,71 +719,57 @@
   }
 #line 73 "hpricot_css.rl"
 	{act = 2;}
-	goto st92;
+	goto st94;
 tr23:
 #line 1 "hpricot_css.rl"
 	{te = p+1;}
 #line 73 "hpricot_css.rl"
 	{act = 2;}
-	goto st92;
-st92:
+	goto st94;
+st94:
 	if ( ++p == pe )
-		goto _test_eof92;
-case 92:
-#line 719 "hpricot_css.c"
+		goto _test_eof94;
+case 94:
+#line 734 "hpricot_css.c"
 	switch( (*p) ) {
+		case -60: goto st14;
 		case 45: goto tr23;
-		case 92: goto st14;
+		case 92: goto st18;
 		case 95: goto tr23;
-		case 4294967236: goto st15;
 	}
-	if ( (*p) < 97 ) {
-		if ( (*p) > 57 ) {
-			if ( 65 <= (*p) && (*p) <= 90 )
-				goto tr23;
-		} else if ( (*p) >= 48 )
-			goto tr23;
-	} else if ( (*p) > 122 ) {
-		if ( (*p) < 4294967264 ) {
-			if ( 4294967237 <= (*p) && (*p) <= 4294967263 )
+	if ( (*p) < -16 ) {
+		if ( (*p) > -33 ) {
+			if ( -32 <= (*p) && (*p) <= -17 )
 				goto st16;
-		} else if ( (*p) > 4294967279 ) {
-			if ( 4294967280 <= (*p) && (*p) <= 4294967284 )
-				goto st18;
+		} else if ( (*p) >= -59 )
+			goto st15;
+	} else if ( (*p) > -12 ) {
+		if ( (*p) < 65 ) {
+			if ( 48 <= (*p) && (*p) <= 57 )
+				goto tr23;
+		} else if ( (*p) > 90 ) {
+			if ( 97 <= (*p) && (*p) <= 122 )
+				goto tr23;
 		} else
-			goto st17;
+			goto tr23;
 	} else
-		goto tr23;
+		goto st17;
 	goto tr162;
 tr18:
 #line 25 "hpricot_css.rl"
 	{
     aps = p;
   }
-	goto st14;
-st14:
-	if ( ++p == pe )
-		goto _test_eof14;
-case 14:
-#line 754 "hpricot_css.c"
-	if ( (*p) == 46 )
-		goto tr23;
-	goto tr10;
-tr19:
-#line 25 "hpricot_css.rl"
-	{
-    aps = p;
-  }
 	goto st15;
 st15:
 	if ( ++p == pe )
 		goto _test_eof15;
 case 15:
-#line 768 "hpricot_css.c"
-	if ( 4294967208 <= (*p) && (*p) <= 4294967231 )
+#line 769 "hpricot_css.c"
+	if ( (*p) <= -65 )
 		goto tr23;
-	goto tr10;
-tr20:
+	goto tr0;
+tr19:
 #line 25 "hpricot_css.rl"
 	{
     aps = p;
@@ -778,11 +779,11 @@
 	if ( ++p == pe )
 		goto _test_eof16;
 case 16:
-#line 782 "hpricot_css.c"
-	if ( 4294967168 <= (*p) && (*p) <= 4294967231 )
-		goto tr23;
-	goto tr10;
-tr21:
+#line 783 "hpricot_css.c"
+	if ( (*p) <= -65 )
+		goto st15;
+	goto tr0;
+tr20:
 #line 25 "hpricot_css.rl"
 	{
     aps = p;
@@ -792,10 +793,10 @@
 	if ( ++p == pe )
 		goto _test_eof17;
 case 17:
-#line 796 "hpricot_css.c"
-	if ( 4294967168 <= (*p) && (*p) <= 4294967231 )
+#line 797 "hpricot_css.c"
+	if ( (*p) <= -65 )
 		goto st16;
-	goto tr10;
+	goto tr0;
 tr22:
 #line 25 "hpricot_css.rl"
 	{
@@ -806,45 +807,66 @@
 	if ( ++p == pe )
 		goto _test_eof18;
 case 18:
-#line 810 "hpricot_css.c"
-	if ( 4294967168 <= (*p) && (*p) <= 4294967231 )
-		goto st17;
-	goto tr10;
+#line 811 "hpricot_css.c"
+	if ( (*p) == 46 )
+		goto tr23;
+	goto tr0;
 st19:
 	if ( ++p == pe )
 		goto _test_eof19;
 case 19:
 	switch( (*p) ) {
-		case 45: goto tr26;
-		case 92: goto tr27;
-		case 95: goto tr26;
-		case 101: goto tr28;
-		case 102: goto tr29;
-		case 103: goto tr30;
-		case 108: goto tr31;
-		case 110: goto tr32;
-		case 111: goto tr33;
-		case 4294967236: goto tr34;
-	}
-	if ( (*p) < 97 ) {
-		if ( (*p) > 57 ) {
-			if ( 65 <= (*p) && (*p) <= 90 )
-				goto tr26;
-		} else if ( (*p) >= 48 )
-			goto tr26;
-	} else if ( (*p) > 122 ) {
-		if ( (*p) < 4294967264 ) {
-			if ( 4294967237 <= (*p) && (*p) <= 4294967263 )
-				goto tr35;
-		} else if ( (*p) > 4294967279 ) {
-			if ( 4294967280 <= (*p) && (*p) <= 4294967284 )
-				goto tr37;
+		case -60: goto tr26;
+		case 45: goto tr30;
+		case 92: goto tr31;
+		case 95: goto tr30;
+		case 101: goto tr32;
+		case 102: goto tr33;
+		case 103: goto tr34;
+		case 108: goto tr35;
+		case 110: goto tr36;
+		case 111: goto tr37;
+	}
+	if ( (*p) < -16 ) {
+		if ( (*p) > -33 ) {
+			if ( -32 <= (*p) && (*p) <= -17 )
+				goto tr28;
+		} else if ( (*p) >= -59 )
+			goto tr27;
+	} else if ( (*p) > -12 ) {
+		if ( (*p) < 65 ) {
+			if ( 48 <= (*p) && (*p) <= 57 )
+				goto tr30;
+		} else if ( (*p) > 90 ) {
+			if ( 97 <= (*p) && (*p) <= 122 )
+				goto tr30;
 		} else
-			goto tr36;
+			goto tr30;
 	} else
-		goto tr26;
+		goto tr29;
 	goto st0;
 tr26:
+#line 25 "hpricot_css.rl"
+	{
+    aps = p;
+  }
+	goto st20;
+tr174:
+#line 29 "hpricot_css.rl"
+	{
+    ape = p;
+    PUSH(aps, ape); 
+  }
+	goto st20;
+st20:
+	if ( ++p == pe )
+		goto _test_eof20;
+case 20:
+#line 866 "hpricot_css.c"
+	if ( -88 <= (*p) && (*p) <= -65 )
+		goto tr38;
+	goto tr0;
+tr30:
 #line 1 "hpricot_css.rl"
 	{te = p+1;}
 #line 25 "hpricot_css.rl"
@@ -853,14 +875,14 @@
   }
 #line 80 "hpricot_css.rl"
 	{act = 9;}
-	goto st93;
-tr59:
+	goto st95;
+tr38:
 #line 1 "hpricot_css.rl"
 	{te = p+1;}
 #line 80 "hpricot_css.rl"
 	{act = 9;}
-	goto st93;
-tr175:
+	goto st95;
+tr179:
 #line 1 "hpricot_css.rl"
 	{te = p+1;}
 #line 29 "hpricot_css.rl"
@@ -870,242 +892,254 @@
   }
 #line 80 "hpricot_css.rl"
 	{act = 9;}
-	goto st93;
-st93:
+	goto st95;
+st95:
 	if ( ++p == pe )
-		goto _test_eof93;
-case 93:
-#line 879 "hpricot_css.c"
+		goto _test_eof95;
+case 95:
+#line 901 "hpricot_css.c"
 	switch( (*p) ) {
-		case 40: goto tr167;
-		case 45: goto tr59;
-		case 92: goto st37;
-		case 95: goto tr59;
-		case 4294967236: goto st38;
-	}
-	if ( (*p) < 97 ) {
-		if ( (*p) > 57 ) {
-			if ( 65 <= (*p) && (*p) <= 90 )
-				goto tr59;
-		} else if ( (*p) >= 48 )
-			goto tr59;
-	} else if ( (*p) > 122 ) {
-		if ( (*p) < 4294967264 ) {
-			if ( 4294967237 <= (*p) && (*p) <= 4294967263 )
-				goto st39;
-		} else if ( (*p) > 4294967279 ) {
-			if ( 4294967280 <= (*p) && (*p) <= 4294967284 )
-				goto st41;
+		case -60: goto st20;
+		case 40: goto tr169;
+		case 45: goto tr38;
+		case 92: goto st41;
+		case 95: goto tr38;
+	}
+	if ( (*p) < -16 ) {
+		if ( (*p) > -33 ) {
+			if ( -32 <= (*p) && (*p) <= -17 )
+				goto st22;
+		} else if ( (*p) >= -59 )
+			goto st21;
+	} else if ( (*p) > -12 ) {
+		if ( (*p) < 65 ) {
+			if ( 48 <= (*p) && (*p) <= 57 )
+				goto tr38;
+		} else if ( (*p) > 90 ) {
+			if ( 97 <= (*p) && (*p) <= 122 )
+				goto tr38;
 		} else
-			goto st40;
+			goto tr38;
 	} else
-		goto tr59;
+		goto st23;
 	goto tr166;
-tr167:
+tr27:
+#line 25 "hpricot_css.rl"
+	{
+    aps = p;
+  }
+	goto st21;
+tr175:
 #line 29 "hpricot_css.rl"
 	{
     ape = p;
     PUSH(aps, ape); 
   }
-	goto st20;
-st20:
-	if ( ++p == pe )
-		goto _test_eof20;
-case 20:
-#line 916 "hpricot_css.c"
-	switch( (*p) ) {
-		case 34: goto tr40;
-		case 39: goto tr41;
-		case 40: goto tr42;
-		case 41: goto tr43;
-	}
-	goto tr39;
-tr39:
-#line 25 "hpricot_css.rl"
-	{
-    aps = p;
-  }
 	goto st21;
 st21:
 	if ( ++p == pe )
 		goto _test_eof21;
 case 21:
-#line 934 "hpricot_css.c"
-	switch( (*p) ) {
-		case 34: goto tr10;
-		case 40: goto tr10;
-		case 41: goto tr45;
-	}
-	goto st21;
-tr40:
+#line 944 "hpricot_css.c"
+	if ( (*p) <= -65 )
+		goto tr38;
+	goto tr0;
+tr28:
 #line 25 "hpricot_css.rl"
 	{
     aps = p;
   }
 	goto st22;
+tr176:
+#line 29 "hpricot_css.rl"
+	{
+    ape = p;
+    PUSH(aps, ape); 
+  }
+	goto st22;
 st22:
 	if ( ++p == pe )
 		goto _test_eof22;
 case 22:
-#line 951 "hpricot_css.c"
-	switch( (*p) ) {
-		case 34: goto st24;
-		case 40: goto st25;
-		case 41: goto tr10;
-	}
+#line 965 "hpricot_css.c"
+	if ( (*p) <= -65 )
+		goto st21;
+	goto tr0;
+tr29:
+#line 25 "hpricot_css.rl"
+	{
+    aps = p;
+  }
+	goto st23;
+tr177:
+#line 29 "hpricot_css.rl"
+	{
+    ape = p;
+    PUSH(aps, ape); 
+  }
 	goto st23;
 st23:
 	if ( ++p == pe )
 		goto _test_eof23;
 case 23:
-	if ( (*p) == 34 )
-		goto st24;
-	if ( 40 <= (*p) && (*p) <= 41 )
-		goto tr10;
-	goto st23;
+#line 986 "hpricot_css.c"
+	if ( (*p) <= -65 )
+		goto st22;
+	goto tr0;
+tr169:
+#line 29 "hpricot_css.rl"
+	{
+    ape = p;
+    PUSH(aps, ape); 
+  }
+	goto st24;
 st24:
 	if ( ++p == pe )
 		goto _test_eof24;
 case 24:
-	if ( (*p) == 41 )
-		goto tr45;
-	goto tr10;
+#line 1001 "hpricot_css.c"
+	switch( (*p) ) {
+		case 34: goto tr43;
+		case 39: goto tr44;
+		case 40: goto tr45;
+		case 41: goto tr46;
+	}
+	goto tr42;
+tr42:
+#line 25 "hpricot_css.rl"
+	{
+    aps = p;
+  }
+	goto st25;
 st25:
 	if ( ++p == pe )
 		goto _test_eof25;
 case 25:
-	if ( (*p) == 41 )
-		goto tr10;
+#line 1019 "hpricot_css.c"
+	switch( (*p) ) {
+		case 34: goto tr0;
+		case 40: goto tr0;
+		case 41: goto tr48;
+	}
+	goto st25;
+tr43:
+#line 25 "hpricot_css.rl"
+	{
+    aps = p;
+  }
 	goto st26;
 st26:
 	if ( ++p == pe )
 		goto _test_eof26;
 case 26:
-	if ( (*p) == 41 )
-		goto st27;
-	goto st26;
+#line 1036 "hpricot_css.c"
+	switch( (*p) ) {
+		case 34: goto st28;
+		case 40: goto st29;
+		case 41: goto tr0;
+	}
+	goto st27;
 st27:
 	if ( ++p == pe )
 		goto _test_eof27;
 case 27:
-	switch( (*p) ) {
-		case 34: goto st24;
-		case 40: goto st25;
-	}
-	goto tr10;
-tr41:
-#line 25 "hpricot_css.rl"
-	{
-    aps = p;
-  }
-	goto st28;
+	if ( (*p) == 34 )
+		goto st28;
+	if ( 40 <= (*p) && (*p) <= 41 )
+		goto tr0;
+	goto st27;
 st28:
 	if ( ++p == pe )
 		goto _test_eof28;
 case 28:
-#line 1007 "hpricot_css.c"
-	switch( (*p) ) {
-		case 34: goto st30;
-		case 39: goto st21;
-		case 40: goto st31;
-		case 41: goto tr45;
-	}
-	goto st29;
+	if ( (*p) == 41 )
+		goto tr48;
+	goto tr0;
 st29:
 	if ( ++p == pe )
 		goto _test_eof29;
 case 29:
-	switch( (*p) ) {
-		case 34: goto st30;
-		case 39: goto st21;
-		case 40: goto tr10;
-		case 41: goto tr45;
-	}
-	goto st29;
+	if ( (*p) == 41 )
+		goto tr0;
+	goto st30;
 st30:
 	if ( ++p == pe )
 		goto _test_eof30;
 case 30:
-	if ( (*p) == 39 )
-		goto st24;
-	if ( 40 <= (*p) && (*p) <= 41 )
-		goto tr10;
+	if ( (*p) == 41 )
+		goto st31;
 	goto st30;
 st31:
 	if ( ++p == pe )
 		goto _test_eof31;
 case 31:
-	if ( (*p) == 41 )
-		goto tr10;
+	switch( (*p) ) {
+		case 34: goto st28;
+		case 40: goto st29;
+	}
+	goto tr0;
+tr44:
+#line 25 "hpricot_css.rl"
+	{
+    aps = p;
+  }
 	goto st32;
 st32:
 	if ( ++p == pe )
 		goto _test_eof32;
 case 32:
-	if ( (*p) == 41 )
-		goto st33;
-	goto st32;
+#line 1092 "hpricot_css.c"
+	switch( (*p) ) {
+		case 34: goto st34;
+		case 39: goto st25;
+		case 40: goto st35;
+		case 41: goto tr48;
+	}
+	goto st33;
 st33:
 	if ( ++p == pe )
 		goto _test_eof33;
 case 33:
 	switch( (*p) ) {
-		case 39: goto st24;
-		case 40: goto st31;
+		case 34: goto st34;
+		case 39: goto st25;
+		case 40: goto tr0;
+		case 41: goto tr48;
 	}
-	goto tr10;
-tr42:
-#line 25 "hpricot_css.rl"
-	{
-    aps = p;
-  }
-	goto st34;
+	goto st33;
 st34:
 	if ( ++p == pe )
 		goto _test_eof34;
 case 34:
-#line 1068 "hpricot_css.c"
-	if ( (*p) == 41 )
-		goto tr10;
-	goto st35;
+	if ( (*p) == 39 )
+		goto st28;
+	if ( 40 <= (*p) && (*p) <= 41 )
+		goto tr0;
+	goto st34;
 st35:
 	if ( ++p == pe )
 		goto _test_eof35;
 case 35:
 	if ( (*p) == 41 )
-		goto st36;
-	goto st35;
+		goto tr0;
+	goto st36;
 st36:
 	if ( ++p == pe )
 		goto _test_eof36;
 case 36:
-	switch( (*p) ) {
-		case 40: goto st34;
-		case 41: goto tr45;
-	}
-	goto tr10;
-tr27:
-#line 25 "hpricot_css.rl"
-	{
-    aps = p;
-  }
-	goto st37;
-tr176:
-#line 29 "hpricot_css.rl"
-	{
-    ape = p;
-    PUSH(aps, ape); 
-  }
-	goto st37;
+	if ( (*p) == 41 )
+		goto st37;
+	goto st36;
 st37:
 	if ( ++p == pe )
 		goto _test_eof37;
 case 37:
-#line 1105 "hpricot_css.c"
-	if ( (*p) == 46 )
-		goto tr59;
-	goto tr10;
-tr34:
+	switch( (*p) ) {
+		case 39: goto st28;
+		case 40: goto st35;
+	}
+	goto tr0;
+tr45:
 #line 25 "hpricot_css.rl"
 	{
     aps = p;
@@ -1115,53 +1149,48 @@
 	if ( ++p == pe )
 		goto _test_eof38;
 case 38:
-#line 1119 "hpricot_css.c"
-	if ( 4294967208 <= (*p) && (*p) <= 4294967231 )
-		goto tr59;
-	goto tr10;
-tr35:
-#line 25 "hpricot_css.rl"
-	{
-    aps = p;
-  }
+#line 1153 "hpricot_css.c"
+	if ( (*p) == 41 )
+		goto tr0;
+	goto st39;
+st39:
+	if ( ++p == pe )
+		goto _test_eof39;
+case 39:
+	if ( (*p) == 41 )
+		goto st40;
 	goto st39;
-st39:
-	if ( ++p == pe )
-		goto _test_eof39;
-case 39:
-#line 1133 "hpricot_css.c"
-	if ( 4294967168 <= (*p) && (*p) <= 4294967231 )
-		goto tr59;
-	goto tr10;
-tr36:
-#line 25 "hpricot_css.rl"
-	{
-    aps = p;
-  }
-	goto st40;
 st40:
 	if ( ++p == pe )
 		goto _test_eof40;
 case 40:
-#line 1147 "hpricot_css.c"
-	if ( 4294967168 <= (*p) && (*p) <= 4294967231 )
-		goto st39;
-	goto tr10;
-tr37:
+	switch( (*p) ) {
+		case 40: goto st38;
+		case 41: goto tr48;
+	}
+	goto tr0;
+tr31:
 #line 25 "hpricot_css.rl"
 	{
     aps = p;
   }
 	goto st41;
+tr180:
+#line 29 "hpricot_css.rl"
+	{
+    ape = p;
+    PUSH(aps, ape); 
+  }
+	goto st41;
 st41:
 	if ( ++p == pe )
 		goto _test_eof41;
 case 41:
-#line 1161 "hpricot_css.c"
-	if ( 4294967168 <= (*p) && (*p) <= 4294967231 )
-		goto st40;
-	goto tr10;
-tr28:
+#line 1190 "hpricot_css.c"
+	if ( (*p) == 46 )
+		goto tr38;
+	goto tr0;
+tr32:
 #line 1 "hpricot_css.rl"
 	{te = p+1;}
 #line 25 "hpricot_css.rl"
@@ -1170,76 +1199,76 @@
   }
 #line 80 "hpricot_css.rl"
 	{act = 9;}
-	goto st94;
-st94:
+	goto st96;
+st96:
 	if ( ++p == pe )
-		goto _test_eof94;
-case 94:
-#line 1179 "hpricot_css.c"
+		goto _test_eof96;
+case 96:
+#line 1208 "hpricot_css.c"
 	switch( (*p) ) {
-		case 40: goto tr167;
-		case 45: goto tr59;
-		case 92: goto st37;
-		case 95: goto tr59;
+		case -60: goto st20;
+		case 40: goto tr169;
+		case 45: goto tr38;
+		case 92: goto st41;
+		case 95: goto tr38;
 		case 113: goto tr171;
 		case 118: goto tr172;
-		case 4294967236: goto st38;
 	}
-	if ( (*p) < 97 ) {
-		if ( (*p) > 57 ) {
-			if ( 65 <= (*p) && (*p) <= 90 )
-				goto tr59;
-		} else if ( (*p) >= 48 )
-			goto tr59;
-	} else if ( (*p) > 122 ) {
-		if ( (*p) < 4294967264 ) {
-			if ( 4294967237 <= (*p) && (*p) <= 4294967263 )
-				goto st39;
-		} else if ( (*p) > 4294967279 ) {
-			if ( 4294967280 <= (*p) && (*p) <= 4294967284 )
-				goto st41;
+	if ( (*p) < -16 ) {
+		if ( (*p) > -33 ) {
+			if ( -32 <= (*p) && (*p) <= -17 )
+				goto st22;
+		} else if ( (*p) >= -59 )
+			goto st21;
+	} else if ( (*p) > -12 ) {
+		if ( (*p) < 65 ) {
+			if ( 48 <= (*p) && (*p) <= 57 )
+				goto tr38;
+		} else if ( (*p) > 90 ) {
+			if ( 97 <= (*p) && (*p) <= 122 )
+				goto tr38;
 		} else
-			goto st40;
+			goto tr38;
 	} else
-		goto tr59;
+		goto st23;
 	goto tr166;
 tr171:
 #line 1 "hpricot_css.rl"
 	{te = p+1;}
 #line 79 "hpricot_css.rl"
 	{act = 8;}
-	goto st95;
-st95:
+	goto st97;
+st97:
 	if ( ++p == pe )
-		goto _test_eof95;
-case 95:
-#line 1217 "hpricot_css.c"
+		goto _test_eof97;
+case 97:
+#line 1246 "hpricot_css.c"
 	switch( (*p) ) {
-		case 40: goto tr174;
-		case 45: goto tr175;
-		case 92: goto tr176;
-		case 95: goto tr175;
-		case 4294967236: goto st38;
-	}
-	if ( (*p) < 97 ) {
-		if ( (*p) > 57 ) {
-			if ( 65 <= (*p) && (*p) <= 90 )
-				goto tr175;
-		} else if ( (*p) >= 48 )
+		case -60: goto tr174;
+		case 40: goto tr178;
+		case 45: goto tr179;
+		case 92: goto tr180;
+		case 95: goto tr179;
+	}
+	if ( (*p) < -16 ) {
+		if ( (*p) > -33 ) {
+			if ( -32 <= (*p) && (*p) <= -17 )
+				goto tr176;
+		} else if ( (*p) >= -59 )
 			goto tr175;
-	} else if ( (*p) > 122 ) {
-		if ( (*p) < 4294967264 ) {
-			if ( 4294967237 <= (*p) && (*p) <= 4294967263 )
-				goto st39;
-		} else if ( (*p) > 4294967279 ) {
-			if ( 4294967280 <= (*p) && (*p) <= 4294967284 )
-				goto st41;
+	} else if ( (*p) > -12 ) {
+		if ( (*p) < 65 ) {
+			if ( 48 <= (*p) && (*p) <= 57 )
+				goto tr179;
+		} else if ( (*p) > 90 ) {
+			if ( 97 <= (*p) && (*p) <= 122 )
+				goto tr179;
 		} else
-			goto st40;
+			goto tr179;
 	} else
-		goto tr175;
+		goto tr177;
 	goto tr173;
-tr174:
+tr178:
 #line 29 "hpricot_css.rl"
 	{
     ape = p;
@@ -1250,16 +1279,16 @@
 	if ( ++p == pe )
 		goto _test_eof42;
 case 42:
-#line 1254 "hpricot_css.c"
+#line 1283 "hpricot_css.c"
 	switch( (*p) ) {
-		case 34: goto tr40;
-		case 39: goto tr41;
-		case 40: goto tr42;
-		case 41: goto tr43;
+		case 34: goto tr43;
+		case 39: goto tr44;
+		case 40: goto tr45;
+		case 41: goto tr46;
 	}
 	if ( 48 <= (*p) && (*p) <= 57 )
 		goto tr63;
-	goto tr39;
+	goto tr42;
 tr63:
 #line 25 "hpricot_css.rl"
 	{
@@ -1270,7 +1299,7 @@
 	if ( ++p == pe )
 		goto _test_eof43;
 case 43:
-#line 1274 "hpricot_css.c"
+#line 1303 "hpricot_css.c"
 	switch( (*p) ) {
 		case 34: goto tr62;
 		case 40: goto tr62;
@@ -1278,123 +1307,45 @@
 	}
 	if ( 48 <= (*p) && (*p) <= 57 )
 		goto st43;
-	goto st21;
+	goto st25;
 tr172:
 #line 1 "hpricot_css.rl"
 	{te = p+1;}
 #line 80 "hpricot_css.rl"
 	{act = 9;}
-	goto st96;
-st96:
-	if ( ++p == pe )
-		goto _test_eof96;
-case 96:
-#line 1293 "hpricot_css.c"
-	switch( (*p) ) {
-		case 40: goto tr167;
-		case 45: goto tr59;
-		case 92: goto st37;
-		case 95: goto tr59;
-		case 101: goto tr177;
-		case 4294967236: goto st38;
-	}
-	if ( (*p) < 97 ) {
-		if ( (*p) > 57 ) {
-			if ( 65 <= (*p) && (*p) <= 90 )
-				goto tr59;
-		} else if ( (*p) >= 48 )
-			goto tr59;
-	} else if ( (*p) > 122 ) {
-		if ( (*p) < 4294967264 ) {
-			if ( 4294967237 <= (*p) && (*p) <= 4294967263 )
-				goto st39;
-		} else if ( (*p) > 4294967279 ) {
-			if ( 4294967280 <= (*p) && (*p) <= 4294967284 )
-				goto st41;
-		} else
-			goto st40;
-	} else
-		goto tr59;
-	goto tr166;
-tr177:
-#line 1 "hpricot_css.rl"
-	{te = p+1;}
-#line 80 "hpricot_css.rl"
-	{act = 9;}
-	goto st97;
-st97:
-	if ( ++p == pe )
-		goto _test_eof97;
-case 97:
-#line 1330 "hpricot_css.c"
-	switch( (*p) ) {
-		case 40: goto tr167;
-		case 45: goto tr59;
-		case 92: goto st37;
-		case 95: goto tr59;
-		case 110: goto tr171;
-		case 4294967236: goto st38;
-	}
-	if ( (*p) < 97 ) {
-		if ( (*p) > 57 ) {
-			if ( 65 <= (*p) && (*p) <= 90 )
-				goto tr59;
-		} else if ( (*p) >= 48 )
-			goto tr59;
-	} else if ( (*p) > 122 ) {
-		if ( (*p) < 4294967264 ) {
-			if ( 4294967237 <= (*p) && (*p) <= 4294967263 )
-				goto st39;
-		} else if ( (*p) > 4294967279 ) {
-			if ( 4294967280 <= (*p) && (*p) <= 4294967284 )
-				goto st41;
-		} else
-			goto st40;
-	} else
-		goto tr59;
-	goto tr166;
-tr29:
-#line 1 "hpricot_css.rl"
-	{te = p+1;}
-#line 25 "hpricot_css.rl"
-	{
-    aps = p;
-  }
-#line 80 "hpricot_css.rl"
-	{act = 9;}
 	goto st98;
 st98:
 	if ( ++p == pe )
 		goto _test_eof98;
 case 98:
-#line 1371 "hpricot_css.c"
+#line 1322 "hpricot_css.c"
 	switch( (*p) ) {
-		case 40: goto tr167;
-		case 45: goto tr59;
-		case 92: goto st37;
-		case 95: goto tr59;
-		case 105: goto tr178;
-		case 4294967236: goto st38;
-	}
-	if ( (*p) < 97 ) {
-		if ( (*p) > 57 ) {
-			if ( 65 <= (*p) && (*p) <= 90 )
-				goto tr59;
-		} else if ( (*p) >= 48 )
-			goto tr59;
-	} else if ( (*p) > 122 ) {
-		if ( (*p) < 4294967264 ) {
-			if ( 4294967237 <= (*p) && (*p) <= 4294967263 )
-				goto st39;
-		} else if ( (*p) > 4294967279 ) {
-			if ( 4294967280 <= (*p) && (*p) <= 4294967284 )
-				goto st41;
+		case -60: goto st20;
+		case 40: goto tr169;
+		case 45: goto tr38;
+		case 92: goto st41;
+		case 95: goto tr38;
+		case 101: goto tr181;
+	}
+	if ( (*p) < -16 ) {
+		if ( (*p) > -33 ) {
+			if ( -32 <= (*p) && (*p) <= -17 )
+				goto st22;
+		} else if ( (*p) >= -59 )
+			goto st21;
+	} else if ( (*p) > -12 ) {
+		if ( (*p) < 65 ) {
+			if ( 48 <= (*p) && (*p) <= 57 )
+				goto tr38;
+		} else if ( (*p) > 90 ) {
+			if ( 97 <= (*p) && (*p) <= 122 )
+				goto tr38;
 		} else
-			goto st40;
+			goto tr38;
 	} else
-		goto tr59;
+		goto st23;
 	goto tr166;
-tr178:
+tr181:
 #line 1 "hpricot_css.rl"
 	{te = p+1;}
 #line 80 "hpricot_css.rl"
@@ -1404,36 +1355,40 @@
 	if ( ++p == pe )
 		goto _test_eof99;
 case 99:
-#line 1408 "hpricot_css.c"
+#line 1359 "hpricot_css.c"
 	switch( (*p) ) {
-		case 40: goto tr167;
-		case 45: goto tr59;
-		case 92: goto st37;
-		case 95: goto tr59;
-		case 114: goto tr179;
-		case 4294967236: goto st38;
-	}
-	if ( (*p) < 97 ) {
-		if ( (*p) > 57 ) {
-			if ( 65 <= (*p) && (*p) <= 90 )
-				goto tr59;
-		} else if ( (*p) >= 48 )
-			goto tr59;
-	} else if ( (*p) > 122 ) {
-		if ( (*p) < 4294967264 ) {
-			if ( 4294967237 <= (*p) && (*p) <= 4294967263 )
-				goto st39;
-		} else if ( (*p) > 4294967279 ) {
-			if ( 4294967280 <= (*p) && (*p) <= 4294967284 )
-				goto st41;
+		case -60: goto st20;
+		case 40: goto tr169;
+		case 45: goto tr38;
+		case 92: goto st41;
+		case 95: goto tr38;
+		case 110: goto tr171;
+	}
+	if ( (*p) < -16 ) {
+		if ( (*p) > -33 ) {
+			if ( -32 <= (*p) && (*p) <= -17 )
+				goto st22;
+		} else if ( (*p) >= -59 )
+			goto st21;
+	} else if ( (*p) > -12 ) {
+		if ( (*p) < 65 ) {
+			if ( 48 <= (*p) && (*p) <= 57 )
+				goto tr38;
+		} else if ( (*p) > 90 ) {
+			if ( 97 <= (*p) && (*p) <= 122 )
+				goto tr38;
 		} else
-			goto st40;
+			goto tr38;
 	} else
-		goto tr59;
+		goto st23;
 	goto tr166;
-tr179:
+tr33:
 #line 1 "hpricot_css.rl"
 	{te = p+1;}
+#line 25 "hpricot_css.rl"
+	{
+    aps = p;
+  }
 #line 80 "hpricot_css.rl"
 	{act = 9;}
 	goto st100;
@@ -1441,34 +1396,34 @@
 	if ( ++p == pe )
 		goto _test_eof100;
 case 100:
-#line 1445 "hpricot_css.c"
+#line 1400 "hpricot_css.c"
 	switch( (*p) ) {
-		case 40: goto tr167;
-		case 45: goto tr59;
-		case 92: goto st37;
-		case 95: goto tr59;
-		case 115: goto tr180;
-		case 4294967236: goto st38;
-	}
-	if ( (*p) < 97 ) {
-		if ( (*p) > 57 ) {
-			if ( 65 <= (*p) && (*p) <= 90 )
-				goto tr59;
-		} else if ( (*p) >= 48 )
-			goto tr59;
-	} else if ( (*p) > 122 ) {
-		if ( (*p) < 4294967264 ) {
-			if ( 4294967237 <= (*p) && (*p) <= 4294967263 )
-				goto st39;
-		} else if ( (*p) > 4294967279 ) {
-			if ( 4294967280 <= (*p) && (*p) <= 4294967284 )
-				goto st41;
+		case -60: goto st20;
+		case 40: goto tr169;
+		case 45: goto tr38;
+		case 92: goto st41;
+		case 95: goto tr38;
+		case 105: goto tr182;
+	}
+	if ( (*p) < -16 ) {
+		if ( (*p) > -33 ) {
+			if ( -32 <= (*p) && (*p) <= -17 )
+				goto st22;
+		} else if ( (*p) >= -59 )
+			goto st21;
+	} else if ( (*p) > -12 ) {
+		if ( (*p) < 65 ) {
+			if ( 48 <= (*p) && (*p) <= 57 )
+				goto tr38;
+		} else if ( (*p) > 90 ) {
+			if ( 97 <= (*p) && (*p) <= 122 )
+				goto tr38;
 		} else
-			goto st40;
+			goto tr38;
 	} else
-		goto tr59;
+		goto st23;
 	goto tr166;
-tr180:
+tr182:
 #line 1 "hpricot_css.rl"
 	{te = p+1;}
 #line 80 "hpricot_css.rl"
@@ -1478,83 +1433,73 @@
 	if ( ++p == pe )
 		goto _test_eof101;
 case 101:
-#line 1482 "hpricot_css.c"
+#line 1437 "hpricot_css.c"
 	switch( (*p) ) {
-		case 40: goto tr167;
-		case 45: goto tr59;
-		case 92: goto st37;
-		case 95: goto tr59;
-		case 116: goto tr181;
-		case 4294967236: goto st38;
-	}
-	if ( (*p) < 97 ) {
-		if ( (*p) > 57 ) {
-			if ( 65 <= (*p) && (*p) <= 90 )
-				goto tr59;
-		} else if ( (*p) >= 48 )
-			goto tr59;
-	} else if ( (*p) > 122 ) {
-		if ( (*p) < 4294967264 ) {
-			if ( 4294967237 <= (*p) && (*p) <= 4294967263 )
-				goto st39;
-		} else if ( (*p) > 4294967279 ) {
-			if ( 4294967280 <= (*p) && (*p) <= 4294967284 )
-				goto st41;
+		case -60: goto st20;
+		case 40: goto tr169;
+		case 45: goto tr38;
+		case 92: goto st41;
+		case 95: goto tr38;
+		case 114: goto tr183;
+	}
+	if ( (*p) < -16 ) {
+		if ( (*p) > -33 ) {
+			if ( -32 <= (*p) && (*p) <= -17 )
+				goto st22;
+		} else if ( (*p) >= -59 )
+			goto st21;
+	} else if ( (*p) > -12 ) {
+		if ( (*p) < 65 ) {
+			if ( 48 <= (*p) && (*p) <= 57 )
+				goto tr38;
+		} else if ( (*p) > 90 ) {
+			if ( 97 <= (*p) && (*p) <= 122 )
+				goto tr38;
 		} else
-			goto st40;
+			goto tr38;
 	} else
-		goto tr59;
+		goto st23;
 	goto tr166;
-tr181:
+tr183:
 #line 1 "hpricot_css.rl"
 	{te = p+1;}
-#line 79 "hpricot_css.rl"
-	{act = 8;}
+#line 80 "hpricot_css.rl"
+	{act = 9;}
 	goto st102;
 st102:
 	if ( ++p == pe )
 		goto _test_eof102;
 case 102:
-#line 1519 "hpricot_css.c"
+#line 1474 "hpricot_css.c"
 	switch( (*p) ) {
-		case 40: goto tr174;
-		case 45: goto tr182;
-		case 92: goto tr176;
-		case 95: goto tr175;
-		case 4294967236: goto st38;
-	}
-	if ( (*p) < 97 ) {
-		if ( (*p) > 57 ) {
-			if ( 65 <= (*p) && (*p) <= 90 )
-				goto tr175;
-		} else if ( (*p) >= 48 )
-			goto tr175;
-	} else if ( (*p) > 122 ) {
-		if ( (*p) < 4294967264 ) {
-			if ( 4294967237 <= (*p) && (*p) <= 4294967263 )
-				goto st39;
-		} else if ( (*p) > 4294967279 ) {
-			if ( 4294967280 <= (*p) && (*p) <= 4294967284 )
-				goto st41;
+		case -60: goto st20;
+		case 40: goto tr169;
+		case 45: goto tr38;
+		case 92: goto st41;
+		case 95: goto tr38;
+		case 115: goto tr184;
+	}
+	if ( (*p) < -16 ) {
+		if ( (*p) > -33 ) {
+			if ( -32 <= (*p) && (*p) <= -17 )
+				goto st22;
+		} else if ( (*p) >= -59 )
+			goto st21;
+	} else if ( (*p) > -12 ) {
+		if ( (*p) < 65 ) {
+			if ( 48 <= (*p) && (*p) <= 57 )
+				goto tr38;
+		} else if ( (*p) > 90 ) {
+			if ( 97 <= (*p) && (*p) <= 122 )
+				goto tr38;
 		} else
-			goto st40;
+			goto tr38;
 	} else
-		goto tr175;
-	goto tr173;
-tr195:
-#line 1 "hpricot_css.rl"
-	{te = p+1;}
-#line 80 "hpricot_css.rl"
-	{act = 9;}
-	goto st103;
-tr182:
+		goto st23;
+	goto tr166;
+tr184:
 #line 1 "hpricot_css.rl"
 	{te = p+1;}
-#line 29 "hpricot_css.rl"
-	{
-    ape = p;
-    PUSH(aps, ape); 
-  }
 #line 80 "hpricot_css.rl"
 	{act = 9;}
 	goto st103;
@@ -1562,73 +1507,83 @@
 	if ( ++p == pe )
 		goto _test_eof103;
 case 103:
-#line 1566 "hpricot_css.c"
+#line 1511 "hpricot_css.c"
 	switch( (*p) ) {
-		case 40: goto tr167;
-		case 45: goto tr59;
-		case 92: goto st37;
-		case 95: goto tr59;
-		case 99: goto tr183;
-		case 4294967236: goto st38;
-	}
-	if ( (*p) < 97 ) {
-		if ( (*p) > 57 ) {
-			if ( 65 <= (*p) && (*p) <= 90 )
-				goto tr59;
-		} else if ( (*p) >= 48 )
-			goto tr59;
-	} else if ( (*p) > 122 ) {
-		if ( (*p) < 4294967264 ) {
-			if ( 4294967237 <= (*p) && (*p) <= 4294967263 )
-				goto st39;
-		} else if ( (*p) > 4294967279 ) {
-			if ( 4294967280 <= (*p) && (*p) <= 4294967284 )
-				goto st41;
+		case -60: goto st20;
+		case 40: goto tr169;
+		case 45: goto tr38;
+		case 92: goto st41;
+		case 95: goto tr38;
+		case 116: goto tr185;
+	}
+	if ( (*p) < -16 ) {
+		if ( (*p) > -33 ) {
+			if ( -32 <= (*p) && (*p) <= -17 )
+				goto st22;
+		} else if ( (*p) >= -59 )
+			goto st21;
+	} else if ( (*p) > -12 ) {
+		if ( (*p) < 65 ) {
+			if ( 48 <= (*p) && (*p) <= 57 )
+				goto tr38;
+		} else if ( (*p) > 90 ) {
+			if ( 97 <= (*p) && (*p) <= 122 )
+				goto tr38;
 		} else
-			goto st40;
+			goto tr38;
 	} else
-		goto tr59;
+		goto st23;
 	goto tr166;
-tr183:
+tr185:
 #line 1 "hpricot_css.rl"
 	{te = p+1;}
-#line 80 "hpricot_css.rl"
-	{act = 9;}
+#line 79 "hpricot_css.rl"
+	{act = 8;}
 	goto st104;
 st104:
 	if ( ++p == pe )
 		goto _test_eof104;
 case 104:
-#line 1603 "hpricot_css.c"
+#line 1548 "hpricot_css.c"
 	switch( (*p) ) {
-		case 40: goto tr167;
-		case 45: goto tr59;
-		case 92: goto st37;
-		case 95: goto tr59;
-		case 104: goto tr184;
-		case 4294967236: goto st38;
-	}
-	if ( (*p) < 97 ) {
-		if ( (*p) > 57 ) {
-			if ( 65 <= (*p) && (*p) <= 90 )
-				goto tr59;
-		} else if ( (*p) >= 48 )
-			goto tr59;
-	} else if ( (*p) > 122 ) {
-		if ( (*p) < 4294967264 ) {
-			if ( 4294967237 <= (*p) && (*p) <= 4294967263 )
-				goto st39;
-		} else if ( (*p) > 4294967279 ) {
-			if ( 4294967280 <= (*p) && (*p) <= 4294967284 )
-				goto st41;
+		case -60: goto tr174;
+		case 40: goto tr178;
+		case 45: goto tr186;
+		case 92: goto tr180;
+		case 95: goto tr179;
+	}
+	if ( (*p) < -16 ) {
+		if ( (*p) > -33 ) {
+			if ( -32 <= (*p) && (*p) <= -17 )
+				goto tr176;
+		} else if ( (*p) >= -59 )
+			goto tr175;
+	} else if ( (*p) > -12 ) {
+		if ( (*p) < 65 ) {
+			if ( 48 <= (*p) && (*p) <= 57 )
+				goto tr179;
+		} else if ( (*p) > 90 ) {
+			if ( 97 <= (*p) && (*p) <= 122 )
+				goto tr179;
 		} else
-			goto st40;
+			goto tr179;
 	} else
-		goto tr59;
-	goto tr166;
-tr184:
+		goto tr177;
+	goto tr173;
+tr199:
+#line 1 "hpricot_css.rl"
+	{te = p+1;}
+#line 80 "hpricot_css.rl"
+	{act = 9;}
+	goto st105;
+tr186:
 #line 1 "hpricot_css.rl"
 	{te = p+1;}
+#line 29 "hpricot_css.rl"
+	{
+    ape = p;
+    PUSH(aps, ape); 
+  }
 #line 80 "hpricot_css.rl"
 	{act = 9;}
 	goto st105;
@@ -1636,34 +1591,34 @@
 	if ( ++p == pe )
 		goto _test_eof105;
 case 105:
-#line 1640 "hpricot_css.c"
+#line 1595 "hpricot_css.c"
 	switch( (*p) ) {
-		case 40: goto tr167;
-		case 45: goto tr59;
-		case 92: goto st37;
-		case 95: goto tr59;
-		case 105: goto tr185;
-		case 4294967236: goto st38;
-	}
-	if ( (*p) < 97 ) {
-		if ( (*p) > 57 ) {
-			if ( 65 <= (*p) && (*p) <= 90 )
-				goto tr59;
-		} else if ( (*p) >= 48 )
-			goto tr59;
-	} else if ( (*p) > 122 ) {
-		if ( (*p) < 4294967264 ) {
-			if ( 4294967237 <= (*p) && (*p) <= 4294967263 )
-				goto st39;
-		} else if ( (*p) > 4294967279 ) {
-			if ( 4294967280 <= (*p) && (*p) <= 4294967284 )
-				goto st41;
+		case -60: goto st20;
+		case 40: goto tr169;
+		case 45: goto tr38;
+		case 92: goto st41;
+		case 95: goto tr38;
+		case 99: goto tr187;
+	}
+	if ( (*p) < -16 ) {
+		if ( (*p) > -33 ) {
+			if ( -32 <= (*p) && (*p) <= -17 )
+				goto st22;
+		} else if ( (*p) >= -59 )
+			goto st21;
+	} else if ( (*p) > -12 ) {
+		if ( (*p) < 65 ) {
+			if ( 48 <= (*p) && (*p) <= 57 )
+				goto tr38;
+		} else if ( (*p) > 90 ) {
+			if ( 97 <= (*p) && (*p) <= 122 )
+				goto tr38;
 		} else
-			goto st40;
+			goto tr38;
 	} else
-		goto tr59;
+		goto st23;
 	goto tr166;
-tr185:
+tr187:
 #line 1 "hpricot_css.rl"
 	{te = p+1;}
 #line 80 "hpricot_css.rl"
@@ -1673,34 +1628,34 @@
 	if ( ++p == pe )
 		goto _test_eof106;
 case 106:
-#line 1677 "hpricot_css.c"
+#line 1632 "hpricot_css.c"
 	switch( (*p) ) {
-		case 40: goto tr167;
-		case 45: goto tr59;
-		case 92: goto st37;
-		case 95: goto tr59;
-		case 108: goto tr186;
-		case 4294967236: goto st38;
-	}
-	if ( (*p) < 97 ) {
-		if ( (*p) > 57 ) {
-			if ( 65 <= (*p) && (*p) <= 90 )
-				goto tr59;
-		} else if ( (*p) >= 48 )
-			goto tr59;
-	} else if ( (*p) > 122 ) {
-		if ( (*p) < 4294967264 ) {
-			if ( 4294967237 <= (*p) && (*p) <= 4294967263 )
-				goto st39;
-		} else if ( (*p) > 4294967279 ) {
-			if ( 4294967280 <= (*p) && (*p) <= 4294967284 )
-				goto st41;
+		case -60: goto st20;
+		case 40: goto tr169;
+		case 45: goto tr38;
+		case 92: goto st41;
+		case 95: goto tr38;
+		case 104: goto tr188;
+	}
+	if ( (*p) < -16 ) {
+		if ( (*p) > -33 ) {
+			if ( -32 <= (*p) && (*p) <= -17 )
+				goto st22;
+		} else if ( (*p) >= -59 )
+			goto st21;
+	} else if ( (*p) > -12 ) {
+		if ( (*p) < 65 ) {
+			if ( 48 <= (*p) && (*p) <= 57 )
+				goto tr38;
+		} else if ( (*p) > 90 ) {
+			if ( 97 <= (*p) && (*p) <= 122 )
+				goto tr38;
 		} else
-			goto st40;
+			goto tr38;
 	} else
-		goto tr59;
+		goto st23;
 	goto tr166;
-tr186:
+tr188:
 #line 1 "hpricot_css.rl"
 	{te = p+1;}
 #line 80 "hpricot_css.rl"
@@ -1710,70 +1665,144 @@
 	if ( ++p == pe )
 		goto _test_eof107;
 case 107:
-#line 1714 "hpricot_css.c"
+#line 1669 "hpricot_css.c"
 	switch( (*p) ) {
-		case 40: goto tr167;
-		case 45: goto tr59;
-		case 92: goto st37;
-		case 95: goto tr59;
-		case 100: goto tr187;
-		case 4294967236: goto st38;
-	}
-	if ( (*p) < 97 ) {
-		if ( (*p) > 57 ) {
-			if ( 65 <= (*p) && (*p) <= 90 )
-				goto tr59;
-		} else if ( (*p) >= 48 )
-			goto tr59;
-	} else if ( (*p) > 122 ) {
-		if ( (*p) < 4294967264 ) {
-			if ( 4294967237 <= (*p) && (*p) <= 4294967263 )
-				goto st39;
-		} else if ( (*p) > 4294967279 ) {
-			if ( 4294967280 <= (*p) && (*p) <= 4294967284 )
-				goto st41;
+		case -60: goto st20;
+		case 40: goto tr169;
+		case 45: goto tr38;
+		case 92: goto st41;
+		case 95: goto tr38;
+		case 105: goto tr189;
+	}
+	if ( (*p) < -16 ) {
+		if ( (*p) > -33 ) {
+			if ( -32 <= (*p) && (*p) <= -17 )
+				goto st22;
+		} else if ( (*p) >= -59 )
+			goto st21;
+	} else if ( (*p) > -12 ) {
+		if ( (*p) < 65 ) {
+			if ( 48 <= (*p) && (*p) <= 57 )
+				goto tr38;
+		} else if ( (*p) > 90 ) {
+			if ( 97 <= (*p) && (*p) <= 122 )
+				goto tr38;
 		} else
-			goto st40;
+			goto tr38;
 	} else
-		goto tr59;
+		goto st23;
 	goto tr166;
-tr187:
+tr189:
 #line 1 "hpricot_css.rl"
 	{te = p+1;}
-#line 78 "hpricot_css.rl"
-	{act = 7;}
+#line 80 "hpricot_css.rl"
+	{act = 9;}
 	goto st108;
 st108:
 	if ( ++p == pe )
 		goto _test_eof108;
 case 108:
-#line 1751 "hpricot_css.c"
+#line 1706 "hpricot_css.c"
+	switch( (*p) ) {
+		case -60: goto st20;
+		case 40: goto tr169;
+		case 45: goto tr38;
+		case 92: goto st41;
+		case 95: goto tr38;
+		case 108: goto tr190;
+	}
+	if ( (*p) < -16 ) {
+		if ( (*p) > -33 ) {
+			if ( -32 <= (*p) && (*p) <= -17 )
+				goto st22;
+		} else if ( (*p) >= -59 )
+			goto st21;
+	} else if ( (*p) > -12 ) {
+		if ( (*p) < 65 ) {
+			if ( 48 <= (*p) && (*p) <= 57 )
+				goto tr38;
+		} else if ( (*p) > 90 ) {
+			if ( 97 <= (*p) && (*p) <= 122 )
+				goto tr38;
+		} else
+			goto tr38;
+	} else
+		goto st23;
+	goto tr166;
+tr190:
+#line 1 "hpricot_css.rl"
+	{te = p+1;}
+#line 80 "hpricot_css.rl"
+	{act = 9;}
+	goto st109;
+st109:
+	if ( ++p == pe )
+		goto _test_eof109;
+case 109:
+#line 1743 "hpricot_css.c"
+	switch( (*p) ) {
+		case -60: goto st20;
+		case 40: goto tr169;
+		case 45: goto tr38;
+		case 92: goto st41;
+		case 95: goto tr38;
+		case 100: goto tr191;
+	}
+	if ( (*p) < -16 ) {
+		if ( (*p) > -33 ) {
+			if ( -32 <= (*p) && (*p) <= -17 )
+				goto st22;
+		} else if ( (*p) >= -59 )
+			goto st21;
+	} else if ( (*p) > -12 ) {
+		if ( (*p) < 65 ) {
+			if ( 48 <= (*p) && (*p) <= 57 )
+				goto tr38;
+		} else if ( (*p) > 90 ) {
+			if ( 97 <= (*p) && (*p) <= 122 )
+				goto tr38;
+		} else
+			goto tr38;
+	} else
+		goto st23;
+	goto tr166;
+tr191:
+#line 1 "hpricot_css.rl"
+	{te = p+1;}
+#line 78 "hpricot_css.rl"
+	{act = 7;}
+	goto st110;
+st110:
+	if ( ++p == pe )
+		goto _test_eof110;
+case 110:
+#line 1780 "hpricot_css.c"
 	switch( (*p) ) {
-		case 40: goto tr189;
-		case 45: goto tr175;
-		case 92: goto tr176;
-		case 95: goto tr175;
-		case 4294967236: goto st38;
-	}
-	if ( (*p) < 97 ) {
-		if ( (*p) > 57 ) {
-			if ( 65 <= (*p) && (*p) <= 90 )
-				goto tr175;
-		} else if ( (*p) >= 48 )
+		case -60: goto tr174;
+		case 40: goto tr193;
+		case 45: goto tr179;
+		case 92: goto tr180;
+		case 95: goto tr179;
+	}
+	if ( (*p) < -16 ) {
+		if ( (*p) > -33 ) {
+			if ( -32 <= (*p) && (*p) <= -17 )
+				goto tr176;
+		} else if ( (*p) >= -59 )
 			goto tr175;
-	} else if ( (*p) > 122 ) {
-		if ( (*p) < 4294967264 ) {
-			if ( 4294967237 <= (*p) && (*p) <= 4294967263 )
-				goto st39;
-		} else if ( (*p) > 4294967279 ) {
-			if ( 4294967280 <= (*p) && (*p) <= 4294967284 )
-				goto st41;
+	} else if ( (*p) > -12 ) {
+		if ( (*p) < 65 ) {
+			if ( 48 <= (*p) && (*p) <= 57 )
+				goto tr179;
+		} else if ( (*p) > 90 ) {
+			if ( 97 <= (*p) && (*p) <= 122 )
+				goto tr179;
 		} else
-			goto st40;
+			goto tr179;
 	} else
-		goto tr175;
-	goto tr188;
-tr189:
+		goto tr177;
+	goto tr192;
+tr193:
 #line 29 "hpricot_css.rl"
 	{
     ape = p;
@@ -1784,11 +1813,11 @@
 	if ( ++p == pe )
 		goto _test_eof44;
 case 44:
-#line 1788 "hpricot_css.c"
+#line 1817 "hpricot_css.c"
 	switch( (*p) ) {
-		case 34: goto tr40;
-		case 39: goto tr41;
-		case 40: goto tr42;
+		case 34: goto tr43;
+		case 39: goto tr44;
+		case 40: goto tr45;
 		case 41: goto tr67;
 		case 43: goto tr68;
 		case 45: goto tr68;
@@ -1798,7 +1827,7 @@
 	}
 	if ( 48 <= (*p) && (*p) <= 57 )
 		goto tr68;
-	goto tr39;
+	goto tr42;
 tr68:
 #line 25 "hpricot_css.rl"
 	{
@@ -1809,7 +1838,7 @@
 	if ( ++p == pe )
 		goto _test_eof45;
 case 45:
-#line 1813 "hpricot_css.c"
+#line 1842 "hpricot_css.c"
 	switch( (*p) ) {
 		case 34: goto tr66;
 		case 40: goto tr66;
@@ -1820,7 +1849,7 @@
 	}
 	if ( 48 <= (*p) && (*p) <= 57 )
 		goto st45;
-	goto st21;
+	goto st25;
 tr69:
 #line 25 "hpricot_css.rl"
 	{
@@ -1831,14 +1860,14 @@
 	if ( ++p == pe )
 		goto _test_eof46;
 case 46:
-#line 1835 "hpricot_css.c"
+#line 1864 "hpricot_css.c"
 	switch( (*p) ) {
 		case 34: goto tr66;
 		case 40: goto tr66;
-		case 41: goto tr45;
+		case 41: goto tr48;
 		case 118: goto st47;
 	}
-	goto st21;
+	goto st25;
 st47:
 	if ( ++p == pe )
 		goto _test_eof47;
@@ -1846,10 +1875,10 @@
 	switch( (*p) ) {
 		case 34: goto tr66;
 		case 40: goto tr66;
-		case 41: goto tr45;
+		case 41: goto tr48;
 		case 101: goto st48;
 	}
-	goto st21;
+	goto st25;
 st48:
 	if ( ++p == pe )
 		goto _test_eof48;
@@ -1857,10 +1886,10 @@
 	switch( (*p) ) {
 		case 34: goto tr66;
 		case 40: goto tr66;
-		case 41: goto tr45;
+		case 41: goto tr48;
 		case 110: goto st49;
 	}
-	goto st21;
+	goto st25;
 st49:
 	if ( ++p == pe )
 		goto _test_eof49;
@@ -1870,7 +1899,7 @@
 		case 40: goto tr66;
 		case 41: goto tr71;
 	}
-	goto st21;
+	goto st25;
 tr70:
 #line 25 "hpricot_css.rl"
 	{
@@ -1881,14 +1910,14 @@
 	if ( ++p == pe )
 		goto _test_eof50;
 case 50:
-#line 1885 "hpricot_css.c"
+#line 1914 "hpricot_css.c"
 	switch( (*p) ) {
 		case 34: goto tr66;
 		case 40: goto tr66;
-		case 41: goto tr45;
+		case 41: goto tr48;
 		case 100: goto st51;
 	}
-	goto st21;
+	goto st25;
 st51:
 	if ( ++p == pe )
 		goto _test_eof51;
@@ -1896,11 +1925,11 @@
 	switch( (*p) ) {
 		case 34: goto tr66;
 		case 40: goto tr66;
-		case 41: goto tr45;
+		case 41: goto tr48;
 		case 100: goto st49;
 	}
-	goto st21;
-tr30:
+	goto st25;
+tr34:
 #line 1 "hpricot_css.rl"
 	{te = p+1;}
 #line 25 "hpricot_css.rl"
@@ -1909,39 +1938,39 @@
   }
 #line 80 "hpricot_css.rl"
 	{act = 9;}
-	goto st109;
-st109:
+	goto st111;
+st111:
 	if ( ++p == pe )
-		goto _test_eof109;
-case 109:
-#line 1918 "hpricot_css.c"
+		goto _test_eof111;
+case 111:
+#line 1947 "hpricot_css.c"
 	switch( (*p) ) {
-		case 40: goto tr167;
-		case 45: goto tr59;
-		case 92: goto st37;
-		case 95: goto tr59;
+		case -60: goto st20;
+		case 40: goto tr169;
+		case 45: goto tr38;
+		case 92: goto st41;
+		case 95: goto tr38;
 		case 116: goto tr171;
-		case 4294967236: goto st38;
 	}
-	if ( (*p) < 97 ) {
-		if ( (*p) > 57 ) {
-			if ( 65 <= (*p) && (*p) <= 90 )
-				goto tr59;
-		} else if ( (*p) >= 48 )
-			goto tr59;
-	} else if ( (*p) > 122 ) {
-		if ( (*p) < 4294967264 ) {
-			if ( 4294967237 <= (*p) && (*p) <= 4294967263 )
-				goto st39;
-		} else if ( (*p) > 4294967279 ) {
-			if ( 4294967280 <= (*p) && (*p) <= 4294967284 )
-				goto st41;
+	if ( (*p) < -16 ) {
+		if ( (*p) > -33 ) {
+			if ( -32 <= (*p) && (*p) <= -17 )
+				goto st22;
+		} else if ( (*p) >= -59 )
+			goto st21;
+	} else if ( (*p) > -12 ) {
+		if ( (*p) < 65 ) {
+			if ( 48 <= (*p) && (*p) <= 57 )
+				goto tr38;
+		} else if ( (*p) > 90 ) {
+			if ( 97 <= (*p) && (*p) <= 122 )
+				goto tr38;
 		} else
-			goto st40;
+			goto tr38;
 	} else
-		goto tr59;
+		goto st23;
 	goto tr166;
-tr31:
+tr35:
 #line 1 "hpricot_css.rl"
 	{te = p+1;}
 #line 25 "hpricot_css.rl"
@@ -1950,40 +1979,40 @@
   }
 #line 80 "hpricot_css.rl"
 	{act = 9;}
-	goto st110;
-st110:
+	goto st112;
+st112:
 	if ( ++p == pe )
-		goto _test_eof110;
-case 110:
-#line 1959 "hpricot_css.c"
+		goto _test_eof112;
+case 112:
+#line 1988 "hpricot_css.c"
 	switch( (*p) ) {
-		case 40: goto tr167;
-		case 45: goto tr59;
-		case 92: goto st37;
-		case 95: goto tr59;
-		case 97: goto tr179;
+		case -60: goto st20;
+		case 40: goto tr169;
+		case 45: goto tr38;
+		case 92: goto st41;
+		case 95: goto tr38;
+		case 97: goto tr183;
 		case 116: goto tr171;
-		case 4294967236: goto st38;
 	}
-	if ( (*p) < 98 ) {
-		if ( (*p) > 57 ) {
-			if ( 65 <= (*p) && (*p) <= 90 )
-				goto tr59;
-		} else if ( (*p) >= 48 )
-			goto tr59;
-	} else if ( (*p) > 122 ) {
-		if ( (*p) < 4294967264 ) {
-			if ( 4294967237 <= (*p) && (*p) <= 4294967263 )
-				goto st39;
-		} else if ( (*p) > 4294967279 ) {
-			if ( 4294967280 <= (*p) && (*p) <= 4294967284 )
-				goto st41;
+	if ( (*p) < -16 ) {
+		if ( (*p) > -33 ) {
+			if ( -32 <= (*p) && (*p) <= -17 )
+				goto st22;
+		} else if ( (*p) >= -59 )
+			goto st21;
+	} else if ( (*p) > -12 ) {
+		if ( (*p) < 65 ) {
+			if ( 48 <= (*p) && (*p) <= 57 )
+				goto tr38;
+		} else if ( (*p) > 90 ) {
+			if ( 98 <= (*p) && (*p) <= 122 )
+				goto tr38;
 		} else
-			goto st40;
+			goto tr38;
 	} else
-		goto tr59;
+		goto st23;
 	goto tr166;
-tr32:
+tr36:
 #line 1 "hpricot_css.rl"
 	{te = p+1;}
 #line 25 "hpricot_css.rl"
@@ -1992,76 +2021,76 @@
   }
 #line 80 "hpricot_css.rl"
 	{act = 9;}
-	goto st111;
-st111:
+	goto st113;
+st113:
 	if ( ++p == pe )
-		goto _test_eof111;
-case 111:
-#line 2001 "hpricot_css.c"
+		goto _test_eof113;
+case 113:
+#line 2030 "hpricot_css.c"
 	switch( (*p) ) {
-		case 40: goto tr167;
-		case 45: goto tr59;
-		case 92: goto st37;
-		case 95: goto tr59;
-		case 116: goto tr190;
-		case 4294967236: goto st38;
-	}
-	if ( (*p) < 97 ) {
-		if ( (*p) > 57 ) {
-			if ( 65 <= (*p) && (*p) <= 90 )
-				goto tr59;
-		} else if ( (*p) >= 48 )
-			goto tr59;
-	} else if ( (*p) > 122 ) {
-		if ( (*p) < 4294967264 ) {
-			if ( 4294967237 <= (*p) && (*p) <= 4294967263 )
-				goto st39;
-		} else if ( (*p) > 4294967279 ) {
-			if ( 4294967280 <= (*p) && (*p) <= 4294967284 )
-				goto st41;
+		case -60: goto st20;
+		case 40: goto tr169;
+		case 45: goto tr38;
+		case 92: goto st41;
+		case 95: goto tr38;
+		case 116: goto tr194;
+	}
+	if ( (*p) < -16 ) {
+		if ( (*p) > -33 ) {
+			if ( -32 <= (*p) && (*p) <= -17 )
+				goto st22;
+		} else if ( (*p) >= -59 )
+			goto st21;
+	} else if ( (*p) > -12 ) {
+		if ( (*p) < 65 ) {
+			if ( 48 <= (*p) && (*p) <= 57 )
+				goto tr38;
+		} else if ( (*p) > 90 ) {
+			if ( 97 <= (*p) && (*p) <= 122 )
+				goto tr38;
 		} else
-			goto st40;
+			goto tr38;
 	} else
-		goto tr59;
+		goto st23;
 	goto tr166;
-tr190:
+tr194:
 #line 1 "hpricot_css.rl"
 	{te = p+1;}
 #line 80 "hpricot_css.rl"
 	{act = 9;}
-	goto st112;
-st112:
+	goto st114;
+st114:
 	if ( ++p == pe )
-		goto _test_eof112;
-case 112:
-#line 2038 "hpricot_css.c"
+		goto _test_eof114;
+case 114:
+#line 2067 "hpricot_css.c"
 	switch( (*p) ) {
-		case 40: goto tr167;
-		case 45: goto tr59;
-		case 92: goto st37;
-		case 95: goto tr59;
-		case 104: goto tr181;
-		case 4294967236: goto st38;
-	}
-	if ( (*p) < 97 ) {
-		if ( (*p) > 57 ) {
-			if ( 65 <= (*p) && (*p) <= 90 )
-				goto tr59;
-		} else if ( (*p) >= 48 )
-			goto tr59;
-	} else if ( (*p) > 122 ) {
-		if ( (*p) < 4294967264 ) {
-			if ( 4294967237 <= (*p) && (*p) <= 4294967263 )
-				goto st39;
-		} else if ( (*p) > 4294967279 ) {
-			if ( 4294967280 <= (*p) && (*p) <= 4294967284 )
-				goto st41;
+		case -60: goto st20;
+		case 40: goto tr169;
+		case 45: goto tr38;
+		case 92: goto st41;
+		case 95: goto tr38;
+		case 104: goto tr185;
+	}
+	if ( (*p) < -16 ) {
+		if ( (*p) > -33 ) {
+			if ( -32 <= (*p) && (*p) <= -17 )
+				goto st22;
+		} else if ( (*p) >= -59 )
+			goto st21;
+	} else if ( (*p) > -12 ) {
+		if ( (*p) < 65 ) {
+			if ( 48 <= (*p) && (*p) <= 57 )
+				goto tr38;
+		} else if ( (*p) > 90 ) {
+			if ( 97 <= (*p) && (*p) <= 122 )
+				goto tr38;
 		} else
-			goto st40;
+			goto tr38;
 	} else
-		goto tr59;
+		goto st23;
 	goto tr166;
-tr33:
+tr37:
 #line 1 "hpricot_css.rl"
 	{te = p+1;}
 #line 25 "hpricot_css.rl"
@@ -2070,214 +2099,214 @@
   }
 #line 80 "hpricot_css.rl"
 	{act = 9;}
-	goto st113;
-st113:
+	goto st115;
+st115:
 	if ( ++p == pe )
-		goto _test_eof113;
-case 113:
-#line 2079 "hpricot_css.c"
+		goto _test_eof115;
+case 115:
+#line 2108 "hpricot_css.c"
 	switch( (*p) ) {
-		case 40: goto tr167;
-		case 45: goto tr59;
-		case 92: goto st37;
-		case 95: goto tr59;
-		case 100: goto tr191;
-		case 110: goto tr192;
-		case 4294967236: goto st38;
-	}
-	if ( (*p) < 97 ) {
-		if ( (*p) > 57 ) {
-			if ( 65 <= (*p) && (*p) <= 90 )
-				goto tr59;
-		} else if ( (*p) >= 48 )
-			goto tr59;
-	} else if ( (*p) > 122 ) {
-		if ( (*p) < 4294967264 ) {
-			if ( 4294967237 <= (*p) && (*p) <= 4294967263 )
-				goto st39;
-		} else if ( (*p) > 4294967279 ) {
-			if ( 4294967280 <= (*p) && (*p) <= 4294967284 )
-				goto st41;
+		case -60: goto st20;
+		case 40: goto tr169;
+		case 45: goto tr38;
+		case 92: goto st41;
+		case 95: goto tr38;
+		case 100: goto tr195;
+		case 110: goto tr196;
+	}
+	if ( (*p) < -16 ) {
+		if ( (*p) > -33 ) {
+			if ( -32 <= (*p) && (*p) <= -17 )
+				goto st22;
+		} else if ( (*p) >= -59 )
+			goto st21;
+	} else if ( (*p) > -12 ) {
+		if ( (*p) < 65 ) {
+			if ( 48 <= (*p) && (*p) <= 57 )
+				goto tr38;
+		} else if ( (*p) > 90 ) {
+			if ( 97 <= (*p) && (*p) <= 122 )
+				goto tr38;
 		} else
-			goto st40;
+			goto tr38;
 	} else
-		goto tr59;
+		goto st23;
 	goto tr166;
-tr191:
+tr195:
 #line 1 "hpricot_css.rl"
 	{te = p+1;}
 #line 80 "hpricot_css.rl"
 	{act = 9;}
-	goto st114;
-st114:
+	goto st116;
+st116:
 	if ( ++p == pe )
-		goto _test_eof114;
-case 114:
-#line 2117 "hpricot_css.c"
+		goto _test_eof116;
+case 116:
+#line 2146 "hpricot_css.c"
 	switch( (*p) ) {
-		case 40: goto tr167;
-		case 45: goto tr59;
-		case 92: goto st37;
-		case 95: goto tr59;
+		case -60: goto st20;
+		case 40: goto tr169;
+		case 45: goto tr38;
+		case 92: goto st41;
+		case 95: goto tr38;
 		case 100: goto tr171;
-		case 4294967236: goto st38;
 	}
-	if ( (*p) < 97 ) {
-		if ( (*p) > 57 ) {
-			if ( 65 <= (*p) && (*p) <= 90 )
-				goto tr59;
-		} else if ( (*p) >= 48 )
-			goto tr59;
-	} else if ( (*p) > 122 ) {
-		if ( (*p) < 4294967264 ) {
-			if ( 4294967237 <= (*p) && (*p) <= 4294967263 )
-				goto st39;
-		} else if ( (*p) > 4294967279 ) {
-			if ( 4294967280 <= (*p) && (*p) <= 4294967284 )
-				goto st41;
+	if ( (*p) < -16 ) {
+		if ( (*p) > -33 ) {
+			if ( -32 <= (*p) && (*p) <= -17 )
+				goto st22;
+		} else if ( (*p) >= -59 )
+			goto st21;
+	} else if ( (*p) > -12 ) {
+		if ( (*p) < 65 ) {
+			if ( 48 <= (*p) && (*p) <= 57 )
+				goto tr38;
+		} else if ( (*p) > 90 ) {
+			if ( 97 <= (*p) && (*p) <= 122 )
+				goto tr38;
 		} else
-			goto st40;
+			goto tr38;
 	} else
-		goto tr59;
+		goto st23;
 	goto tr166;
-tr192:
+tr196:
 #line 1 "hpricot_css.rl"
 	{te = p+1;}
 #line 80 "hpricot_css.rl"
 	{act = 9;}
-	goto st115;
-st115:
+	goto st117;
+st117:
 	if ( ++p == pe )
-		goto _test_eof115;
-case 115:
-#line 2154 "hpricot_css.c"
+		goto _test_eof117;
+case 117:
+#line 2183 "hpricot_css.c"
 	switch( (*p) ) {
-		case 40: goto tr167;
-		case 45: goto tr59;
-		case 92: goto st37;
-		case 95: goto tr59;
-		case 108: goto tr193;
-		case 4294967236: goto st38;
-	}
-	if ( (*p) < 97 ) {
-		if ( (*p) > 57 ) {
-			if ( 65 <= (*p) && (*p) <= 90 )
-				goto tr59;
-		} else if ( (*p) >= 48 )
-			goto tr59;
-	} else if ( (*p) > 122 ) {
-		if ( (*p) < 4294967264 ) {
-			if ( 4294967237 <= (*p) && (*p) <= 4294967263 )
-				goto st39;
-		} else if ( (*p) > 4294967279 ) {
-			if ( 4294967280 <= (*p) && (*p) <= 4294967284 )
-				goto st41;
+		case -60: goto st20;
+		case 40: goto tr169;
+		case 45: goto tr38;
+		case 92: goto st41;
+		case 95: goto tr38;
+		case 108: goto tr197;
+	}
+	if ( (*p) < -16 ) {
+		if ( (*p) > -33 ) {
+			if ( -32 <= (*p) && (*p) <= -17 )
+				goto st22;
+		} else if ( (*p) >= -59 )
+			goto st21;
+	} else if ( (*p) > -12 ) {
+		if ( (*p) < 65 ) {
+			if ( 48 <= (*p) && (*p) <= 57 )
+				goto tr38;
+		} else if ( (*p) > 90 ) {
+			if ( 97 <= (*p) && (*p) <= 122 )
+				goto tr38;
 		} else
-			goto st40;
+			goto tr38;
 	} else
-		goto tr59;
+		goto st23;
 	goto tr166;
-tr193:
+tr197:
 #line 1 "hpricot_css.rl"
 	{te = p+1;}
 #line 80 "hpricot_css.rl"
 	{act = 9;}
-	goto st116;
-st116:
+	goto st118;
+st118:
 	if ( ++p == pe )
-		goto _test_eof116;
-case 116:
-#line 2191 "hpricot_css.c"
+		goto _test_eof118;
+case 118:
+#line 2220 "hpricot_css.c"
 	switch( (*p) ) {
-		case 40: goto tr167;
-		case 45: goto tr59;
-		case 92: goto st37;
-		case 95: goto tr59;
-		case 121: goto tr194;
-		case 4294967236: goto st38;
-	}
-	if ( (*p) < 97 ) {
-		if ( (*p) > 57 ) {
-			if ( 65 <= (*p) && (*p) <= 90 )
-				goto tr59;
-		} else if ( (*p) >= 48 )
-			goto tr59;
-	} else if ( (*p) > 122 ) {
-		if ( (*p) < 4294967264 ) {
-			if ( 4294967237 <= (*p) && (*p) <= 4294967263 )
-				goto st39;
-		} else if ( (*p) > 4294967279 ) {
-			if ( 4294967280 <= (*p) && (*p) <= 4294967284 )
-				goto st41;
+		case -60: goto st20;
+		case 40: goto tr169;
+		case 45: goto tr38;
+		case 92: goto st41;
+		case 95: goto tr38;
+		case 121: goto tr198;
+	}
+	if ( (*p) < -16 ) {
+		if ( (*p) > -33 ) {
+			if ( -32 <= (*p) && (*p) <= -17 )
+				goto st22;
+		} else if ( (*p) >= -59 )
+			goto st21;
+	} else if ( (*p) > -12 ) {
+		if ( (*p) < 65 ) {
+			if ( 48 <= (*p) && (*p) <= 57 )
+				goto tr38;
+		} else if ( (*p) > 90 ) {
+			if ( 97 <= (*p) && (*p) <= 122 )
+				goto tr38;
 		} else
-			goto st40;
+			goto tr38;
 	} else
-		goto tr59;
+		goto st23;
 	goto tr166;
-tr194:
+tr198:
 #line 1 "hpricot_css.rl"
 	{te = p+1;}
 #line 80 "hpricot_css.rl"
 	{act = 9;}
-	goto st117;
-st117:
+	goto st119;
+st119:
 	if ( ++p == pe )
-		goto _test_eof117;
-case 117:
-#line 2228 "hpricot_css.c"
+		goto _test_eof119;
+case 119:
+#line 2257 "hpricot_css.c"
 	switch( (*p) ) {
-		case 40: goto tr167;
-		case 45: goto tr195;
-		case 92: goto st37;
-		case 95: goto tr59;
-		case 4294967236: goto st38;
-	}
-	if ( (*p) < 97 ) {
-		if ( (*p) > 57 ) {
-			if ( 65 <= (*p) && (*p) <= 90 )
-				goto tr59;
-		} else if ( (*p) >= 48 )
-			goto tr59;
-	} else if ( (*p) > 122 ) {
-		if ( (*p) < 4294967264 ) {
-			if ( 4294967237 <= (*p) && (*p) <= 4294967263 )
-				goto st39;
-		} else if ( (*p) > 4294967279 ) {
-			if ( 4294967280 <= (*p) && (*p) <= 4294967284 )
-				goto st41;
+		case -60: goto st20;
+		case 40: goto tr169;
+		case 45: goto tr199;
+		case 92: goto st41;
+		case 95: goto tr38;
+	}
+	if ( (*p) < -16 ) {
+		if ( (*p) > -33 ) {
+			if ( -32 <= (*p) && (*p) <= -17 )
+				goto st22;
+		} else if ( (*p) >= -59 )
+			goto st21;
+	} else if ( (*p) > -12 ) {
+		if ( (*p) < 65 ) {
+			if ( 48 <= (*p) && (*p) <= 57 )
+				goto tr38;
+		} else if ( (*p) > 90 ) {
+			if ( 97 <= (*p) && (*p) <= 122 )
+				goto tr38;
 		} else
-			goto st40;
+			goto tr38;
 	} else
-		goto tr59;
+		goto st23;
 	goto tr166;
 st52:
 	if ( ++p == pe )
 		goto _test_eof52;
 case 52:
 	switch( (*p) ) {
-		case 45: goto tr77;
-		case 92: goto tr78;
-		case 95: goto tr77;
-		case 110: goto tr79;
-		case 4294967236: goto tr80;
-	}
-	if ( (*p) < 97 ) {
-		if ( (*p) > 57 ) {
-			if ( 65 <= (*p) && (*p) <= 90 )
-				goto tr77;
-		} else if ( (*p) >= 48 )
-			goto tr77;
-	} else if ( (*p) > 122 ) {
-		if ( (*p) < 4294967264 ) {
-			if ( 4294967237 <= (*p) && (*p) <= 4294967263 )
+		case -60: goto tr77;
+		case 45: goto tr81;
+		case 92: goto tr82;
+		case 95: goto tr81;
+		case 110: goto tr83;
+	}
+	if ( (*p) < -16 ) {
+		if ( (*p) > -33 ) {
+			if ( -32 <= (*p) && (*p) <= -17 )
+				goto tr79;
+		} else if ( (*p) >= -59 )
+			goto tr78;
+	} else if ( (*p) > -12 ) {
+		if ( (*p) < 65 ) {
+			if ( 48 <= (*p) && (*p) <= 57 )
+				goto tr81;
+		} else if ( (*p) > 90 ) {
+			if ( 97 <= (*p) && (*p) <= 122 )
 				goto tr81;
-		} else if ( (*p) > 4294967279 ) {
-			if ( 4294967280 <= (*p) && (*p) <= 4294967284 )
-				goto tr83;
 		} else
-			goto tr82;
+			goto tr81;
 	} else
-		goto tr77;
+		goto tr80;
 	goto st0;
 tr77:
 #line 25 "hpricot_css.rl"
@@ -2285,63 +2314,21 @@
     aps = p;
   }
 	goto st53;
-tr86:
-#line 34 "hpricot_css.rl"
-	{
-    ape = p;
-    aps2 = p;
-  }
-	goto st53;
 st53:
 	if ( ++p == pe )
 		goto _test_eof53;
 case 53:
-#line 2300 "hpricot_css.c"
-	switch( (*p) ) {
-		case 32: goto tr85;
-		case 45: goto tr86;
-		case 61: goto tr87;
-		case 92: goto tr88;
-		case 95: goto tr86;
-		case 4294967236: goto st67;
-	}
-	if ( (*p) < 65 ) {
-		if ( (*p) < 14 ) {
-			if ( (*p) > 8 ) {
-				if ( 9 <= (*p) && (*p) <= 13 )
-					goto tr85;
-			} else
-				goto tr84;
-		} else if ( (*p) > 47 ) {
-			if ( (*p) > 57 ) {
-				if ( 58 <= (*p) && (*p) <= 64 )
-					goto tr84;
-			} else if ( (*p) >= 48 )
-				goto tr86;
-		} else
-			goto tr84;
-	} else if ( (*p) > 90 ) {
-		if ( (*p) < 123 ) {
-			if ( (*p) > 96 ) {
-				if ( 97 <= (*p) && (*p) <= 122 )
-					goto tr86;
-			} else if ( (*p) >= 91 )
-				goto tr84;
-		} else if ( (*p) > 127 ) {
-			if ( (*p) < 4294967264 ) {
-				if ( 4294967237 <= (*p) && (*p) <= 4294967263 )
-					goto st68;
-			} else if ( (*p) > 4294967279 ) {
-				if ( 4294967280 <= (*p) && (*p) <= 4294967284 )
-					goto st70;
-			} else
-				goto st69;
-		} else
-			goto tr84;
-	} else
-		goto tr86;
+#line 2322 "hpricot_css.c"
+	if ( -88 <= (*p) && (*p) <= -65 )
+		goto st54;
 	goto st0;
-tr84:
+tr81:
+#line 25 "hpricot_css.rl"
+	{
+    aps = p;
+  }
+	goto st54;
+tr91:
 #line 34 "hpricot_css.rl"
 	{
     ape = p;
@@ -2352,39 +2339,64 @@
 	if ( ++p == pe )
 		goto _test_eof54;
 case 54:
-#line 2356 "hpricot_css.c"
-	if ( (*p) == 61 )
-		goto st55;
-	goto st0;
+#line 2343 "hpricot_css.c"
+	switch( (*p) ) {
+		case -60: goto tr86;
+		case 32: goto tr90;
+		case 45: goto tr91;
+		case 61: goto tr92;
+		case 92: goto tr93;
+		case 95: goto tr91;
+	}
+	if ( (*p) < 9 ) {
+		if ( (*p) < -32 ) {
+			if ( -59 <= (*p) && (*p) <= -33 )
+				goto tr87;
+		} else if ( (*p) > -17 ) {
+			if ( -16 <= (*p) && (*p) <= -12 )
+				goto tr89;
+		} else
+			goto tr88;
+	} else if ( (*p) > 13 ) {
+		if ( (*p) < 65 ) {
+			if ( 48 <= (*p) && (*p) <= 57 )
+				goto tr91;
+		} else if ( (*p) > 90 ) {
+			if ( 97 <= (*p) && (*p) <= 122 )
+				goto tr91;
+		} else
+			goto tr91;
+	} else
+		goto tr90;
+	goto tr85;
+tr85:
+#line 34 "hpricot_css.rl"
+	{
+    ape = p;
+    aps2 = p;
+  }
+	goto st55;
 st55:
 	if ( ++p == pe )
 		goto _test_eof55;
 case 55:
-	switch( (*p) ) {
-		case 32: goto tr95;
-		case 34: goto tr96;
-		case 39: goto tr97;
-		case 93: goto st0;
-	}
-	if ( 9 <= (*p) && (*p) <= 13 )
-		goto tr95;
-	goto tr94;
-tr94:
-#line 39 "hpricot_css.rl"
-	{
-    ape2 = p;
-    PUSH(aps, ape);
-    PUSH(aps2, ape2);
-  }
-	goto st56;
+#line 2384 "hpricot_css.c"
+	if ( (*p) == 61 )
+		goto st56;
+	goto st0;
 st56:
 	if ( ++p == pe )
 		goto _test_eof56;
 case 56:
-#line 2385 "hpricot_css.c"
-	if ( (*p) == 93 )
-		goto tr99;
-	goto st56;
+	switch( (*p) ) {
+		case 32: goto tr96;
+		case 34: goto tr97;
+		case 39: goto tr98;
+		case 93: goto st0;
+	}
+	if ( 9 <= (*p) && (*p) <= 13 )
+		goto tr96;
+	goto tr95;
 tr95:
 #line 39 "hpricot_css.rl"
 	{
@@ -2397,16 +2409,10 @@
 	if ( ++p == pe )
 		goto _test_eof57;
 case 57:
-#line 2401 "hpricot_css.c"
-	switch( (*p) ) {
-		case 32: goto st57;
-		case 34: goto st58;
-		case 39: goto st61;
-		case 93: goto tr99;
-	}
-	if ( 9 <= (*p) && (*p) <= 13 )
-		goto st57;
-	goto st56;
+#line 2413 "hpricot_css.c"
+	if ( (*p) == 93 )
+		goto tr100;
+	goto st57;
 tr96:
 #line 39 "hpricot_css.rl"
 	{
@@ -2419,95 +2425,98 @@
 	if ( ++p == pe )
 		goto _test_eof58;
 case 58:
-#line 2423 "hpricot_css.c"
+#line 2429 "hpricot_css.c"
 	switch( (*p) ) {
-		case 34: goto st56;
-		case 93: goto tr103;
+		case 32: goto st58;
+		case 34: goto st59;
+		case 39: goto st62;
+		case 93: goto tr100;
 	}
-	goto st58;
-tr103:
-#line 1 "hpricot_css.rl"
-	{te = p+1;}
-	goto st118;
-st118:
-	if ( ++p == pe )
-		goto _test_eof118;
-case 118:
-#line 2437 "hpricot_css.c"
-	if ( (*p) == 34 )
-		goto st60;
+	if ( 9 <= (*p) && (*p) <= 13 )
+		goto st58;
+	goto st57;
+tr97:
+#line 39 "hpricot_css.rl"
+	{
+    ape2 = p;
+    PUSH(aps, ape);
+    PUSH(aps2, ape2);
+  }
 	goto st59;
 st59:
 	if ( ++p == pe )
 		goto _test_eof59;
 case 59:
-	if ( (*p) == 34 )
-		goto st60;
+#line 2451 "hpricot_css.c"
+	switch( (*p) ) {
+		case 34: goto st57;
+		case 93: goto tr104;
+	}
 	goto st59;
+tr104:
+#line 1 "hpricot_css.rl"
+	{te = p+1;}
+	goto st120;
+st120:
+	if ( ++p == pe )
+		goto _test_eof120;
+case 120:
+#line 2465 "hpricot_css.c"
+	if ( (*p) == 34 )
+		goto st61;
+	goto st60;
 st60:
 	if ( ++p == pe )
 		goto _test_eof60;
 case 60:
+	if ( (*p) == 34 )
+		goto st61;
+	goto st60;
+st61:
+	if ( ++p == pe )
+		goto _test_eof61;
+case 61:
 	if ( (*p) == 93 )
-		goto tr99;
-	goto tr104;
-tr97:
+		goto tr100;
+	goto tr105;
+tr98:
 #line 39 "hpricot_css.rl"
 	{
     ape2 = p;
     PUSH(aps, ape);
     PUSH(aps2, ape2);
   }
-	goto st61;
-st61:
+	goto st62;
+st62:
 	if ( ++p == pe )
-		goto _test_eof61;
-case 61:
-#line 2467 "hpricot_css.c"
+		goto _test_eof62;
+case 62:
+#line 2495 "hpricot_css.c"
 	switch( (*p) ) {
-		case 39: goto st56;
-		case 93: goto tr107;
+		case 39: goto st57;
+		case 93: goto tr108;
 	}
-	goto st61;
-tr107:
+	goto st62;
+tr108:
 #line 1 "hpricot_css.rl"
 	{te = p+1;}
-	goto st119;
-st119:
-	if ( ++p == pe )
-		goto _test_eof119;
-case 119:
-#line 2481 "hpricot_css.c"
-	if ( (*p) == 39 )
-		goto st60;
-	goto st62;
-st62:
+	goto st121;
+st121:
 	if ( ++p == pe )
-		goto _test_eof62;
-case 62:
+		goto _test_eof121;
+case 121:
+#line 2509 "hpricot_css.c"
 	if ( (*p) == 39 )
-		goto st60;
-	goto st62;
-tr85:
-#line 34 "hpricot_css.rl"
-	{
-    ape = p;
-    aps2 = p;
-  }
+		goto st61;
 	goto st63;
 st63:
 	if ( ++p == pe )
 		goto _test_eof63;
 case 63:
-#line 2503 "hpricot_css.c"
-	switch( (*p) ) {
-		case 32: goto st63;
-		case 61: goto st64;
-	}
-	if ( 9 <= (*p) && (*p) <= 13 )
-		goto st63;
-	goto st54;
-tr87:
+	if ( (*p) == 39 )
+		goto st61;
+	goto st63;
+tr86:
 #line 34 "hpricot_css.rl"
 	{
     ape = p;
@@ -2518,39 +2527,29 @@
 	if ( ++p == pe )
 		goto _test_eof64;
 case 64:
-#line 2522 "hpricot_css.c"
-	switch( (*p) ) {
-		case 32: goto tr95;
-		case 34: goto tr96;
-		case 39: goto tr97;
-		case 61: goto tr112;
-		case 93: goto st0;
-	}
-	if ( 9 <= (*p) && (*p) <= 13 )
-		goto tr95;
-	goto tr94;
-tr112:
-#line 39 "hpricot_css.rl"
+#line 2531 "hpricot_css.c"
+	if ( (*p) == 61 )
+		goto st56;
+	if ( -88 <= (*p) && (*p) <= -65 )
+		goto st54;
+	goto st0;
+tr87:
+#line 34 "hpricot_css.rl"
 	{
-    ape2 = p;
-    PUSH(aps, ape);
-    PUSH(aps2, ape2);
+    ape = p;
+    aps2 = p;
   }
 	goto st65;
 st65:
 	if ( ++p == pe )
 		goto _test_eof65;
 case 65:
-#line 2545 "hpricot_css.c"
-	switch( (*p) ) {
-		case 32: goto tr95;
-		case 34: goto tr96;
-		case 39: goto tr97;
-		case 93: goto tr99;
-	}
-	if ( 9 <= (*p) && (*p) <= 13 )
-		goto tr95;
-	goto tr94;
+#line 2548 "hpricot_css.c"
+	if ( (*p) == 61 )
+		goto st56;
+	if ( (*p) <= -65 )
+		goto st54;
+	goto st0;
 tr88:
 #line 34 "hpricot_css.rl"
 	{
@@ -2562,13 +2561,13 @@
 	if ( ++p == pe )
 		goto _test_eof66;
 case 66:
-#line 2566 "hpricot_css.c"
-	switch( (*p) ) {
-		case 46: goto st53;
-		case 61: goto st55;
-	}
+#line 2565 "hpricot_css.c"
+	if ( (*p) == 61 )
+		goto st56;
+	if ( (*p) <= -65 )
+		goto st67;
 	goto st0;
-tr80:
+tr78:
 #line 25 "hpricot_css.rl"
 	{
     aps = p;
@@ -2578,14 +2577,15 @@
 	if ( ++p == pe )
 		goto _test_eof67;
 case 67:
-#line 2582 "hpricot_css.c"
-	if ( 4294967208 <= (*p) && (*p) <= 4294967231 )
-		goto st53;
+#line 2581 "hpricot_css.c"
+	if ( (*p) <= -65 )
+		goto st54;
 	goto st0;
-tr81:
-#line 25 "hpricot_css.rl"
+tr89:
+#line 34 "hpricot_css.rl"
 	{
-    aps = p;
+    ape = p;
+    aps2 = p;
   }
 	goto st68;
 st68:
@@ -2593,10 +2593,12 @@
 		goto _test_eof68;
 case 68:
 #line 2596 "hpricot_css.c"
-	if ( 4294967168 <= (*p) && (*p) <= 4294967231 )
-		goto st53;
+	if ( (*p) == 61 )
+		goto st56;
+	if ( (*p) <= -65 )
+		goto st69;
 	goto st0;
-tr82:
+tr79:
 #line 25 "hpricot_css.rl"
 	{
     aps = p;
@@ -2606,95 +2608,74 @@
 	if ( ++p == pe )
 		goto _test_eof69;
 case 69:
-#line 2610 "hpricot_css.c"
-	if ( 4294967168 <= (*p) && (*p) <= 4294967231 )
-		goto st68;
+#line 2612 "hpricot_css.c"
+	if ( (*p) <= -65 )
+		goto st67;
 	goto st0;
-tr83:
-#line 25 "hpricot_css.rl"
+tr90:
+#line 34 "hpricot_css.rl"
 	{
-    aps = p;
+    ape = p;
+    aps2 = p;
   }
 	goto st70;
 st70:
 	if ( ++p == pe )
 		goto _test_eof70;
 case 70:
-#line 2624 "hpricot_css.c"
-	if ( 4294967168 <= (*p) && (*p) <= 4294967231 )
-		goto st69;
-	goto st0;
-tr78:
-#line 25 "hpricot_css.rl"
+#line 2627 "hpricot_css.c"
+	switch( (*p) ) {
+		case 32: goto st70;
+		case 61: goto st71;
+	}
+	if ( 9 <= (*p) && (*p) <= 13 )
+		goto st70;
+	goto st55;
+tr92:
+#line 34 "hpricot_css.rl"
 	{
-    aps = p;
+    ape = p;
+    aps2 = p;
   }
 	goto st71;
 st71:
 	if ( ++p == pe )
 		goto _test_eof71;
 case 71:
-#line 2638 "hpricot_css.c"
-	if ( (*p) == 46 )
-		goto st53;
-	goto st0;
-tr79:
-#line 25 "hpricot_css.rl"
+#line 2646 "hpricot_css.c"
+	switch( (*p) ) {
+		case 32: goto tr96;
+		case 34: goto tr97;
+		case 39: goto tr98;
+		case 61: goto tr115;
+		case 93: goto st0;
+	}
+	if ( 9 <= (*p) && (*p) <= 13 )
+		goto tr96;
+	goto tr95;
+tr115:
+#line 39 "hpricot_css.rl"
 	{
-    aps = p;
+    ape2 = p;
+    PUSH(aps, ape);
+    PUSH(aps2, ape2);
   }
 	goto st72;
 st72:
 	if ( ++p == pe )
 		goto _test_eof72;
 case 72:
-#line 2652 "hpricot_css.c"
+#line 2669 "hpricot_css.c"
 	switch( (*p) ) {
-		case 32: goto tr85;
-		case 45: goto tr86;
-		case 61: goto tr87;
-		case 92: goto tr88;
-		case 95: goto tr86;
-		case 97: goto tr114;
-		case 4294967236: goto st67;
-	}
-	if ( (*p) < 65 ) {
-		if ( (*p) < 14 ) {
-			if ( (*p) > 8 ) {
-				if ( 9 <= (*p) && (*p) <= 13 )
-					goto tr85;
-			} else
-				goto tr84;
-		} else if ( (*p) > 47 ) {
-			if ( (*p) > 57 ) {
-				if ( 58 <= (*p) && (*p) <= 64 )
-					goto tr84;
-			} else if ( (*p) >= 48 )
-				goto tr86;
-		} else
-			goto tr84;
-	} else if ( (*p) > 90 ) {
-		if ( (*p) < 123 ) {
-			if ( (*p) > 96 ) {
-				if ( 98 <= (*p) && (*p) <= 122 )
-					goto tr86;
-			} else if ( (*p) >= 91 )
-				goto tr84;
-		} else if ( (*p) > 127 ) {
-			if ( (*p) < 4294967264 ) {
-				if ( 4294967237 <= (*p) && (*p) <= 4294967263 )
-					goto st68;
-			} else if ( (*p) > 4294967279 ) {
-				if ( 4294967280 <= (*p) && (*p) <= 4294967284 )
-					goto st70;
-			} else
-				goto st69;
-		} else
-			goto tr84;
-	} else
-		goto tr86;
-	goto st0;
-tr114:
+		case 32: goto tr96;
+		case 34: goto tr97;
+		case 39: goto tr98;
+		case 93: goto tr100;
+	}
+	if ( 9 <= (*p) && (*p) <= 13 )
+		goto tr96;
+	goto tr95;
+tr93:
 #line 34 "hpricot_css.rl"
 	{
     ape = p;
@@ -2705,389 +2686,403 @@
 	if ( ++p == pe )
 		goto _test_eof73;
 case 73:
-#line 2709 "hpricot_css.c"
+#line 2690 "hpricot_css.c"
 	switch( (*p) ) {
-		case 32: goto tr85;
-		case 45: goto tr86;
-		case 61: goto tr87;
-		case 92: goto tr88;
-		case 95: goto tr86;
-		case 109: goto tr115;
-		case 4294967236: goto st67;
-	}
-	if ( (*p) < 65 ) {
-		if ( (*p) < 14 ) {
-			if ( (*p) > 8 ) {
-				if ( 9 <= (*p) && (*p) <= 13 )
-					goto tr85;
-			} else
-				goto tr84;
-		} else if ( (*p) > 47 ) {
-			if ( (*p) > 57 ) {
-				if ( 58 <= (*p) && (*p) <= 64 )
-					goto tr84;
-			} else if ( (*p) >= 48 )
-				goto tr86;
-		} else
-			goto tr84;
-	} else if ( (*p) > 90 ) {
-		if ( (*p) < 123 ) {
-			if ( (*p) > 96 ) {
-				if ( 97 <= (*p) && (*p) <= 122 )
-					goto tr86;
-			} else if ( (*p) >= 91 )
-				goto tr84;
-		} else if ( (*p) > 127 ) {
-			if ( (*p) < 4294967264 ) {
-				if ( 4294967237 <= (*p) && (*p) <= 4294967263 )
-					goto st68;
-			} else if ( (*p) > 4294967279 ) {
-				if ( 4294967280 <= (*p) && (*p) <= 4294967284 )
-					goto st70;
-			} else
-				goto st69;
-		} else
-			goto tr84;
-	} else
-		goto tr86;
+		case 46: goto st54;
+		case 61: goto st56;
+	}
 	goto st0;
-tr115:
-#line 34 "hpricot_css.rl"
+tr80:
+#line 25 "hpricot_css.rl"
 	{
-    ape = p;
-    aps2 = p;
+    aps = p;
   }
 	goto st74;
 st74:
 	if ( ++p == pe )
 		goto _test_eof74;
 case 74:
-#line 2766 "hpricot_css.c"
-	switch( (*p) ) {
-		case 32: goto tr85;
-		case 45: goto tr86;
-		case 61: goto tr87;
-		case 92: goto tr88;
-		case 95: goto tr86;
-		case 101: goto tr116;
-		case 4294967236: goto st67;
-	}
-	if ( (*p) < 65 ) {
-		if ( (*p) < 14 ) {
-			if ( (*p) > 8 ) {
-				if ( 9 <= (*p) && (*p) <= 13 )
-					goto tr85;
-			} else
-				goto tr84;
-		} else if ( (*p) > 47 ) {
-			if ( (*p) > 57 ) {
-				if ( 58 <= (*p) && (*p) <= 64 )
-					goto tr84;
-			} else if ( (*p) >= 48 )
-				goto tr86;
-		} else
-			goto tr84;
-	} else if ( (*p) > 90 ) {
-		if ( (*p) < 123 ) {
-			if ( (*p) > 96 ) {
-				if ( 97 <= (*p) && (*p) <= 122 )
-					goto tr86;
-			} else if ( (*p) >= 91 )
-				goto tr84;
-		} else if ( (*p) > 127 ) {
-			if ( (*p) < 4294967264 ) {
-				if ( 4294967237 <= (*p) && (*p) <= 4294967263 )
-					goto st68;
-			} else if ( (*p) > 4294967279 ) {
-				if ( 4294967280 <= (*p) && (*p) <= 4294967284 )
-					goto st70;
-			} else
-				goto st69;
-		} else
-			goto tr84;
-	} else
-		goto tr86;
+#line 2706 "hpricot_css.c"
+	if ( (*p) <= -65 )
+		goto st69;
 	goto st0;
-tr116:
-#line 34 "hpricot_css.rl"
+tr82:
+#line 25 "hpricot_css.rl"
 	{
-    ape = p;
-    aps2 = p;
+    aps = p;
   }
 	goto st75;
 st75:
 	if ( ++p == pe )
 		goto _test_eof75;
 case 75:
-#line 2823 "hpricot_css.c"
-	switch( (*p) ) {
-		case 32: goto tr85;
-		case 45: goto tr86;
-		case 61: goto tr117;
-		case 92: goto tr88;
-		case 95: goto tr86;
-		case 4294967236: goto st67;
-	}
-	if ( (*p) < 65 ) {
-		if ( (*p) < 14 ) {
-			if ( (*p) > 8 ) {
-				if ( 9 <= (*p) && (*p) <= 13 )
-					goto tr85;
-			} else
-				goto tr84;
-		} else if ( (*p) > 47 ) {
-			if ( (*p) > 57 ) {
-				if ( 58 <= (*p) && (*p) <= 64 )
-					goto tr84;
-			} else if ( (*p) >= 48 )
-				goto tr86;
-		} else
-			goto tr84;
-	} else if ( (*p) > 90 ) {
-		if ( (*p) < 123 ) {
-			if ( (*p) > 96 ) {
-				if ( 97 <= (*p) && (*p) <= 122 )
-					goto tr86;
-			} else if ( (*p) >= 91 )
-				goto tr84;
-		} else if ( (*p) > 127 ) {
-			if ( (*p) < 4294967264 ) {
-				if ( 4294967237 <= (*p) && (*p) <= 4294967263 )
-					goto st68;
-			} else if ( (*p) > 4294967279 ) {
-				if ( 4294967280 <= (*p) && (*p) <= 4294967284 )
-					goto st70;
-			} else
-				goto st69;
-		} else
-			goto tr84;
-	} else
-		goto tr86;
+#line 2720 "hpricot_css.c"
+	if ( (*p) == 46 )
+		goto st54;
 	goto st0;
-tr117:
-#line 34 "hpricot_css.rl"
+tr83:
+#line 25 "hpricot_css.rl"
 	{
-    ape = p;
-    aps2 = p;
+    aps = p;
   }
 	goto st76;
 st76:
 	if ( ++p == pe )
 		goto _test_eof76;
 case 76:
-#line 2879 "hpricot_css.c"
+#line 2734 "hpricot_css.c"
 	switch( (*p) ) {
-		case 32: goto tr95;
-		case 34: goto tr96;
-		case 39: goto tr97;
-		case 45: goto tr118;
-		case 61: goto tr112;
-		case 91: goto tr94;
-		case 92: goto tr119;
-		case 95: goto tr118;
-		case 4294967236: goto tr120;
-	}
-	if ( (*p) < 65 ) {
-		if ( (*p) < 14 ) {
-			if ( (*p) > 8 ) {
-				if ( 9 <= (*p) && (*p) <= 13 )
-					goto tr95;
-			} else
-				goto tr94;
-		} else if ( (*p) > 47 ) {
-			if ( (*p) > 57 ) {
-				if ( 58 <= (*p) && (*p) <= 64 )
-					goto tr94;
-			} else if ( (*p) >= 48 )
-				goto tr118;
-		} else
-			goto tr94;
-	} else if ( (*p) > 90 ) {
-		if ( (*p) < 123 ) {
-			if ( (*p) > 96 ) {
-				if ( 97 <= (*p) && (*p) <= 122 )
-					goto tr118;
-			} else if ( (*p) >= 94 )
-				goto tr94;
-		} else if ( (*p) > 127 ) {
-			if ( (*p) < 4294967264 ) {
-				if ( 4294967237 <= (*p) && (*p) <= 4294967263 )
-					goto tr121;
-			} else if ( (*p) > 4294967279 ) {
-				if ( 4294967280 <= (*p) && (*p) <= 4294967284 )
-					goto tr123;
-			} else
-				goto tr122;
+		case -60: goto tr86;
+		case 32: goto tr90;
+		case 45: goto tr91;
+		case 61: goto tr92;
+		case 92: goto tr93;
+		case 95: goto tr91;
+		case 97: goto tr116;
+	}
+	if ( (*p) < 9 ) {
+		if ( (*p) < -32 ) {
+			if ( -59 <= (*p) && (*p) <= -33 )
+				goto tr87;
+		} else if ( (*p) > -17 ) {
+			if ( -16 <= (*p) && (*p) <= -12 )
+				goto tr89;
+		} else
+			goto tr88;
+	} else if ( (*p) > 13 ) {
+		if ( (*p) < 65 ) {
+			if ( 48 <= (*p) && (*p) <= 57 )
+				goto tr91;
+		} else if ( (*p) > 90 ) {
+			if ( 98 <= (*p) && (*p) <= 122 )
+				goto tr91;
 		} else
-			goto tr94;
+			goto tr91;
 	} else
-		goto tr118;
-	goto st0;
-tr118:
-#line 25 "hpricot_css.rl"
-	{
-    aps = p;
-  }
-#line 39 "hpricot_css.rl"
+		goto tr90;
+	goto tr85;
+tr116:
+#line 34 "hpricot_css.rl"
 	{
-    ape2 = p;
-    PUSH(aps, ape);
-    PUSH(aps2, ape2);
+    ape = p;
+    aps2 = p;
   }
 	goto st77;
 st77:
 	if ( ++p == pe )
 		goto _test_eof77;
 case 77:
-#line 2943 "hpricot_css.c"
+#line 2776 "hpricot_css.c"
 	switch( (*p) ) {
-		case 45: goto st77;
-		case 91: goto st56;
-		case 92: goto st78;
-		case 93: goto tr126;
-		case 94: goto st56;
-		case 96: goto st56;
-		case 4294967236: goto st79;
-	}
-	if ( (*p) < 65 ) {
-		if ( (*p) < 48 ) {
-			if ( (*p) <= 47 )
-				goto st56;
-		} else if ( (*p) > 57 ) {
-			if ( 58 <= (*p) && (*p) <= 64 )
-				goto st56;
-		} else
-			goto st77;
-	} else if ( (*p) > 122 ) {
-		if ( (*p) < 4294967237 ) {
-			if ( 123 <= (*p) )
-				goto st56;
-		} else if ( (*p) > 4294967263 ) {
-			if ( (*p) > 4294967279 ) {
-				if ( 4294967280 <= (*p) && (*p) <= 4294967284 )
-					goto st84;
-			} else if ( (*p) >= 4294967264 )
-				goto st83;
+		case -60: goto tr86;
+		case 32: goto tr90;
+		case 45: goto tr91;
+		case 61: goto tr92;
+		case 92: goto tr93;
+		case 95: goto tr91;
+		case 109: goto tr117;
+	}
+	if ( (*p) < 9 ) {
+		if ( (*p) < -32 ) {
+			if ( -59 <= (*p) && (*p) <= -33 )
+				goto tr87;
+		} else if ( (*p) > -17 ) {
+			if ( -16 <= (*p) && (*p) <= -12 )
+				goto tr89;
+		} else
+			goto tr88;
+	} else if ( (*p) > 13 ) {
+		if ( (*p) < 65 ) {
+			if ( 48 <= (*p) && (*p) <= 57 )
+				goto tr91;
+		} else if ( (*p) > 90 ) {
+			if ( 97 <= (*p) && (*p) <= 122 )
+				goto tr91;
 		} else
-			goto st82;
+			goto tr91;
 	} else
-		goto st77;
-	goto st0;
-tr119:
-#line 25 "hpricot_css.rl"
-	{
-    aps = p;
-  }
-#line 39 "hpricot_css.rl"
+		goto tr90;
+	goto tr85;
+tr117:
+#line 34 "hpricot_css.rl"
 	{
-    ape2 = p;
-    PUSH(aps, ape);
-    PUSH(aps2, ape2);
+    ape = p;
+    aps2 = p;
   }
 	goto st78;
 st78:
 	if ( ++p == pe )
 		goto _test_eof78;
 case 78:
-#line 2993 "hpricot_css.c"
+#line 2818 "hpricot_css.c"
 	switch( (*p) ) {
-		case 46: goto st77;
-		case 93: goto tr99;
-	}
-	goto st56;
-tr120:
-#line 25 "hpricot_css.rl"
+		case -60: goto tr86;
+		case 32: goto tr90;
+		case 45: goto tr91;
+		case 61: goto tr92;
+		case 92: goto tr93;
+		case 95: goto tr91;
+		case 101: goto tr118;
+	}
+	if ( (*p) < 9 ) {
+		if ( (*p) < -32 ) {
+			if ( -59 <= (*p) && (*p) <= -33 )
+				goto tr87;
+		} else if ( (*p) > -17 ) {
+			if ( -16 <= (*p) && (*p) <= -12 )
+				goto tr89;
+		} else
+			goto tr88;
+	} else if ( (*p) > 13 ) {
+		if ( (*p) < 65 ) {
+			if ( 48 <= (*p) && (*p) <= 57 )
+				goto tr91;
+		} else if ( (*p) > 90 ) {
+			if ( 97 <= (*p) && (*p) <= 122 )
+				goto tr91;
+		} else
+			goto tr91;
+	} else
+		goto tr90;
+	goto tr85;
+tr118:
+#line 34 "hpricot_css.rl"
 	{
-    aps = p;
+    ape = p;
+    aps2 = p;
   }
 	goto st79;
 st79:
 	if ( ++p == pe )
 		goto _test_eof79;
 case 79:
-#line 3009 "hpricot_css.c"
-	if ( 4294967208 <= (*p) && (*p) <= 4294967231 )
-		goto st80;
-	goto st0;
+#line 2860 "hpricot_css.c"
+	switch( (*p) ) {
+		case -60: goto tr86;
+		case 32: goto tr90;
+		case 45: goto tr91;
+		case 61: goto tr119;
+		case 92: goto tr93;
+		case 95: goto tr91;
+	}
+	if ( (*p) < 9 ) {
+		if ( (*p) < -32 ) {
+			if ( -59 <= (*p) && (*p) <= -33 )
+				goto tr87;
+		} else if ( (*p) > -17 ) {
+			if ( -16 <= (*p) && (*p) <= -12 )
+				goto tr89;
+		} else
+			goto tr88;
+	} else if ( (*p) > 13 ) {
+		if ( (*p) < 65 ) {
+			if ( 48 <= (*p) && (*p) <= 57 )
+				goto tr91;
+		} else if ( (*p) > 90 ) {
+			if ( 97 <= (*p) && (*p) <= 122 )
+				goto tr91;
+		} else
+			goto tr91;
+	} else
+		goto tr90;
+	goto tr85;
+tr119:
+#line 34 "hpricot_css.rl"
+	{
+    ape = p;
+    aps2 = p;
+  }
+	goto st80;
 st80:
 	if ( ++p == pe )
 		goto _test_eof80;
 case 80:
+#line 2901 "hpricot_css.c"
 	switch( (*p) ) {
-		case 45: goto st80;
-		case 92: goto st81;
-		case 93: goto tr126;
-		case 95: goto st80;
-		case 4294967236: goto st79;
-	}
-	if ( (*p) < 97 ) {
-		if ( (*p) > 57 ) {
-			if ( 65 <= (*p) && (*p) <= 90 )
-				goto st80;
-		} else if ( (*p) >= 48 )
-			goto st80;
-	} else if ( (*p) > 122 ) {
-		if ( (*p) < 4294967264 ) {
-			if ( 4294967237 <= (*p) && (*p) <= 4294967263 )
-				goto st82;
-		} else if ( (*p) > 4294967279 ) {
-			if ( 4294967280 <= (*p) && (*p) <= 4294967284 )
-				goto st84;
+		case -60: goto tr120;
+		case 32: goto tr96;
+		case 34: goto tr97;
+		case 39: goto tr98;
+		case 45: goto tr124;
+		case 61: goto tr115;
+		case 92: goto tr125;
+		case 93: goto st0;
+		case 95: goto tr124;
+	}
+	if ( (*p) < 9 ) {
+		if ( (*p) < -32 ) {
+			if ( -59 <= (*p) && (*p) <= -33 )
+				goto tr121;
+		} else if ( (*p) > -17 ) {
+			if ( -16 <= (*p) && (*p) <= -12 )
+				goto tr123;
+		} else
+			goto tr122;
+	} else if ( (*p) > 13 ) {
+		if ( (*p) < 65 ) {
+			if ( 48 <= (*p) && (*p) <= 57 )
+				goto tr124;
+		} else if ( (*p) > 90 ) {
+			if ( 97 <= (*p) && (*p) <= 122 )
+				goto tr124;
 		} else
-			goto st83;
+			goto tr124;
 	} else
-		goto st80;
-	goto st0;
+		goto tr96;
+	goto tr95;
+tr120:
+#line 25 "hpricot_css.rl"
+	{
+    aps = p;
+  }
+#line 39 "hpricot_css.rl"
+	{
+    ape2 = p;
+    PUSH(aps, ape);
+    PUSH(aps2, ape2);
+  }
+	goto st81;
 st81:
 	if ( ++p == pe )
 		goto _test_eof81;
 case 81:
-	if ( (*p) == 46 )
-		goto st80;
-	goto st0;
-tr121:
+#line 2950 "hpricot_css.c"
+	if ( (*p) == 93 )
+		goto tr100;
+	if ( -88 <= (*p) && (*p) <= -65 )
+		goto st82;
+	goto st57;
+tr124:
 #line 25 "hpricot_css.rl"
 	{
     aps = p;
   }
+#line 39 "hpricot_css.rl"
+	{
+    ape2 = p;
+    PUSH(aps, ape);
+    PUSH(aps2, ape2);
+  }
 	goto st82;
 st82:
 	if ( ++p == pe )
 		goto _test_eof82;
 case 82:
-#line 3059 "hpricot_css.c"
-	if ( 4294967168 <= (*p) && (*p) <= 4294967231 )
-		goto st80;
-	goto st0;
-tr122:
+#line 2972 "hpricot_css.c"
+	switch( (*p) ) {
+		case -60: goto st81;
+		case 45: goto st82;
+		case 92: goto st86;
+		case 93: goto tr132;
+		case 95: goto st82;
+	}
+	if ( (*p) < -16 ) {
+		if ( (*p) > -33 ) {
+			if ( -32 <= (*p) && (*p) <= -17 )
+				goto st84;
+		} else if ( (*p) >= -59 )
+			goto st83;
+	} else if ( (*p) > -12 ) {
+		if ( (*p) < 65 ) {
+			if ( 48 <= (*p) && (*p) <= 57 )
+				goto st82;
+		} else if ( (*p) > 90 ) {
+			if ( 97 <= (*p) && (*p) <= 122 )
+				goto st82;
+		} else
+			goto st82;
+	} else
+		goto st85;
+	goto st57;
+tr121:
 #line 25 "hpricot_css.rl"
 	{
     aps = p;
   }
+#line 39 "hpricot_css.rl"
+	{
+    ape2 = p;
+    PUSH(aps, ape);
+    PUSH(aps2, ape2);
+  }
 	goto st83;
 st83:
 	if ( ++p == pe )
 		goto _test_eof83;
 case 83:
-#line 3073 "hpricot_css.c"
-	if ( 4294967168 <= (*p) && (*p) <= 4294967231 )
+#line 3014 "hpricot_css.c"
+	if ( (*p) == 93 )
+		goto tr100;
+	if ( (*p) <= -65 )
 		goto st82;
-	goto st0;
-tr123:
+	goto st57;
+tr122:
 #line 25 "hpricot_css.rl"
 	{
     aps = p;
   }
+#line 39 "hpricot_css.rl"
+	{
+    ape2 = p;
+    PUSH(aps, ape);
+    PUSH(aps2, ape2);
+  }
 	goto st84;
 st84:
 	if ( ++p == pe )
 		goto _test_eof84;
 case 84:
-#line 3087 "hpricot_css.c"
-	if ( 4294967168 <= (*p) && (*p) <= 4294967231 )
+#line 3036 "hpricot_css.c"
+	if ( (*p) == 93 )
+		goto tr100;
+	if ( (*p) <= -65 )
 		goto st83;
-	goto st0;
-tr143:
+	goto st57;
+tr123:
+#line 25 "hpricot_css.rl"
+	{
+    aps = p;
+  }
+#line 39 "hpricot_css.rl"
+	{
+    ape2 = p;
+    PUSH(aps, ape);
+    PUSH(aps2, ape2);
+  }
+	goto st85;
+st85:
+	if ( ++p == pe )
+		goto _test_eof85;
+case 85:
+#line 3058 "hpricot_css.c"
+	if ( (*p) == 93 )
+		goto tr100;
+	if ( (*p) <= -65 )
+		goto st84;
+	goto st57;
+tr125:
+#line 25 "hpricot_css.rl"
+	{
+    aps = p;
+  }
+#line 39 "hpricot_css.rl"
+	{
+    ape2 = p;
+    PUSH(aps, ape);
+    PUSH(aps2, ape2);
+  }
+	goto st86;
+st86:
+	if ( ++p == pe )
+		goto _test_eof86;
+case 86:
+#line 3080 "hpricot_css.c"
+	switch( (*p) ) {
+		case 46: goto st82;
+		case 93: goto tr100;
+	}
+	goto st57;
+tr147:
 #line 1 "hpricot_css.rl"
 	{te = p+1;}
 #line 25 "hpricot_css.rl"
@@ -3096,109 +3091,109 @@
   }
 #line 76 "hpricot_css.rl"
 	{act = 5;}
-	goto st120;
-st120:
+	goto st122;
+st122:
 	if ( ++p == pe )
-		goto _test_eof120;
-case 120:
-#line 3105 "hpricot_css.c"
+		goto _test_eof122;
+case 122:
+#line 3100 "hpricot_css.c"
 	switch( (*p) ) {
-		case 45: goto tr14;
-		case 92: goto st8;
-		case 95: goto tr14;
-		case 118: goto tr197;
-		case 4294967236: goto st9;
-	}
-	if ( (*p) < 97 ) {
-		if ( (*p) > 57 ) {
-			if ( 65 <= (*p) && (*p) <= 90 )
-				goto tr14;
-		} else if ( (*p) >= 48 )
-			goto tr14;
-	} else if ( (*p) > 122 ) {
-		if ( (*p) < 4294967264 ) {
-			if ( 4294967237 <= (*p) && (*p) <= 4294967263 )
-				goto st10;
-		} else if ( (*p) > 4294967279 ) {
-			if ( 4294967280 <= (*p) && (*p) <= 4294967284 )
-				goto st12;
+		case -60: goto st1;
+		case 45: goto tr1;
+		case 92: goto st5;
+		case 95: goto tr1;
+		case 118: goto tr201;
+	}
+	if ( (*p) < -16 ) {
+		if ( (*p) > -33 ) {
+			if ( -32 <= (*p) && (*p) <= -17 )
+				goto st3;
+		} else if ( (*p) >= -59 )
+			goto st2;
+	} else if ( (*p) > -12 ) {
+		if ( (*p) < 65 ) {
+			if ( 48 <= (*p) && (*p) <= 57 )
+				goto tr1;
+		} else if ( (*p) > 90 ) {
+			if ( 97 <= (*p) && (*p) <= 122 )
+				goto tr1;
 		} else
-			goto st11;
+			goto tr1;
 	} else
-		goto tr14;
-	goto tr156;
-tr197:
+		goto st4;
+	goto tr149;
+tr201:
 #line 1 "hpricot_css.rl"
 	{te = p+1;}
 #line 76 "hpricot_css.rl"
 	{act = 5;}
-	goto st121;
-st121:
+	goto st123;
+st123:
 	if ( ++p == pe )
-		goto _test_eof121;
-case 121:
-#line 3141 "hpricot_css.c"
+		goto _test_eof123;
+case 123:
+#line 3136 "hpricot_css.c"
 	switch( (*p) ) {
-		case 45: goto tr14;
-		case 92: goto st8;
-		case 95: goto tr14;
-		case 101: goto tr198;
-		case 4294967236: goto st9;
-	}
-	if ( (*p) < 97 ) {
-		if ( (*p) > 57 ) {
-			if ( 65 <= (*p) && (*p) <= 90 )
-				goto tr14;
-		} else if ( (*p) >= 48 )
-			goto tr14;
-	} else if ( (*p) > 122 ) {
-		if ( (*p) < 4294967264 ) {
-			if ( 4294967237 <= (*p) && (*p) <= 4294967263 )
-				goto st10;
-		} else if ( (*p) > 4294967279 ) {
-			if ( 4294967280 <= (*p) && (*p) <= 4294967284 )
-				goto st12;
+		case -60: goto st1;
+		case 45: goto tr1;
+		case 92: goto st5;
+		case 95: goto tr1;
+		case 101: goto tr202;
+	}
+	if ( (*p) < -16 ) {
+		if ( (*p) > -33 ) {
+			if ( -32 <= (*p) && (*p) <= -17 )
+				goto st3;
+		} else if ( (*p) >= -59 )
+			goto st2;
+	} else if ( (*p) > -12 ) {
+		if ( (*p) < 65 ) {
+			if ( 48 <= (*p) && (*p) <= 57 )
+				goto tr1;
+		} else if ( (*p) > 90 ) {
+			if ( 97 <= (*p) && (*p) <= 122 )
+				goto tr1;
 		} else
-			goto st11;
+			goto tr1;
 	} else
-		goto tr14;
-	goto tr156;
-tr198:
+		goto st4;
+	goto tr149;
+tr202:
 #line 1 "hpricot_css.rl"
 	{te = p+1;}
 #line 76 "hpricot_css.rl"
 	{act = 5;}
-	goto st122;
-st122:
+	goto st124;
+st124:
 	if ( ++p == pe )
-		goto _test_eof122;
-case 122:
-#line 3177 "hpricot_css.c"
+		goto _test_eof124;
+case 124:
+#line 3172 "hpricot_css.c"
 	switch( (*p) ) {
-		case 45: goto tr14;
-		case 92: goto st8;
-		case 95: goto tr14;
-		case 4294967236: goto st9;
-	}
-	if ( (*p) < 97 ) {
-		if ( (*p) > 57 ) {
-			if ( 65 <= (*p) && (*p) <= 90 )
-				goto tr14;
-		} else if ( (*p) >= 48 )
-			goto tr14;
-	} else if ( (*p) > 122 ) {
-		if ( (*p) < 4294967264 ) {
-			if ( 4294967237 <= (*p) && (*p) <= 4294967263 )
-				goto st10;
-		} else if ( (*p) > 4294967279 ) {
-			if ( 4294967280 <= (*p) && (*p) <= 4294967284 )
-				goto st12;
+		case -60: goto st1;
+		case 45: goto tr1;
+		case 92: goto st5;
+		case 95: goto tr1;
+	}
+	if ( (*p) < -16 ) {
+		if ( (*p) > -33 ) {
+			if ( -32 <= (*p) && (*p) <= -17 )
+				goto st3;
+		} else if ( (*p) >= -59 )
+			goto st2;
+	} else if ( (*p) > -12 ) {
+		if ( (*p) < 65 ) {
+			if ( 48 <= (*p) && (*p) <= 57 )
+				goto tr1;
+		} else if ( (*p) > 90 ) {
+			if ( 97 <= (*p) && (*p) <= 122 )
+				goto tr1;
 		} else
-			goto st11;
+			goto tr1;
 	} else
-		goto tr14;
-	goto tr156;
-tr144:
+		goto st4;
+	goto tr149;
+tr148:
 #line 1 "hpricot_css.rl"
 	{te = p+1;}
 #line 25 "hpricot_css.rl"
@@ -3207,102 +3202,102 @@
   }
 #line 76 "hpricot_css.rl"
 	{act = 5;}
-	goto st123;
-st123:
+	goto st125;
+st125:
 	if ( ++p == pe )
-		goto _test_eof123;
-case 123:
-#line 3216 "hpricot_css.c"
-	switch( (*p) ) {
-		case 45: goto tr14;
-		case 92: goto st8;
-		case 95: goto tr14;
-		case 100: goto tr199;
-		case 4294967236: goto st9;
-	}
-	if ( (*p) < 97 ) {
-		if ( (*p) > 57 ) {
-			if ( 65 <= (*p) && (*p) <= 90 )
-				goto tr14;
-		} else if ( (*p) >= 48 )
-			goto tr14;
-	} else if ( (*p) > 122 ) {
-		if ( (*p) < 4294967264 ) {
-			if ( 4294967237 <= (*p) && (*p) <= 4294967263 )
-				goto st10;
-		} else if ( (*p) > 4294967279 ) {
-			if ( 4294967280 <= (*p) && (*p) <= 4294967284 )
-				goto st12;
+		goto _test_eof125;
+case 125:
+#line 3211 "hpricot_css.c"
+	switch( (*p) ) {
+		case -60: goto st1;
+		case 45: goto tr1;
+		case 92: goto st5;
+		case 95: goto tr1;
+		case 100: goto tr203;
+	}
+	if ( (*p) < -16 ) {
+		if ( (*p) > -33 ) {
+			if ( -32 <= (*p) && (*p) <= -17 )
+				goto st3;
+		} else if ( (*p) >= -59 )
+			goto st2;
+	} else if ( (*p) > -12 ) {
+		if ( (*p) < 65 ) {
+			if ( 48 <= (*p) && (*p) <= 57 )
+				goto tr1;
+		} else if ( (*p) > 90 ) {
+			if ( 97 <= (*p) && (*p) <= 122 )
+				goto tr1;
 		} else
-			goto st11;
+			goto tr1;
 	} else
-		goto tr14;
-	goto tr156;
-tr199:
+		goto st4;
+	goto tr149;
+tr203:
 #line 1 "hpricot_css.rl"
 	{te = p+1;}
 #line 76 "hpricot_css.rl"
 	{act = 5;}
-	goto st124;
-st124:
+	goto st126;
+st126:
 	if ( ++p == pe )
-		goto _test_eof124;
-case 124:
-#line 3252 "hpricot_css.c"
-	switch( (*p) ) {
-		case 45: goto tr14;
-		case 92: goto st8;
-		case 95: goto tr14;
-		case 4294967236: goto st9;
-	}
-	if ( (*p) < 97 ) {
-		if ( (*p) > 57 ) {
-			if ( 65 <= (*p) && (*p) <= 90 )
-				goto tr14;
-		} else if ( (*p) >= 48 )
-			goto tr14;
-	} else if ( (*p) > 122 ) {
-		if ( (*p) < 4294967264 ) {
-			if ( 4294967237 <= (*p) && (*p) <= 4294967263 )
-				goto st10;
-		} else if ( (*p) > 4294967279 ) {
-			if ( 4294967280 <= (*p) && (*p) <= 4294967284 )
-				goto st12;
+		goto _test_eof126;
+case 126:
+#line 3247 "hpricot_css.c"
+	switch( (*p) ) {
+		case -60: goto st1;
+		case 45: goto tr1;
+		case 92: goto st5;
+		case 95: goto tr1;
+	}
+	if ( (*p) < -16 ) {
+		if ( (*p) > -33 ) {
+			if ( -32 <= (*p) && (*p) <= -17 )
+				goto st3;
+		} else if ( (*p) >= -59 )
+			goto st2;
+	} else if ( (*p) > -12 ) {
+		if ( (*p) < 65 ) {
+			if ( 48 <= (*p) && (*p) <= 57 )
+				goto tr1;
+		} else if ( (*p) > 90 ) {
+			if ( 97 <= (*p) && (*p) <= 122 )
+				goto tr1;
 		} else
-			goto st11;
+			goto tr1;
 	} else
-		goto tr14;
-	goto tr156;
+		goto st4;
+	goto tr149;
 	}
-	_test_eof85: cs = 85; goto _test_eof; 
-	_test_eof86: cs = 86; goto _test_eof; 
-	_test_eof1: cs = 1; goto _test_eof; 
 	_test_eof87: cs = 87; goto _test_eof; 
-	_test_eof2: cs = 2; goto _test_eof; 
+	_test_eof1: cs = 1; goto _test_eof; 
 	_test_eof88: cs = 88; goto _test_eof; 
+	_test_eof2: cs = 2; goto _test_eof; 
 	_test_eof3: cs = 3; goto _test_eof; 
 	_test_eof4: cs = 4; goto _test_eof; 
 	_test_eof5: cs = 5; goto _test_eof; 
-	_test_eof6: cs = 6; goto _test_eof; 
-	_test_eof7: cs = 7; goto _test_eof; 
 	_test_eof89: cs = 89; goto _test_eof; 
+	_test_eof6: cs = 6; goto _test_eof; 
 	_test_eof90: cs = 90; goto _test_eof; 
-	_test_eof91: cs = 91; goto _test_eof; 
+	_test_eof7: cs = 7; goto _test_eof; 
 	_test_eof8: cs = 8; goto _test_eof; 
+	_test_eof91: cs = 91; goto _test_eof; 
 	_test_eof9: cs = 9; goto _test_eof; 
 	_test_eof10: cs = 10; goto _test_eof; 
 	_test_eof11: cs = 11; goto _test_eof; 
 	_test_eof12: cs = 12; goto _test_eof; 
-	_test_eof13: cs = 13; goto _test_eof; 
 	_test_eof92: cs = 92; goto _test_eof; 
+	_test_eof93: cs = 93; goto _test_eof; 
+	_test_eof13: cs = 13; goto _test_eof; 
 	_test_eof14: cs = 14; goto _test_eof; 
+	_test_eof94: cs = 94; goto _test_eof; 
 	_test_eof15: cs = 15; goto _test_eof; 
 	_test_eof16: cs = 16; goto _test_eof; 
 	_test_eof17: cs = 17; goto _test_eof; 
 	_test_eof18: cs = 18; goto _test_eof; 
 	_test_eof19: cs = 19; goto _test_eof; 
-	_test_eof93: cs = 93; goto _test_eof; 
 	_test_eof20: cs = 20; goto _test_eof; 
+	_test_eof95: cs = 95; goto _test_eof; 
 	_test_eof21: cs = 21; goto _test_eof; 
 	_test_eof22: cs = 22; goto _test_eof; 
 	_test_eof23: cs = 23; goto _test_eof; 
@@ -3324,12 +3319,10 @@
 	_test_eof39: cs = 39; goto _test_eof; 
 	_test_eof40: cs = 40; goto _test_eof; 
 	_test_eof41: cs = 41; goto _test_eof; 
-	_test_eof94: cs = 94; goto _test_eof; 
-	_test_eof95: cs = 95; goto _test_eof; 
-	_test_eof42: cs = 42; goto _test_eof; 
-	_test_eof43: cs = 43; goto _test_eof; 
 	_test_eof96: cs = 96; goto _test_eof; 
 	_test_eof97: cs = 97; goto _test_eof; 
+	_test_eof42: cs = 42; goto _test_eof; 
+	_test_eof43: cs = 43; goto _test_eof; 
 	_test_eof98: cs = 98; goto _test_eof; 
 	_test_eof99: cs = 99; goto _test_eof; 
 	_test_eof100: cs = 100; goto _test_eof; 
@@ -3341,6 +3334,8 @@
 	_test_eof106: cs = 106; goto _test_eof; 
 	_test_eof107: cs = 107; goto _test_eof; 
 	_test_eof108: cs = 108; goto _test_eof; 
+	_test_eof109: cs = 109; goto _test_eof; 
+	_test_eof110: cs = 110; goto _test_eof; 
 	_test_eof44: cs = 44; goto _test_eof; 
 	_test_eof45: cs = 45; goto _test_eof; 
 	_test_eof46: cs = 46; goto _test_eof; 
@@ -3349,8 +3344,6 @@
 	_test_eof49: cs = 49; goto _test_eof; 
 	_test_eof50: cs = 50; goto _test_eof; 
 	_test_eof51: cs = 51; goto _test_eof; 
-	_test_eof109: cs = 109; goto _test_eof; 
-	_test_eof110: cs = 110; goto _test_eof; 
 	_test_eof111: cs = 111; goto _test_eof; 
 	_test_eof112: cs = 112; goto _test_eof; 
 	_test_eof113: cs = 113; goto _test_eof; 
@@ -3358,6 +3351,8 @@
 	_test_eof115: cs = 115; goto _test_eof; 
 	_test_eof116: cs = 116; goto _test_eof; 
 	_test_eof117: cs = 117; goto _test_eof; 
+	_test_eof118: cs = 118; goto _test_eof; 
+	_test_eof119: cs = 119; goto _test_eof; 
 	_test_eof52: cs = 52; goto _test_eof; 
 	_test_eof53: cs = 53; goto _test_eof; 
 	_test_eof54: cs = 54; goto _test_eof; 
@@ -3365,12 +3360,12 @@
 	_test_eof56: cs = 56; goto _test_eof; 
 	_test_eof57: cs = 57; goto _test_eof; 
 	_test_eof58: cs = 58; goto _test_eof; 
-	_test_eof118: cs = 118; goto _test_eof; 
 	_test_eof59: cs = 59; goto _test_eof; 
+	_test_eof120: cs = 120; goto _test_eof; 
 	_test_eof60: cs = 60; goto _test_eof; 
 	_test_eof61: cs = 61; goto _test_eof; 
-	_test_eof119: cs = 119; goto _test_eof; 
 	_test_eof62: cs = 62; goto _test_eof; 
+	_test_eof121: cs = 121; goto _test_eof; 
 	_test_eof63: cs = 63; goto _test_eof; 
 	_test_eof64: cs = 64; goto _test_eof; 
 	_test_eof65: cs = 65; goto _test_eof; 
@@ -3393,79 +3388,81 @@
 	_test_eof82: cs = 82; goto _test_eof; 
 	_test_eof83: cs = 83; goto _test_eof; 
 	_test_eof84: cs = 84; goto _test_eof; 
-	_test_eof120: cs = 120; goto _test_eof; 
-	_test_eof121: cs = 121; goto _test_eof; 
+	_test_eof85: cs = 85; goto _test_eof; 
+	_test_eof86: cs = 86; goto _test_eof; 
 	_test_eof122: cs = 122; goto _test_eof; 
 	_test_eof123: cs = 123; goto _test_eof; 
 	_test_eof124: cs = 124; goto _test_eof; 
+	_test_eof125: cs = 125; goto _test_eof; 
+	_test_eof126: cs = 126; goto _test_eof; 
 
 	_test_eof: {}
 	if ( p == eof )
 	{
 	switch ( cs ) {
-	case 86: goto tr149;
 	case 1: goto tr0;
-	case 87: goto tr150;
-	case 88: goto tr151;
-	case 3: goto tr10;
-	case 4: goto tr10;
-	case 5: goto tr10;
-	case 6: goto tr10;
-	case 7: goto tr10;
-	case 89: goto tr155;
-	case 90: goto tr156;
-	case 91: goto tr156;
-	case 8: goto tr10;
-	case 9: goto tr10;
-	case 10: goto tr10;
-	case 11: goto tr10;
-	case 12: goto tr10;
-	case 92: goto tr162;
-	case 14: goto tr10;
-	case 15: goto tr10;
-	case 16: goto tr10;
-	case 17: goto tr10;
-	case 18: goto tr10;
-	case 93: goto tr166;
-	case 20: goto tr38;
-	case 21: goto tr10;
-	case 22: goto tr10;
-	case 23: goto tr10;
-	case 24: goto tr10;
-	case 25: goto tr10;
-	case 26: goto tr10;
-	case 27: goto tr10;
-	case 28: goto tr10;
-	case 29: goto tr10;
-	case 30: goto tr10;
-	case 31: goto tr10;
-	case 32: goto tr10;
-	case 33: goto tr10;
-	case 34: goto tr10;
-	case 35: goto tr10;
-	case 36: goto tr10;
-	case 37: goto tr10;
-	case 38: goto tr10;
-	case 39: goto tr10;
-	case 40: goto tr10;
-	case 41: goto tr10;
-	case 94: goto tr166;
-	case 95: goto tr173;
+	case 88: goto tr149;
+	case 2: goto tr0;
+	case 3: goto tr0;
+	case 4: goto tr0;
+	case 5: goto tr0;
+	case 89: goto tr153;
+	case 6: goto tr4;
+	case 90: goto tr154;
+	case 8: goto tr0;
+	case 91: goto tr155;
+	case 9: goto tr0;
+	case 10: goto tr0;
+	case 11: goto tr0;
+	case 12: goto tr0;
+	case 92: goto tr159;
+	case 93: goto tr149;
+	case 14: goto tr0;
+	case 94: goto tr162;
+	case 15: goto tr0;
+	case 16: goto tr0;
+	case 17: goto tr0;
+	case 18: goto tr0;
+	case 20: goto tr0;
+	case 95: goto tr166;
+	case 21: goto tr0;
+	case 22: goto tr0;
+	case 23: goto tr0;
+	case 24: goto tr41;
+	case 25: goto tr0;
+	case 26: goto tr0;
+	case 27: goto tr0;
+	case 28: goto tr0;
+	case 29: goto tr0;
+	case 30: goto tr0;
+	case 31: goto tr0;
+	case 32: goto tr0;
+	case 33: goto tr0;
+	case 34: goto tr0;
+	case 35: goto tr0;
+	case 36: goto tr0;
+	case 37: goto tr0;
+	case 38: goto tr0;
+	case 39: goto tr0;
+	case 40: goto tr0;
+	case 41: goto tr0;
+	case 96: goto tr166;
+	case 97: goto tr173;
 	case 42: goto tr62;
 	case 43: goto tr62;
-	case 96: goto tr166;
-	case 97: goto tr166;
 	case 98: goto tr166;
 	case 99: goto tr166;
 	case 100: goto tr166;
 	case 101: goto tr166;
-	case 102: goto tr173;
+	case 102: goto tr166;
 	case 103: goto tr166;
-	case 104: goto tr166;
+	case 104: goto tr173;
 	case 105: goto tr166;
 	case 106: goto tr166;
 	case 107: goto tr166;
-	case 108: goto tr188;
+	case 108: goto tr166;
+	case 109: goto tr166;
+	case 110: goto tr192;
 	case 44: goto tr66;
 	case 45: goto tr66;
 	case 46: goto tr66;
@@ -3474,8 +3471,6 @@
 	case 49: goto tr66;
 	case 50: goto tr66;
 	case 51: goto tr66;
-	case 109: goto tr166;
-	case 110: goto tr166;
 	case 111: goto tr166;
 	case 112: goto tr166;
 	case 113: goto tr166;
@@ -3483,16 +3478,18 @@
 	case 115: goto tr166;
 	case 116: goto tr166;
 	case 117: goto tr166;
-	case 118: goto tr196;
-	case 59: goto tr104;
-	case 60: goto tr104;
-	case 119: goto tr196;
-	case 62: goto tr104;
-	case 120: goto tr156;
-	case 121: goto tr156;
-	case 122: goto tr156;
-	case 123: goto tr156;
-	case 124: goto tr156;
+	case 118: goto tr166;
+	case 119: goto tr166;
+	case 120: goto tr200;
+	case 60: goto tr105;
+	case 61: goto tr105;
+	case 121: goto tr200;
+	case 63: goto tr105;
+	case 122: goto tr149;
+	case 123: goto tr149;
+	case 124: goto tr149;
+	case 125: goto tr149;
+	case 126: goto tr149;
 	}
 	}
 
diff -Nru /tmp/aPeI5X1Iz5/libhpricot-ruby-0.8/ext/hpricot_scan/HpricotCss.java /tmp/kCvPnLCzlr/libhpricot-ruby-0.8.2/ext/hpricot_scan/HpricotCss.java
--- libhpricot-ruby-0.8/ext/hpricot_scan/HpricotCss.java	1970-01-01 01:00:00.000000000 +0100
+++ libhpricot-ruby-0.8.2/ext/hpricot_scan/HpricotCss.java	2009-12-13 23:54:10.000000000 +0000
@@ -0,0 +1,831 @@
+// line 1 "hpricot_css.java.rl"
+import java.io.IOException;
+
+import org.jruby.Ruby;
+import org.jruby.RubyArray;
+import org.jruby.RubyClass;
+import org.jruby.RubyHash;
+import org.jruby.RubyModule;
+import org.jruby.RubyNumeric;
+import org.jruby.RubyObject;
+import org.jruby.RubyObjectAdapter;
+import org.jruby.RubyRegexp;
+import org.jruby.RubyString;
+import org.jruby.anno.JRubyMethod;
+import org.jruby.exceptions.RaiseException;
+import org.jruby.javasupport.JavaEmbedUtils;
+import org.jruby.runtime.Arity;
+import org.jruby.runtime.Block;
+import org.jruby.runtime.ObjectAllocator;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.jruby.runtime.callback.Callback;
+import org.jruby.exceptions.RaiseException;
+import org.jruby.runtime.load.BasicLibraryService;
+import org.jruby.util.ByteList;
+
+public class HpricotCss {
+    public void FILTER(String id) {
+        IRubyObject[] args = new IRubyObject[fargs];
+        System.arraycopy(fvals, 0, args, 0, fargs);
+        mod.callMethod(ctx, id, args);
+        tmpt.rb_clear();
+        fargs = 1;
+    }
+
+    public void FILTERAUTO() {
+        try {
+            FILTER(new String(data, ts, te - ts, "ISO-8859-1"));
+        } catch(java.io.UnsupportedEncodingException e) {}
+    }
+
+    public void PUSH(int aps, int ape) {
+        RubyString str = RubyString.newString(runtime, data, aps, ape-aps);
+        fvals[fargs++] = str;
+        tmpt.append(str);
+    }
+
+    private IRubyObject self, mod, str, node;
+    private int cs, act, eof, p, pe, ts, te, aps, ape, aps2, ape2;
+    private byte[] data;
+
+    private int fargs = 1;
+    private IRubyObject[] fvals = new IRubyObject[6];
+    private RubyArray focus;
+    private RubyArray tmpt;
+    private Ruby runtime;
+    private ThreadContext ctx;
+
+    public HpricotCss(IRubyObject self, IRubyObject mod, IRubyObject str, IRubyObject node) {
+        this.self = self;
+        this.mod = mod;
+        this.str = str;
+        this.node = node;
+        this.runtime = self.getRuntime();
+        this.ctx = runtime.getCurrentContext();
+        this.focus = RubyArray.newArray(runtime, node);
+        this.tmpt = runtime.newArray();
+
+        fvals[0] = focus;
+
+        if(!(str instanceof RubyString)) {
+            throw runtime.newArgumentError("bad CSS selector, String only please.");
+        }
+
+        ByteList bl = ((RubyString)str).getByteList();
+
+        data = bl.bytes;
+        p = bl.begin;
+        pe = p + bl.realSize;
+        eof = pe;
+    }
+    
+
+// line 85 "HpricotCss.java"
+private static byte[] init__hpricot_css_actions_0()
+{
+	return new byte [] {
+	    0,    1,    0,    1,    1,    1,    2,    1,    3,    1,    6,    1,
+	    7,    1,   15,    1,   19,    1,   22,    1,   24,    1,   28,    1,
+	   29,    1,   30,    1,   31,    1,   32,    1,   33,    1,   34,    1,
+	   35,    2,    0,    3,    2,    1,   14,    2,    1,   16,    2,    1,
+	   17,    2,    1,   18,    2,    1,   20,    2,    1,   21,    2,    1,
+	   23,    2,    1,   25,    2,    1,   26,    2,    1,   27,    2,    4,
+	    5,    2,    7,    8,    2,    7,    9,    2,    7,   10,    2,    7,
+	   11,    2,    7,   12,    2,    7,   13,    3,    0,    1,   16,    3,
+	    0,    1,   18,    3,    7,    0,    8,    3,    7,    0,    9,    3,
+	    7,    0,   10,    3,    7,    0,   13,    3,    7,    1,   13
+	};
+}
+
+private static final byte _hpricot_css_actions[] = init__hpricot_css_actions_0();
+
+
+private static short[] init__hpricot_css_key_offsets_0()
+{
+	return new short [] {
+	    0,    0,    4,   20,   21,   23,   25,   27,   29,   30,   32,   34,
+	   36,   38,   54,   55,   57,   59,   61,   63,   85,   89,   92,   95,
+	   98,   99,  100,  101,  103,  107,  111,  114,  115,  116,  118,  119,
+	  120,  122,  123,  125,  127,  129,  131,  137,  142,  153,  161,  165,
+	  169,  173,  176,  180,  184,  201,  221,  222,  228,  229,  235,  237,
+	  238,  239,  241,  242,  246,  253,  259,  261,  264,  267,  270,  272,
+	  275,  277,  278,  299,  320,  341,  361,  384,  401,  403,  406,  409,
+	  412,  415,  417,  419,  449,  453,  456,  472,  477,  495,  511,  527,
+	  544,  563,  580,  598,  616,  634,  652,  670,  688,  705,  723,  741,
+	  759,  777,  795,  812,  830,  849,  867,  885,  904,  922,  940,  958,
+	  975,  976,  977,  994, 1011, 1027, 1044
+	};
+}
+
+private static final short _hpricot_css_key_offsets[] = init__hpricot_css_key_offsets_0();
+
+
+private static char[] init__hpricot_css_trans_keys_0()
+{
+	return new char [] {
+	   32,   44,    9,   13,   45,   92,   95,  196,   48,   57,   65,   90,
+	   97,  122,  197,  223,  224,  239,  240,  244,   46,  168,  191,  128,
+	  191,  128,  191,  128,  191,   46,  168,  191,  128,  191,  128,  191,
+	  128,  191,   45,   92,   95,  196,   48,   57,   65,   90,   97,  122,
+	  197,  223,  224,  239,  240,  244,   46,  168,  191,  128,  191,  128,
+	  191,  128,  191,   45,   92,   95,  101,  102,  103,  108,  110,  111,
+	  196,   48,   57,   65,   90,   97,  122,  197,  223,  224,  239,  240,
+	  244,   34,   39,   40,   41,   34,   40,   41,   34,   40,   41,   34,
+	   40,   41,   41,   41,   41,   34,   40,   34,   39,   40,   41,   34,
+	   39,   40,   41,   39,   40,   41,   41,   41,   39,   40,   41,   41,
+	   40,   41,   46,  168,  191,  128,  191,  128,  191,  128,  191,   34,
+	   39,   40,   41,   48,   57,   34,   40,   41,   48,   57,   34,   39,
+	   40,   41,   43,   45,  101,  110,  111,   48,   57,   34,   40,   41,
+	   43,   45,  110,   48,   57,   34,   40,   41,  118,   34,   40,   41,
+	  101,   34,   40,   41,  110,   34,   40,   41,   34,   40,   41,  100,
+	   34,   40,   41,  100,   45,   92,   95,  110,  196,   48,   57,   65,
+	   90,   97,  122,  197,  223,  224,  239,  240,  244,   32,   45,   61,
+	   92,   95,  196,    9,   13,   48,   57,   65,   90,   97,  122,  197,
+	  223,  224,  239,  240,  244,   61,   32,   34,   39,   93,    9,   13,
+	   93,   32,   34,   39,   93,    9,   13,   34,   93,   34,   93,   39,
+	   93,   39,   32,   61,    9,   13,   32,   34,   39,   61,   93,    9,
+	   13,   32,   34,   39,   93,    9,   13,   46,   61,   61,  168,  191,
+	   61,  128,  191,   61,  128,  191,  128,  191,   61,  128,  191,  128,
+	  191,   46,   32,   45,   61,   92,   95,   97,  196,    9,   13,   48,
+	   57,   65,   90,   98,  122,  197,  223,  224,  239,  240,  244,   32,
+	   45,   61,   92,   95,  109,  196,    9,   13,   48,   57,   65,   90,
+	   97,  122,  197,  223,  224,  239,  240,  244,   32,   45,   61,   92,
+	   95,  101,  196,    9,   13,   48,   57,   65,   90,   97,  122,  197,
+	  223,  224,  239,  240,  244,   32,   45,   61,   92,   95,  196,    9,
+	   13,   48,   57,   65,   90,   97,  122,  197,  223,  224,  239,  240,
+	  244,   32,   34,   39,   45,   61,   92,   93,   95,  196,    9,   13,
+	   48,   57,   65,   90,   97,  122,  197,  223,  224,  239,  240,  244,
+	   45,   92,   93,   95,  196,   48,   57,   65,   90,   97,  122,  197,
+	  223,  224,  239,  240,  244,   46,   93,   93,  168,  191,   93,  128,
+	  191,   93,  128,  191,   93,  128,  191,  168,  191,  128,  191,   32,
+	   35,   43,   44,   45,   46,   58,   62,   91,   92,   95,  101,  110,
+	  111,  126,  196,    9,   13,   48,   57,   65,   90,   97,  122,  197,
+	  223,  224,  239,  240,  244,   32,   44,    9,   13,   32,    9,   13,
+	   45,   92,   95,  196,   48,   57,   65,   90,   97,  122,  197,  223,
+	  224,  239,  240,  244,   43,   45,  110,   48,   57,   43,   45,   92,
+	   95,  110,  196,   48,   57,   65,   90,   97,  122,  197,  223,  224,
+	  239,  240,  244,   45,   92,   95,  196,   48,   57,   65,   90,   97,
+	  122,  197,  223,  224,  239,  240,  244,   45,   92,   95,  196,   48,
+	   57,   65,   90,   97,  122,  197,  223,  224,  239,  240,  244,   40,
+	   45,   92,   95,  196,   48,   57,   65,   90,   97,  122,  197,  223,
+	  224,  239,  240,  244,   40,   45,   92,   95,  113,  118,  196,   48,
+	   57,   65,   90,   97,  122,  197,  223,  224,  239,  240,  244,   40,
+	   45,   92,   95,  196,   48,   57,   65,   90,   97,  122,  197,  223,
+	  224,  239,  240,  244,   40,   45,   92,   95,  101,  196,   48,   57,
+	   65,   90,   97,  122,  197,  223,  224,  239,  240,  244,   40,   45,
+	   92,   95,  110,  196,   48,   57,   65,   90,   97,  122,  197,  223,
+	  224,  239,  240,  244,   40,   45,   92,   95,  105,  196,   48,   57,
+	   65,   90,   97,  122,  197,  223,  224,  239,  240,  244,   40,   45,
+	   92,   95,  114,  196,   48,   57,   65,   90,   97,  122,  197,  223,
+	  224,  239,  240,  244,   40,   45,   92,   95,  115,  196,   48,   57,
+	   65,   90,   97,  122,  197,  223,  224,  239,  240,  244,   40,   45,
+	   92,   95,  116,  196,   48,   57,   65,   90,   97,  122,  197,  223,
+	  224,  239,  240,  244,   40,   45,   92,   95,  196,   48,   57,   65,
+	   90,   97,  122,  197,  223,  224,  239,  240,  244,   40,   45,   92,
+	   95,   99,  196,   48,   57,   65,   90,   97,  122,  197,  223,  224,
+	  239,  240,  244,   40,   45,   92,   95,  104,  196,   48,   57,   65,
+	   90,   97,  122,  197,  223,  224,  239,  240,  244,   40,   45,   92,
+	   95,  105,  196,   48,   57,   65,   90,   97,  122,  197,  223,  224,
+	  239,  240,  244,   40,   45,   92,   95,  108,  196,   48,   57,   65,
+	   90,   97,  122,  197,  223,  224,  239,  240,  244,   40,   45,   92,
+	   95,  100,  196,   48,   57,   65,   90,   97,  122,  197,  223,  224,
+	  239,  240,  244,   40,   45,   92,   95,  196,   48,   57,   65,   90,
+	   97,  122,  197,  223,  224,  239,  240,  244,   40,   45,   92,   95,
+	  116,  196,   48,   57,   65,   90,   97,  122,  197,  223,  224,  239,
+	  240,  244,   40,   45,   92,   95,   97,  116,  196,   48,   57,   65,
+	   90,   98,  122,  197,  223,  224,  239,  240,  244,   40,   45,   92,
+	   95,  116,  196,   48,   57,   65,   90,   97,  122,  197,  223,  224,
+	  239,  240,  244,   40,   45,   92,   95,  104,  196,   48,   57,   65,
+	   90,   97,  122,  197,  223,  224,  239,  240,  244,   40,   45,   92,
+	   95,  100,  110,  196,   48,   57,   65,   90,   97,  122,  197,  223,
+	  224,  239,  240,  244,   40,   45,   92,   95,  100,  196,   48,   57,
+	   65,   90,   97,  122,  197,  223,  224,  239,  240,  244,   40,   45,
+	   92,   95,  108,  196,   48,   57,   65,   90,   97,  122,  197,  223,
+	  224,  239,  240,  244,   40,   45,   92,   95,  121,  196,   48,   57,
+	   65,   90,   97,  122,  197,  223,  224,  239,  240,  244,   40,   45,
+	   92,   95,  196,   48,   57,   65,   90,   97,  122,  197,  223,  224,
+	  239,  240,  244,   34,   39,   45,   92,   95,  118,  196,   48,   57,
+	   65,   90,   97,  122,  197,  223,  224,  239,  240,  244,   45,   92,
+	   95,  101,  196,   48,   57,   65,   90,   97,  122,  197,  223,  224,
+	  239,  240,  244,   45,   92,   95,  196,   48,   57,   65,   90,   97,
+	  122,  197,  223,  224,  239,  240,  244,   45,   92,   95,  100,  196,
+	   48,   57,   65,   90,   97,  122,  197,  223,  224,  239,  240,  244,
+	   45,   92,   95,  196,   48,   57,   65,   90,   97,  122,  197,  223,
+	  224,  239,  240,  244,    0
+	};
+}
+
+private static final char _hpricot_css_trans_keys[] = init__hpricot_css_trans_keys_0();
+
+
+private static byte[] init__hpricot_css_single_lengths_0()
+{
+	return new byte [] {
+	    0,    2,    4,    1,    0,    0,    0,    0,    1,    0,    0,    0,
+	    0,    4,    1,    0,    0,    0,    0,   10,    4,    3,    3,    1,
+	    1,    1,    1,    2,    4,    4,    1,    1,    1,    2,    1,    1,
+	    2,    1,    0,    0,    0,    0,    4,    3,    9,    6,    4,    4,
+	    4,    3,    4,    4,    5,    6,    1,    4,    1,    4,    2,    1,
+	    1,    2,    1,    2,    5,    4,    2,    1,    1,    1,    0,    1,
+	    0,    1,    7,    7,    7,    6,    9,    5,    2,    1,    1,    1,
+	    1,    0,    0,   16,    2,    1,    4,    3,    6,    4,    4,    5,
+	    7,    5,    6,    6,    6,    6,    6,    6,    5,    6,    6,    6,
+	    6,    6,    5,    6,    7,    6,    6,    7,    6,    6,    6,    5,
+	    1,    1,    5,    5,    4,    5,    4
+	};
+}
+
+private static final byte _hpricot_css_single_lengths[] = init__hpricot_css_single_lengths_0();
+
+
+private static byte[] init__hpricot_css_range_lengths_0()
+{
+	return new byte [] {
+	    0,    1,    6,    0,    1,    1,    1,    1,    0,    1,    1,    1,
+	    1,    6,    0,    1,    1,    1,    1,    6,    0,    0,    0,    1,
+	    0,    0,    0,    0,    0,    0,    1,    0,    0,    0,    0,    0,
+	    0,    0,    1,    1,    1,    1,    1,    1,    1,    1,    0,    0,
+	    0,    0,    0,    0,    6,    7,    0,    1,    0,    1,    0,    0,
+	    0,    0,    0,    1,    1,    1,    0,    1,    1,    1,    1,    1,
+	    1,    0,    7,    7,    7,    7,    7,    6,    0,    1,    1,    1,
+	    1,    1,    1,    7,    1,    1,    6,    1,    6,    6,    6,    6,
+	    6,    6,    6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+	    6,    6,    6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+	    0,    0,    6,    6,    6,    6,    6
+	};
+}
+
+private static final byte _hpricot_css_range_lengths[] = init__hpricot_css_range_lengths_0();
+
+
+private static short[] init__hpricot_css_index_offsets_0()
+{
+	return new short [] {
+	    0,    0,    4,   15,   17,   19,   21,   23,   25,   27,   29,   31,
+	   33,   35,   46,   48,   50,   52,   54,   56,   73,   78,   82,   86,
+	   89,   91,   93,   95,   98,  103,  108,  111,  113,  115,  118,  120,
+	  122,  125,  127,  129,  131,  133,  135,  141,  146,  157,  165,  170,
+	  175,  180,  184,  189,  194,  206,  220,  222,  228,  230,  236,  239,
+	  241,  243,  246,  248,  252,  259,  265,  268,  271,  274,  277,  279,
+	  282,  284,  286,  301,  316,  331,  345,  362,  374,  377,  380,  383,
+	  386,  389,  391,  393,  417,  421,  424,  435,  440,  453,  464,  475,
+	  487,  501,  513,  526,  539,  552,  565,  578,  591,  603,  616,  629,
+	  642,  655,  668,  680,  693,  707,  720,  733,  747,  760,  773,  786,
+	  798,  800,  802,  814,  826,  837,  849
+	};
+}
+
+private static final short _hpricot_css_index_offsets[] = init__hpricot_css_index_offsets_0();
+
+
+private static byte[] init__hpricot_css_trans_targs_wi_0()
+{
+	return new byte [] {
+	    1,   89,    1,   87,   90,    3,   90,    4,   90,   90,   90,    5,
+	    6,    7,    0,   90,   87,   90,   87,   90,   87,    5,   87,    6,
+	   87,   93,   87,   93,   87,   93,   87,   10,   87,   11,   87,   94,
+	   14,   94,   15,   94,   94,   94,   16,   17,   18,    0,   94,   87,
+	   94,   87,   94,   87,   16,   87,   17,   87,   95,   37,   95,   96,
+	  100,  111,  112,  113,  115,   38,   95,   95,   95,   39,   40,   41,
+	    0,   22,   28,   34,   87,   21,   87,   87,   87,   21,   24,   25,
+	   87,   23,   24,   87,   23,   87,   87,   87,   26,   27,   26,   24,
+	   25,   87,   30,   21,   31,   87,   29,   30,   21,   87,   87,   29,
+	   24,   87,   30,   87,   32,   33,   32,   24,   31,   87,   87,   35,
+	   36,   35,   34,   87,   87,   95,   87,   95,   87,   95,   87,   39,
+	   87,   40,   87,   22,   28,   34,   87,   43,   21,   87,   87,   87,
+	   43,   21,   22,   28,   34,   87,   45,   45,   46,   45,   50,   45,
+	   21,   87,   87,   87,   45,   45,   45,   45,   21,   87,   87,   87,
+	   47,   21,   87,   87,   87,   48,   21,   87,   87,   87,   49,   21,
+	   87,   87,   87,   21,   87,   87,   87,   51,   21,   87,   87,   87,
+	   49,   21,   53,   73,   53,   74,   85,   53,   53,   53,   70,   72,
+	   86,    0,   63,   53,   64,   66,   53,   67,   63,   53,   53,   53,
+	   68,   69,   71,   54,   55,    0,   57,   58,   61,    0,   57,   56,
+	   87,   56,   57,   58,   61,   87,   57,   56,   56,  120,   58,   60,
+	   59,   87,   87,   56,  121,   61,   60,   62,   63,   64,   63,   54,
+	   57,   58,   61,   65,    0,   57,   56,   57,   58,   61,   87,   57,
+	   56,   53,   55,    0,   55,   53,    0,   55,   53,    0,   55,   70,
+	    0,   53,    0,   55,   72,    0,   70,    0,   53,    0,   63,   53,
+	   64,   66,   53,   75,   67,   63,   53,   53,   53,   68,   69,   71,
+	   54,   63,   53,   64,   66,   53,   76,   67,   63,   53,   53,   53,
+	   68,   69,   71,   54,   63,   53,   64,   66,   53,   77,   67,   63,
+	   53,   53,   53,   68,   69,   71,   54,   63,   53,   78,   66,   53,
+	   67,   63,   53,   53,   53,   68,   69,   71,   54,   57,   58,   61,
+	   79,   65,   80,    0,   79,   81,   57,   79,   79,   79,   82,   83,
+	   84,   56,   79,   80,   87,   79,   81,   79,   79,   79,   82,   83,
+	   84,   56,   79,   87,   56,   87,   79,   56,   87,   79,   56,   87,
+	   82,   56,   87,   83,   56,   53,    0,   72,    0,   88,    2,   91,
+	   89,   92,   13,   19,   87,   52,    8,   93,  122,   92,  125,   87,
+	    9,   88,   92,   93,   93,   10,   11,   12,    0,    1,   89,    1,
+	   87,   89,   89,   87,   90,    3,   90,    4,   90,   90,   90,    5,
+	    6,    7,   87,   91,   91,   91,   91,   87,   91,   92,    8,   93,
+	   92,    9,   92,   93,   93,   10,   11,   12,   87,   93,    8,   93,
+	    9,   93,   93,   93,   10,   11,   12,   87,   94,   14,   94,   15,
+	   94,   94,   94,   16,   17,   18,   87,   20,   95,   37,   95,   38,
+	   95,   95,   95,   39,   40,   41,   87,   20,   95,   37,   95,   97,
+	   98,   38,   95,   95,   95,   39,   40,   41,   87,   42,   95,   37,
+	   95,   38,   95,   95,   95,   39,   40,   41,   87,   20,   95,   37,
+	   95,   99,   38,   95,   95,   95,   39,   40,   41,   87,   20,   95,
+	   37,   95,   97,   38,   95,   95,   95,   39,   40,   41,   87,   20,
+	   95,   37,   95,  101,   38,   95,   95,   95,   39,   40,   41,   87,
+	   20,   95,   37,   95,  102,   38,   95,   95,   95,   39,   40,   41,
+	   87,   20,   95,   37,   95,  103,   38,   95,   95,   95,   39,   40,
+	   41,   87,   20,   95,   37,   95,  104,   38,   95,   95,   95,   39,
+	   40,   41,   87,   42,  105,   37,   95,   38,   95,   95,   95,   39,
+	   40,   41,   87,   20,   95,   37,   95,  106,   38,   95,   95,   95,
+	   39,   40,   41,   87,   20,   95,   37,   95,  107,   38,   95,   95,
+	   95,   39,   40,   41,   87,   20,   95,   37,   95,  108,   38,   95,
+	   95,   95,   39,   40,   41,   87,   20,   95,   37,   95,  109,   38,
+	   95,   95,   95,   39,   40,   41,   87,   20,   95,   37,   95,  110,
+	   38,   95,   95,   95,   39,   40,   41,   87,   44,   95,   37,   95,
+	   38,   95,   95,   95,   39,   40,   41,   87,   20,   95,   37,   95,
+	   97,   38,   95,   95,   95,   39,   40,   41,   87,   20,   95,   37,
+	   95,  102,   97,   38,   95,   95,   95,   39,   40,   41,   87,   20,
+	   95,   37,   95,  114,   38,   95,   95,   95,   39,   40,   41,   87,
+	   20,   95,   37,   95,  104,   38,   95,   95,   95,   39,   40,   41,
+	   87,   20,   95,   37,   95,  116,  117,   38,   95,   95,   95,   39,
+	   40,   41,   87,   20,   95,   37,   95,   97,   38,   95,   95,   95,
+	   39,   40,   41,   87,   20,   95,   37,   95,  118,   38,   95,   95,
+	   95,   39,   40,   41,   87,   20,   95,   37,   95,  119,   38,   95,
+	   95,   95,   39,   40,   41,   87,   20,  105,   37,   95,   38,   95,
+	   95,   95,   39,   40,   41,   87,   60,   59,   60,   62,   93,    8,
+	   93,  123,    9,   93,   93,   93,   10,   11,   12,   87,   93,    8,
+	   93,  124,    9,   93,   93,   93,   10,   11,   12,   87,   93,    8,
+	   93,    9,   93,   93,   93,   10,   11,   12,   87,   93,    8,   93,
+	  126,    9,   93,   93,   93,   10,   11,   12,   87,   93,    8,   93,
+	    9,   93,   93,   93,   10,   11,   12,   87,    0
+	};
+}
+
+private static final byte _hpricot_css_trans_targs_wi[] = init__hpricot_css_trans_targs_wi_0();
+
+
+private static byte[] init__hpricot_css_trans_actions_wi_0()
+{
+	return new byte [] {
+	    0,    0,    0,   33,   99,    1,   99,    1,   99,   99,   99,    1,
+	    1,    1,    0,   73,   35,   73,   35,   73,   35,    0,   35,    0,
+	   35,   79,   35,   79,   35,   79,   35,    0,   35,    0,   35,  103,
+	    1,  103,    1,  103,  103,  103,    1,    1,    1,    0,   76,   35,
+	   76,   35,   76,   35,    0,   35,    0,   35,  111,    1,  111,  111,
+	  111,  111,  111,  111,  111,    1,  111,  111,  111,    1,    1,    1,
+	    0,    1,    1,    1,   95,    1,   35,   35,   49,    0,    0,    0,
+	   35,    0,    0,   35,    0,   49,   35,   35,    0,    0,    0,    0,
+	    0,   35,    0,    0,    0,   49,    0,    0,    0,   35,   49,    0,
+	    0,   35,    0,   35,    0,    0,    0,    0,    0,   35,   35,    0,
+	    0,    0,    0,   49,   35,   88,   35,   88,   35,   88,   35,    0,
+	   35,    0,   35,    1,    1,    1,   95,    1,    1,   29,   29,   46,
+	    0,    0,    1,    1,    1,   91,    1,    1,    1,    1,    1,    1,
+	    1,   27,   27,   43,    0,    0,    0,    0,    0,   27,   27,   49,
+	    0,    0,   27,   27,   49,    0,    0,   27,   27,   49,    0,    0,
+	   27,   27,   43,    0,   27,   27,   49,    0,    0,   27,   27,   49,
+	    0,    0,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+	    1,    0,    5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
+	    5,    5,    5,    5,    0,    0,    7,    7,    7,    0,    7,    7,
+	   13,    0,    0,    0,    0,   13,    0,    0,    0,   11,    0,    0,
+	    0,   13,   25,    0,   11,    0,    0,    0,    0,    0,    0,    0,
+	    7,    7,    7,    7,    0,    7,    7,    7,    7,    7,   13,    7,
+	    7,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+	    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    5,    5,
+	    5,    5,    5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
+	    5,    5,    5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
+	    5,    5,    5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
+	    5,    5,    5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
+	    5,    5,    5,    5,    5,    5,    5,    5,    5,    7,    7,    7,
+	   37,    7,   37,    0,   37,   37,    7,   37,   37,   37,   37,   37,
+	   37,    7,    0,    0,   40,    0,    0,    0,    0,    0,    0,    0,
+	    0,    0,    0,   13,    0,   13,    0,    0,   13,    0,    0,   13,
+	    0,    0,   13,    0,    0,    0,    0,    0,    0,   11,    0,    0,
+	    0,  107,    0,    0,   15,    0,    1,  107,  107,  107,  107,   15,
+	    1,   11,  107,  107,  107,    1,    1,    1,    0,    0,    0,    0,
+	   23,    0,    0,   21,   73,    0,   73,    0,   73,   73,   73,    0,
+	    0,    0,   52,    0,    0,    0,    0,   19,    3,   79,    0,   79,
+	   79,    0,   79,   79,   79,    0,    0,    0,   58,   79,    0,   79,
+	    0,   79,   79,   79,    0,    0,    0,   58,   76,    0,   76,    0,
+	   76,   76,   76,    0,    0,    0,   55,    3,   88,    0,   88,    0,
+	   88,   88,   88,    0,    0,    0,   67,    3,   88,    0,   88,   85,
+	   88,    0,   88,   88,   88,    0,    0,    0,   67,    3,  115,    3,
+	  115,    3,  115,  115,  115,    3,    3,    3,   64,    3,   88,    0,
+	   88,   88,    0,   88,   88,   88,    0,    0,    0,   67,    3,   88,
+	    0,   88,   85,    0,   88,   88,   88,    0,    0,    0,   67,    3,
+	   88,    0,   88,   88,    0,   88,   88,   88,    0,    0,    0,   67,
+	    3,   88,    0,   88,   88,    0,   88,   88,   88,    0,    0,    0,
+	   67,    3,   88,    0,   88,   88,    0,   88,   88,   88,    0,    0,
+	    0,   67,    3,   88,    0,   88,   85,    0,   88,   88,   88,    0,
+	    0,    0,   67,    3,  115,    3,  115,    3,  115,  115,  115,    3,
+	    3,    3,   64,    3,   88,    0,   88,   88,    0,   88,   88,   88,
+	    0,    0,    0,   67,    3,   88,    0,   88,   88,    0,   88,   88,
+	   88,    0,    0,    0,   67,    3,   88,    0,   88,   88,    0,   88,
+	   88,   88,    0,    0,    0,   67,    3,   88,    0,   88,   88,    0,
+	   88,   88,   88,    0,    0,    0,   67,    3,   88,    0,   88,   82,
+	    0,   88,   88,   88,    0,    0,    0,   67,    3,  115,    3,  115,
+	    3,  115,  115,  115,    3,    3,    3,   61,    3,   88,    0,   88,
+	   85,    0,   88,   88,   88,    0,    0,    0,   67,    3,   88,    0,
+	   88,   88,   85,    0,   88,   88,   88,    0,    0,    0,   67,    3,
+	   88,    0,   88,   88,    0,   88,   88,   88,    0,    0,    0,   67,
+	    3,   88,    0,   88,   85,    0,   88,   88,   88,    0,    0,    0,
+	   67,    3,   88,    0,   88,   88,   88,    0,   88,   88,   88,    0,
+	    0,    0,   67,    3,   88,    0,   88,   85,    0,   88,   88,   88,
+	    0,    0,    0,   67,    3,   88,    0,   88,   88,    0,   88,   88,
+	   88,    0,    0,    0,   67,    3,   88,    0,   88,   88,    0,   88,
+	   88,   88,    0,    0,    0,   67,    3,   88,    0,   88,    0,   88,
+	   88,   88,    0,    0,    0,   67,    0,    0,    0,    0,   79,    0,
+	   79,   79,    0,   79,   79,   79,    0,    0,    0,   58,   79,    0,
+	   79,   79,    0,   79,   79,   79,    0,    0,    0,   58,   79,    0,
+	   79,    0,   79,   79,   79,    0,    0,    0,   58,   79,    0,   79,
+	   79,    0,   79,   79,   79,    0,    0,    0,   58,   79,    0,   79,
+	    0,   79,   79,   79,    0,    0,    0,   58,    0
+	};
+}
+
+private static final byte _hpricot_css_trans_actions_wi[] = init__hpricot_css_trans_actions_wi_0();
+
+
+private static byte[] init__hpricot_css_to_state_actions_0()
+{
+	return new byte [] {
+	    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+	    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+	    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+	    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+	    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+	    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+	    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+	    0,    0,    0,   70,    0,    0,    0,    0,    0,    0,    0,    0,
+	    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+	    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+	    0,    0,    0,    0,    0,    0,    0
+	};
+}
+
+private static final byte _hpricot_css_to_state_actions[] = init__hpricot_css_to_state_actions_0();
+
+
+private static byte[] init__hpricot_css_from_state_actions_0()
+{
+	return new byte [] {
+	    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+	    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+	    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+	    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+	    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+	    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+	    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+	    0,    0,    0,    9,    0,    0,    0,    0,    0,    0,    0,    0,
+	    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+	    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+	    0,    0,    0,    0,    0,    0,    0
+	};
+}
+
+private static final byte _hpricot_css_from_state_actions[] = init__hpricot_css_from_state_actions_0();
+
+
+private static short[] init__hpricot_css_eof_trans_0()
+{
+	return new short [] {
+	    0,    1,    0,   11,   11,   11,   11,   11,   11,   11,   11,   11,
+	   11,    0,   11,   11,   11,   11,   11,    0,   39,   11,   11,   11,
+	   11,   11,   11,   11,   11,   11,   11,   11,   11,   11,   11,   11,
+	   11,   11,   11,   11,   11,   11,   63,   63,   67,   67,   67,   67,
+	   67,   67,   67,   67,    0,    0,    0,    0,    0,    0,    0,  105,
+	  105,    0,  105,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+	    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+	    0,    0,    0,    0,  150,  151,  152,  156,  157,  157,  163,  167,
+	  167,  174,  167,  167,  167,  167,  167,  167,  174,  167,  167,  167,
+	  167,  167,  193,  167,  167,  167,  167,  167,  167,  167,  167,  167,
+	  201,  201,  157,  157,  157,  157,  157
+	};
+}
+
+private static final short _hpricot_css_eof_trans[] = init__hpricot_css_eof_trans_0();
+
+
+static final int hpricot_css_start = 87;
+static final int hpricot_css_error = 0;
+
+static final int hpricot_css_en_main = 87;
+
+// line 147 "hpricot_css.java.rl"
+
+
+    public IRubyObject scan() {
+
+// line 515 "HpricotCss.java"
+	{
+	cs = hpricot_css_start;
+	ts = -1;
+	te = -1;
+	act = 0;
+	}
+// line 151 "hpricot_css.java.rl"
+
+// line 524 "HpricotCss.java"
+	{
+	int _klen;
+	int _trans = 0;
+	int _acts;
+	int _nacts;
+	int _keys;
+	int _goto_targ = 0;
+
+	_goto: while (true) {
+	switch ( _goto_targ ) {
+	case 0:
+	if ( p == pe ) {
+		_goto_targ = 4;
+		continue _goto;
+	}
+	if ( cs == 0 ) {
+		_goto_targ = 5;
+		continue _goto;
+	}
+case 1:
+	_acts = _hpricot_css_from_state_actions[cs];
+	_nacts = (int) _hpricot_css_actions[_acts++];
+	while ( _nacts-- > 0 ) {
+		switch ( _hpricot_css_actions[_acts++] ) {
+	case 6:
+// line 1 "hpricot_css.java.rl"
+	{ts = p;}
+	break;
+// line 553 "HpricotCss.java"
+		}
+	}
+
+	_match: do {
+	_keys = _hpricot_css_key_offsets[cs];
+	_trans = _hpricot_css_index_offsets[cs];
+	_klen = _hpricot_css_single_lengths[cs];
+	if ( _klen > 0 ) {
+		int _lower = _keys;
+		int _mid;
+		int _upper = _keys + _klen - 1;
+		while (true) {
+			if ( _upper < _lower )
+				break;
+
+			_mid = _lower + ((_upper-_lower) >> 1);
+			if ( data[p] < _hpricot_css_trans_keys[_mid] )
+				_upper = _mid - 1;
+			else if ( data[p] > _hpricot_css_trans_keys[_mid] )
+				_lower = _mid + 1;
+			else {
+				_trans += (_mid - _keys);
+				break _match;
+			}
+		}
+		_keys += _klen;
+		_trans += _klen;
+	}
+
+	_klen = _hpricot_css_range_lengths[cs];
+	if ( _klen > 0 ) {
+		int _lower = _keys;
+		int _mid;
+		int _upper = _keys + (_klen<<1) - 2;
+		while (true) {
+			if ( _upper < _lower )
+				break;
+
+			_mid = _lower + (((_upper-_lower) >> 1) & ~1);
+			if ( data[p] < _hpricot_css_trans_keys[_mid] )
+				_upper = _mid - 2;
+			else if ( data[p] > _hpricot_css_trans_keys[_mid+1] )
+				_lower = _mid + 2;
+			else {
+				_trans += ((_mid - _keys)>>1);
+				break _match;
+			}
+		}
+		_trans += _klen;
+	}
+	} while (false);
+
+case 3:
+	cs = _hpricot_css_trans_targs_wi[_trans];
+
+	if ( _hpricot_css_trans_actions_wi[_trans] != 0 ) {
+		_acts = _hpricot_css_trans_actions_wi[_trans];
+		_nacts = (int) _hpricot_css_actions[_acts++];
+		while ( _nacts-- > 0 )
+	{
+			switch ( _hpricot_css_actions[_acts++] )
+			{
+	case 0:
+// line 85 "hpricot_css.java.rl"
+	{
+    aps = p;
+  }
+	break;
+	case 1:
+// line 89 "hpricot_css.java.rl"
+	{
+    ape = p;
+    PUSH(aps, ape); 
+  }
+	break;
+	case 2:
+// line 94 "hpricot_css.java.rl"
+	{
+    ape = p;
+    aps2 = p;
+  }
+	break;
+	case 3:
+// line 99 "hpricot_css.java.rl"
+	{
+    ape2 = p;
+    PUSH(aps, ape);
+    PUSH(aps2, ape2);
+  }
+	break;
+	case 7:
+// line 1 "hpricot_css.java.rl"
+	{te = p+1;}
+	break;
+	case 8:
+// line 132 "hpricot_css.java.rl"
+	{act = 1;}
+	break;
+	case 9:
+// line 133 "hpricot_css.java.rl"
+	{act = 2;}
+	break;
+	case 10:
+// line 136 "hpricot_css.java.rl"
+	{act = 5;}
+	break;
+	case 11:
+// line 138 "hpricot_css.java.rl"
+	{act = 7;}
+	break;
+	case 12:
+// line 139 "hpricot_css.java.rl"
+	{act = 8;}
+	break;
+	case 13:
+// line 140 "hpricot_css.java.rl"
+	{act = 9;}
+	break;
+	case 14:
+// line 134 "hpricot_css.java.rl"
+	{te = p+1;{ FILTER("NAME"); }}
+	break;
+	case 15:
+// line 135 "hpricot_css.java.rl"
+	{te = p+1;{ FILTER("ATTR"); }}
+	break;
+	case 16:
+// line 138 "hpricot_css.java.rl"
+	{te = p+1;{ FILTER("CHILD"); }}
+	break;
+	case 17:
+// line 139 "hpricot_css.java.rl"
+	{te = p+1;{ FILTER("POS"); }}
+	break;
+	case 18:
+// line 140 "hpricot_css.java.rl"
+	{te = p+1;{ FILTER("PSUEDO"); }}
+	break;
+	case 19:
+// line 142 "hpricot_css.java.rl"
+	{te = p+1;{ FILTERAUTO(); }}
+	break;
+	case 20:
+// line 132 "hpricot_css.java.rl"
+	{te = p;p--;{ FILTER("ID"); }}
+	break;
+	case 21:
+// line 133 "hpricot_css.java.rl"
+	{te = p;p--;{ FILTER("CLASS"); }}
+	break;
+	case 22:
+// line 135 "hpricot_css.java.rl"
+	{te = p;p--;{ FILTER("ATTR"); }}
+	break;
+	case 23:
+// line 136 "hpricot_css.java.rl"
+	{te = p;p--;{ FILTER("TAG"); }}
+	break;
+	case 24:
+// line 137 "hpricot_css.java.rl"
+	{te = p;p--;{ FILTER("MOD"); }}
+	break;
+	case 25:
+// line 138 "hpricot_css.java.rl"
+	{te = p;p--;{ FILTER("CHILD"); }}
+	break;
+	case 26:
+// line 139 "hpricot_css.java.rl"
+	{te = p;p--;{ FILTER("POS"); }}
+	break;
+	case 27:
+// line 140 "hpricot_css.java.rl"
+	{te = p;p--;{ FILTER("PSUEDO"); }}
+	break;
+	case 28:
+// line 141 "hpricot_css.java.rl"
+	{te = p;p--;{ focus = RubyArray.newArray(runtime, node); }}
+	break;
+	case 29:
+// line 143 "hpricot_css.java.rl"
+	{te = p;p--;}
+	break;
+	case 30:
+// line 135 "hpricot_css.java.rl"
+	{{p = ((te))-1;}{ FILTER("ATTR"); }}
+	break;
+	case 31:
+// line 138 "hpricot_css.java.rl"
+	{{p = ((te))-1;}{ FILTER("CHILD"); }}
+	break;
+	case 32:
+// line 139 "hpricot_css.java.rl"
+	{{p = ((te))-1;}{ FILTER("POS"); }}
+	break;
+	case 33:
+// line 140 "hpricot_css.java.rl"
+	{{p = ((te))-1;}{ FILTER("PSUEDO"); }}
+	break;
+	case 34:
+// line 143 "hpricot_css.java.rl"
+	{{p = ((te))-1;}}
+	break;
+	case 35:
+// line 1 "hpricot_css.java.rl"
+	{	switch( act ) {
+	case 0:
+	{{cs = 0; _goto_targ = 2; if (true) continue _goto;}}
+	break;
+	case 1:
+	{{p = ((te))-1;} FILTER("ID"); }
+	break;
+	case 2:
+	{{p = ((te))-1;} FILTER("CLASS"); }
+	break;
+	case 5:
+	{{p = ((te))-1;} FILTER("TAG"); }
+	break;
+	case 7:
+	{{p = ((te))-1;} FILTER("CHILD"); }
+	break;
+	case 8:
+	{{p = ((te))-1;} FILTER("POS"); }
+	break;
+	case 9:
+	{{p = ((te))-1;} FILTER("PSUEDO"); }
+	break;
+	default: break;
+	}
+	}
+	break;
+// line 784 "HpricotCss.java"
+			}
+		}
+	}
+
+case 2:
+	_acts = _hpricot_css_to_state_actions[cs];
+	_nacts = (int) _hpricot_css_actions[_acts++];
+	while ( _nacts-- > 0 ) {
+		switch ( _hpricot_css_actions[_acts++] ) {
+	case 4:
+// line 1 "hpricot_css.java.rl"
+	{ts = -1;}
+	break;
+	case 5:
+// line 1 "hpricot_css.java.rl"
+	{act = 0;}
+	break;
+// line 802 "HpricotCss.java"
+		}
+	}
+
+	if ( cs == 0 ) {
+		_goto_targ = 5;
+		continue _goto;
+	}
+	if ( ++p != pe ) {
+		_goto_targ = 1;
+		continue _goto;
+	}
+case 4:
+	if ( p == eof )
+	{
+	if ( _hpricot_css_eof_trans[cs] > 0 ) {
+		_trans = _hpricot_css_eof_trans[cs] - 1;
+		_goto_targ = 3;
+		continue _goto;
+	}
+	}
+
+case 5:
+	}
+	break; }
+	}
+// line 152 "hpricot_css.java.rl"
+
+        return focus;
+    }
+}
diff -Nru /tmp/aPeI5X1Iz5/libhpricot-ruby-0.8/ext/hpricot_scan/hpricot_css.java.rl /tmp/kCvPnLCzlr/libhpricot-ruby-0.8.2/ext/hpricot_scan/hpricot_css.java.rl
--- libhpricot-ruby-0.8/ext/hpricot_scan/hpricot_css.java.rl	1970-01-01 01:00:00.000000000 +0100
+++ libhpricot-ruby-0.8.2/ext/hpricot_scan/hpricot_css.java.rl	2009-12-13 23:54:10.000000000 +0000
@@ -0,0 +1,155 @@
+import java.io.IOException;
+
+import org.jruby.Ruby;
+import org.jruby.RubyArray;
+import org.jruby.RubyClass;
+import org.jruby.RubyHash;
+import org.jruby.RubyModule;
+import org.jruby.RubyNumeric;
+import org.jruby.RubyObject;
+import org.jruby.RubyObjectAdapter;
+import org.jruby.RubyRegexp;
+import org.jruby.RubyString;
+import org.jruby.anno.JRubyMethod;
+import org.jruby.exceptions.RaiseException;
+import org.jruby.javasupport.JavaEmbedUtils;
+import org.jruby.runtime.Arity;
+import org.jruby.runtime.Block;
+import org.jruby.runtime.ObjectAllocator;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+import org.jruby.runtime.callback.Callback;
+import org.jruby.exceptions.RaiseException;
+import org.jruby.runtime.load.BasicLibraryService;
+import org.jruby.util.ByteList;
+
+public class HpricotCss {
+    public void FILTER(String id) {
+        IRubyObject[] args = new IRubyObject[fargs];
+        System.arraycopy(fvals, 0, args, 0, fargs);
+        mod.callMethod(ctx, id, args);
+        tmpt.rb_clear();
+        fargs = 1;
+    }
+
+    public void FILTERAUTO() {
+        try {
+            FILTER(new String(data, ts, te - ts, "ISO-8859-1"));
+        } catch(java.io.UnsupportedEncodingException e) {}
+    }
+
+    public void PUSH(int aps, int ape) {
+        RubyString str = RubyString.newString(runtime, data, aps, ape-aps);
+        fvals[fargs++] = str;
+        tmpt.append(str);
+    }
+
+    private IRubyObject self, mod, str, node;
+    private int cs, act, eof, p, pe, ts, te, aps, ape, aps2, ape2;
+    private byte[] data;
+
+    private int fargs = 1;
+    private IRubyObject[] fvals = new IRubyObject[6];
+    private RubyArray focus;
+    private RubyArray tmpt;
+    private Ruby runtime;
+    private ThreadContext ctx;
+
+    public HpricotCss(IRubyObject self, IRubyObject mod, IRubyObject str, IRubyObject node) {
+        this.self = self;
+        this.mod = mod;
+        this.str = str;
+        this.node = node;
+        this.runtime = self.getRuntime();
+        this.ctx = runtime.getCurrentContext();
+        this.focus = RubyArray.newArray(runtime, node);
+        this.tmpt = runtime.newArray();
+
+        fvals[0] = focus;
+
+        if(!(str instanceof RubyString)) {
+            throw runtime.newArgumentError("bad CSS selector, String only please.");
+        }
+
+        ByteList bl = ((RubyString)str).getByteList();
+
+        data = bl.bytes;
+        p = bl.begin;
+        pe = p + bl.realSize;
+        eof = pe;
+    }
+    
+%%{
+  machine hpricot_css;
+
+  action a {
+    aps = p;
+  }
+
+  action b {
+    ape = p;
+    PUSH(aps, ape); 
+  }
+
+  action c {
+    ape = p;
+    aps2 = p;
+  }
+
+  action d {
+    ape2 = p;
+    PUSH(aps, ape);
+    PUSH(aps2, ape2);
+  }
+
+  commas    = space* "," space*;
+  traverse  = [>+~];
+  sdot      = "\\.";
+  utfw      = alnum | "_" | "-" | 
+              (0xc4 0xa8..0xbf) | (0xc5..0xdf 0x80..0xbf) |
+              (0xe0..0xef 0x80..0xbf 0x80..0xbf) |
+              (0xf0..0xf4 0x80..0xbf 0x80..0xbf 0x80..0xbf);
+  utfword   = utfw+;
+  utfname   = (utfw | sdot)+; 
+  quote1    = "'" [^']* "'";
+  quote2    = '"' [^"]* '"';
+
+  cssid     = "#" %a utfname %b;
+  cssclass  = "." %a utfname %b;
+  cssname   = "[name=" %a utfname %b "]";
+  cssattr   = "[" %a utfname %c space* [^ \n\t]? "=" %d space* (quote1 | quote2 | [^\]]+) "]";
+  csstag    = utfname >a %b;
+  cssmod    = ("even" | "odd" | (digit | "n" | "+" | "-")* );
+  csschild  = ":" %a ("only" | "nth" | "last" | "first") "-child" %b ("(" %a cssmod %b ")")?;
+  csspos    = ":" %a ("nth" | "eq" | "gt" | "lt" | "first" | "last" | "even" | "odd") %b ("(" %a digit+ %b ")")?;
+  pseudop   = "(" [^)]+ ")";
+  pseudoq   = "'" (pseudop+ | [^'()]*) "'" |
+              '"' (pseudop+ | [^"()]*) '"' |
+                  (pseudop+ | [^"()]*);
+  pseudo    = ":" %a utfname %b ("(" %a pseudoq %b ")")?;
+
+  main     := |*
+    cssid      => { FILTER("ID"); };
+    cssclass   => { FILTER("CLASS"); };
+    cssname    => { FILTER("NAME"); };
+    cssattr    => { FILTER("ATTR"); };
+    csstag     => { FILTER("TAG"); };
+    cssmod     => { FILTER("MOD"); };
+    csschild   => { FILTER("CHILD"); };
+    csspos     => { FILTER("POS"); };
+    pseudo     => { FILTER("PSUEDO"); };
+    commas     => { focus = RubyArray.newArray(runtime, node); };
+    traverse   => { FILTERAUTO(); };
+    space;
+  *|;
+
+  write data nofinal;
+}%%
+
+    public IRubyObject scan() {
+%% write init;
+%% write exec;
+
+        return focus;
+    }
+}
diff -Nru /tmp/aPeI5X1Iz5/libhpricot-ruby-0.8/ext/hpricot_scan/hpricot_scan.c /tmp/kCvPnLCzlr/libhpricot-ruby-0.8.2/ext/hpricot_scan/hpricot_scan.c
--- libhpricot-ruby-0.8/ext/hpricot_scan/hpricot_scan.c	2009-03-24 19:43:02.000000000 +0000
+++ libhpricot-ruby-0.8.2/ext/hpricot_scan/hpricot_scan.c	2009-12-13 23:54:10.000000000 +0000
@@ -93,7 +93,7 @@
 
 #define EBLK(N, T) CAT(tag, p - T + 1); ELE(N);
 
-#line 140 "hpricot_scan.rl"
+#line 142 "hpricot_scan.rl"
 
 
 
@@ -106,7 +106,7 @@
 static const int hpricot_scan_en_html_procins = 218;
 static const int hpricot_scan_en_main = 204;
 
-#line 143 "hpricot_scan.rl"
+#line 145 "hpricot_scan.rl"
 
 #define BUFSIZE 16384
 
@@ -247,7 +247,7 @@
 
     if (H_ELE_GET(S->focus, H_ELE_EC) == sym_CDATA &&
        (sym != sym_procins && sym != sym_comment && sym != sym_cdata && sym != sym_text) &&
-      !(sym == sym_etag && INT2NUM(rb_str_hash(tag)) == H_ELE_GET(S->focus, H_ELE_HASH)))
+      !(sym == sym_etag && INT2FIX(rb_str_hash(tag)) == H_ELE_GET(S->focus, H_ELE_HASH)))
     {
       sym = sym_text;
       tag = rb_str_new(raw, rawlen);
@@ -265,7 +265,7 @@
   }
 
   if (sym == sym_emptytag || sym == sym_stag) {
-    VALUE name = INT2NUM(rb_str_hash(tag));
+    VALUE name = INT2FIX(rb_str_hash(tag));
     H_ELE(cElem);
     H_ELE_SET(ele, H_ELE_HASH, name);
 
@@ -325,7 +325,7 @@
     //
     // (see also: the search above for fixups)
     //
-    name = INT2NUM(rb_str_hash(tag));
+    name = INT2FIX(rb_str_hash(tag));
     while (e != S->doc)
     {
       if (H_ELE_GET(e, H_ELE_HASH) == name)
@@ -451,7 +451,7 @@
 	te = 0;
 	act = 0;
 	}
-#line 480 "hpricot_scan.rl"
+#line 482 "hpricot_scan.rl"
 
   while (!done) {
     VALUE str;
@@ -543,6 +543,7 @@
 	case 15:
 	{{p = ((te))-1;} TEXT_PASS(); }
 	break;
+	default: break;
 	}
 	}
 	goto st204;
@@ -575,6 +576,8 @@
 	{ SET(akey, p); }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 #line 68 "hpricot_scan.rl"
@@ -583,6 +586,8 @@
 tr117:
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 #line 68 "hpricot_scan.rl"
@@ -600,6 +605,8 @@
   }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 #line 68 "hpricot_scan.rl"
@@ -608,6 +615,8 @@
 tr133:
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 #line 116 "hpricot_scan.rl"
@@ -628,6 +637,8 @@
 	{ SET(akey, p); }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 #line 68 "hpricot_scan.rl"
@@ -671,7 +682,7 @@
 case 204:
 #line 1 "hpricot_scan.rl"
 	{ts = p;}
-#line 675 "hpricot_scan.c"
+#line 686 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 10: goto tr412;
 		case 60: goto tr413;
@@ -699,7 +710,7 @@
 	if ( ++p == pe )
 		goto _test_eof205;
 case 205:
-#line 703 "hpricot_scan.c"
+#line 714 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 33: goto st0;
 		case 47: goto st59;
@@ -807,7 +818,7 @@
 	if ( ++p == pe )
 		goto _test_eof10;
 case 10:
-#line 811 "hpricot_scan.c"
+#line 822 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 32: goto tr13;
 		case 62: goto tr15;
@@ -838,7 +849,7 @@
 	if ( ++p == pe )
 		goto _test_eof11;
 case 11:
-#line 842 "hpricot_scan.c"
+#line 853 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 32: goto st11;
 		case 62: goto tr18;
@@ -935,7 +946,7 @@
 	if ( ++p == pe )
 		goto _test_eof20;
 case 20:
-#line 939 "hpricot_scan.c"
+#line 950 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 9: goto st20;
 		case 34: goto tr33;
@@ -968,7 +979,7 @@
 	if ( ++p == pe )
 		goto _test_eof21;
 case 21:
-#line 972 "hpricot_scan.c"
+#line 983 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 32: goto st22;
 		case 62: goto tr18;
@@ -1006,7 +1017,7 @@
 	if ( ++p == pe )
 		goto _test_eof24;
 case 24:
-#line 1010 "hpricot_scan.c"
+#line 1021 "hpricot_scan.c"
 	if ( (*p) == 34 )
 		goto tr41;
 	goto st24;
@@ -1024,7 +1035,7 @@
 	if ( ++p == pe )
 		goto _test_eof25;
 case 25:
-#line 1028 "hpricot_scan.c"
+#line 1039 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 32: goto st25;
 		case 62: goto tr18;
@@ -1041,7 +1052,7 @@
 	if ( ++p == pe )
 		goto _test_eof26;
 case 26:
-#line 1045 "hpricot_scan.c"
+#line 1056 "hpricot_scan.c"
 	if ( (*p) == 93 )
 		goto st27;
 	goto st26;
@@ -1071,7 +1082,7 @@
 	if ( ++p == pe )
 		goto _test_eof29;
 case 29:
-#line 1075 "hpricot_scan.c"
+#line 1086 "hpricot_scan.c"
 	if ( (*p) == 39 )
 		goto tr41;
 	goto st29;
@@ -1108,7 +1119,7 @@
 	if ( ++p == pe )
 		goto _test_eof31;
 case 31:
-#line 1112 "hpricot_scan.c"
+#line 1123 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 9: goto st31;
 		case 39: goto tr49;
@@ -1158,7 +1169,7 @@
 	if ( ++p == pe )
 		goto _test_eof32;
 case 32:
-#line 1162 "hpricot_scan.c"
+#line 1173 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 9: goto st33;
 		case 32: goto st33;
@@ -1225,7 +1236,7 @@
 	if ( ++p == pe )
 		goto _test_eof34;
 case 34:
-#line 1229 "hpricot_scan.c"
+#line 1240 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 9: goto tr52;
 		case 32: goto tr52;
@@ -1258,7 +1269,7 @@
 	if ( ++p == pe )
 		goto _test_eof35;
 case 35:
-#line 1262 "hpricot_scan.c"
+#line 1273 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 9: goto st35;
 		case 32: goto st35;
@@ -1291,7 +1302,7 @@
 	if ( ++p == pe )
 		goto _test_eof36;
 case 36:
-#line 1295 "hpricot_scan.c"
+#line 1306 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 32: goto st36;
 		case 34: goto st37;
@@ -1319,7 +1330,7 @@
 	if ( ++p == pe )
 		goto _test_eof38;
 case 38:
-#line 1323 "hpricot_scan.c"
+#line 1334 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 34: goto tr70;
 		case 39: goto tr71;
@@ -1343,7 +1354,7 @@
 	if ( ++p == pe )
 		goto _test_eof39;
 case 39:
-#line 1347 "hpricot_scan.c"
+#line 1358 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 32: goto st39;
 		case 39: goto tr41;
@@ -1371,7 +1382,7 @@
 	if ( ++p == pe )
 		goto _test_eof206;
 case 206:
-#line 1375 "hpricot_scan.c"
+#line 1386 "hpricot_scan.c"
 	if ( (*p) == 39 )
 		goto tr41;
 	goto st29;
@@ -1383,7 +1394,7 @@
 	if ( ++p == pe )
 		goto _test_eof40;
 case 40:
-#line 1387 "hpricot_scan.c"
+#line 1398 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 39: goto tr73;
 		case 93: goto st42;
@@ -1397,7 +1408,7 @@
 	if ( ++p == pe )
 		goto _test_eof41;
 case 41:
-#line 1401 "hpricot_scan.c"
+#line 1412 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 32: goto st41;
 		case 62: goto tr76;
@@ -1416,7 +1427,7 @@
 	if ( ++p == pe )
 		goto _test_eof207;
 case 207:
-#line 1420 "hpricot_scan.c"
+#line 1431 "hpricot_scan.c"
 	if ( (*p) == 93 )
 		goto st27;
 	goto st26;
@@ -1446,7 +1457,7 @@
 	if ( ++p == pe )
 		goto _test_eof43;
 case 43:
-#line 1450 "hpricot_scan.c"
+#line 1461 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 32: goto st43;
 		case 34: goto tr41;
@@ -1466,7 +1477,7 @@
 	if ( ++p == pe )
 		goto _test_eof208;
 case 208:
-#line 1470 "hpricot_scan.c"
+#line 1481 "hpricot_scan.c"
 	if ( (*p) == 34 )
 		goto tr41;
 	goto st24;
@@ -1499,7 +1510,7 @@
 	if ( ++p == pe )
 		goto _test_eof46;
 case 46:
-#line 1503 "hpricot_scan.c"
+#line 1514 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 32: goto tr81;
 		case 39: goto tr38;
@@ -1517,7 +1528,7 @@
 	if ( ++p == pe )
 		goto _test_eof47;
 case 47:
-#line 1521 "hpricot_scan.c"
+#line 1532 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 9: goto st47;
 		case 39: goto tr82;
@@ -1638,7 +1649,7 @@
 	if ( ++p == pe )
 		goto _test_eof60;
 case 60:
-#line 1642 "hpricot_scan.c"
+#line 1653 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 32: goto tr95;
 		case 62: goto tr97;
@@ -1668,7 +1679,7 @@
 	if ( ++p == pe )
 		goto _test_eof61;
 case 61:
-#line 1672 "hpricot_scan.c"
+#line 1683 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 32: goto st61;
 		case 62: goto tr99;
@@ -1684,7 +1695,7 @@
 	if ( ++p == pe )
 		goto _test_eof62;
 case 62:
-#line 1688 "hpricot_scan.c"
+#line 1699 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 32: goto tr100;
 		case 47: goto tr102;
@@ -1712,7 +1723,7 @@
 	if ( ++p == pe )
 		goto _test_eof63;
 case 63:
-#line 1716 "hpricot_scan.c"
+#line 1727 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 32: goto st63;
 		case 47: goto st66;
@@ -1746,6 +1757,8 @@
 tr114:
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 #line 127 "hpricot_scan.rl"
@@ -1762,7 +1775,7 @@
 	if ( ++p == pe )
 		goto _test_eof64;
 case 64:
-#line 1766 "hpricot_scan.c"
+#line 1779 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 32: goto tr108;
 		case 47: goto tr110;
@@ -1807,7 +1820,7 @@
 	if ( ++p == pe )
 		goto _test_eof65;
 case 65:
-#line 1811 "hpricot_scan.c"
+#line 1824 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 32: goto st65;
 		case 47: goto tr115;
@@ -1837,12 +1850,16 @@
 	{ SET(akey, p); }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 	goto st66;
 tr115:
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 	goto st66;
@@ -1850,7 +1867,7 @@
 	if ( ++p == pe )
 		goto _test_eof66;
 case 66:
-#line 1854 "hpricot_scan.c"
+#line 1871 "hpricot_scan.c"
 	if ( (*p) == 62 )
 		goto tr118;
 	goto tr39;
@@ -1862,7 +1879,7 @@
 	if ( ++p == pe )
 		goto _test_eof67;
 case 67:
-#line 1866 "hpricot_scan.c"
+#line 1883 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 13: goto tr120;
 		case 32: goto tr120;
@@ -1886,7 +1903,7 @@
 	if ( ++p == pe )
 		goto _test_eof68;
 case 68:
-#line 1890 "hpricot_scan.c"
+#line 1907 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 13: goto tr126;
 		case 32: goto tr126;
@@ -1921,7 +1938,7 @@
 	if ( ++p == pe )
 		goto _test_eof69;
 case 69:
-#line 1925 "hpricot_scan.c"
+#line 1942 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 32: goto st69;
 		case 47: goto tr115;
@@ -1962,7 +1979,7 @@
 	if ( ++p == pe )
 		goto _test_eof70;
 case 70:
-#line 1966 "hpricot_scan.c"
+#line 1983 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 13: goto tr126;
 		case 32: goto tr126;
@@ -1990,6 +2007,8 @@
 tr131:
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 #line 127 "hpricot_scan.rl"
@@ -2007,6 +2026,8 @@
 	{ mark_aval = p; }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 #line 127 "hpricot_scan.rl"
@@ -2023,7 +2044,7 @@
 	if ( ++p == pe )
 		goto _test_eof71;
 case 71:
-#line 2027 "hpricot_scan.c"
+#line 2048 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 13: goto tr134;
 		case 32: goto tr134;
@@ -2069,7 +2090,7 @@
 	if ( ++p == pe )
 		goto _test_eof72;
 case 72:
-#line 2073 "hpricot_scan.c"
+#line 2094 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 13: goto tr140;
 		case 32: goto tr140;
@@ -2100,6 +2121,8 @@
 	{ mark_aval = p; }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 	goto st73;
@@ -2111,12 +2134,16 @@
   }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 	goto st73;
 tr132:
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 #line 116 "hpricot_scan.rl"
@@ -2135,6 +2162,8 @@
 	{ SET(akey, p); }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 	goto st73;
@@ -2148,6 +2177,8 @@
   }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 	goto st73;
@@ -2156,6 +2187,8 @@
 	{ mark_aval = p; }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 #line 116 "hpricot_scan.rl"
@@ -2168,7 +2201,7 @@
 	if ( ++p == pe )
 		goto _test_eof73;
 case 73:
-#line 2172 "hpricot_scan.c"
+#line 2205 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 13: goto tr126;
 		case 32: goto tr126;
@@ -2194,7 +2227,7 @@
 	if ( ++p == pe )
 		goto _test_eof74;
 case 74:
-#line 2198 "hpricot_scan.c"
+#line 2231 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 13: goto tr143;
 		case 32: goto tr143;
@@ -2227,7 +2260,7 @@
 	if ( ++p == pe )
 		goto _test_eof75;
 case 75:
-#line 2231 "hpricot_scan.c"
+#line 2264 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 13: goto tr148;
 		case 32: goto tr148;
@@ -2271,7 +2304,7 @@
 	if ( ++p == pe )
 		goto _test_eof76;
 case 76:
-#line 2275 "hpricot_scan.c"
+#line 2308 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 13: goto tr143;
 		case 32: goto tr143;
@@ -2325,7 +2358,7 @@
 	if ( ++p == pe )
 		goto _test_eof78;
 case 78:
-#line 2329 "hpricot_scan.c"
+#line 2362 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 13: goto tr161;
 		case 32: goto tr161;
@@ -2375,7 +2408,7 @@
 	if ( ++p == pe )
 		goto _test_eof79;
 case 79:
-#line 2379 "hpricot_scan.c"
+#line 2412 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 32: goto st79;
 		case 34: goto tr169;
@@ -2405,7 +2438,7 @@
 	if ( ++p == pe )
 		goto _test_eof80;
 case 80:
-#line 2409 "hpricot_scan.c"
+#line 2442 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 34: goto tr169;
 		case 92: goto st81;
@@ -2419,7 +2452,7 @@
 	if ( ++p == pe )
 		goto _test_eof81;
 case 81:
-#line 2423 "hpricot_scan.c"
+#line 2456 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 34: goto tr174;
 		case 92: goto st81;
@@ -2428,6 +2461,8 @@
 tr170:
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 #line 127 "hpricot_scan.rl"
@@ -2445,6 +2480,8 @@
 	{ mark_aval = p; }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 #line 127 "hpricot_scan.rl"
@@ -2461,7 +2498,7 @@
 	if ( ++p == pe )
 		goto _test_eof82;
 case 82:
-#line 2465 "hpricot_scan.c"
+#line 2502 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 32: goto tr175;
 		case 34: goto tr169;
@@ -2508,7 +2545,7 @@
 	if ( ++p == pe )
 		goto _test_eof83;
 case 83:
-#line 2512 "hpricot_scan.c"
+#line 2549 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 32: goto st83;
 		case 34: goto tr169;
@@ -2536,12 +2573,16 @@
 	{ SET(akey, p); }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 	goto st84;
 tr171:
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 	goto st84;
@@ -2550,6 +2591,8 @@
 	{ mark_aval = p; }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 	goto st84;
@@ -2557,7 +2600,7 @@
 	if ( ++p == pe )
 		goto _test_eof84;
 case 84:
-#line 2561 "hpricot_scan.c"
+#line 2604 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 34: goto tr169;
 		case 62: goto tr182;
@@ -2576,6 +2619,8 @@
   }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 #line 68 "hpricot_scan.rl"
@@ -2591,6 +2636,8 @@
   }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 #line 68 "hpricot_scan.rl"
@@ -2601,6 +2648,8 @@
 	{te = p+1;}
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 #line 68 "hpricot_scan.rl"
@@ -2613,6 +2662,8 @@
 	{ SET(akey, p); }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 #line 68 "hpricot_scan.rl"
@@ -2629,6 +2680,8 @@
 	{te = p+1;}
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 #line 116 "hpricot_scan.rl"
@@ -2646,6 +2699,8 @@
 	{ mark_aval = p; }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 #line 116 "hpricot_scan.rl"
@@ -2668,6 +2723,8 @@
 	{ SET(akey, p); }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 #line 68 "hpricot_scan.rl"
@@ -2680,6 +2737,8 @@
 	{ mark_aval = p; }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 #line 68 "hpricot_scan.rl"
@@ -2689,7 +2748,7 @@
 	if ( ++p == pe )
 		goto _test_eof209;
 case 209:
-#line 2693 "hpricot_scan.c"
+#line 2752 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 34: goto tr169;
 		case 92: goto st81;
@@ -2703,7 +2762,7 @@
 	if ( ++p == pe )
 		goto _test_eof85;
 case 85:
-#line 2707 "hpricot_scan.c"
+#line 2766 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 13: goto tr183;
 		case 32: goto tr183;
@@ -2728,7 +2787,7 @@
 	if ( ++p == pe )
 		goto _test_eof86;
 case 86:
-#line 2732 "hpricot_scan.c"
+#line 2791 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 13: goto tr188;
 		case 32: goto tr188;
@@ -2762,7 +2821,7 @@
 	if ( ++p == pe )
 		goto _test_eof87;
 case 87:
-#line 2766 "hpricot_scan.c"
+#line 2825 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 13: goto tr188;
 		case 32: goto tr188;
@@ -2807,7 +2866,7 @@
 	if ( ++p == pe )
 		goto _test_eof88;
 case 88:
-#line 2811 "hpricot_scan.c"
+#line 2870 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 13: goto tr191;
 		case 32: goto tr191;
@@ -2843,7 +2902,7 @@
 	if ( ++p == pe )
 		goto _test_eof89;
 case 89:
-#line 2847 "hpricot_scan.c"
+#line 2906 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 13: goto tr153;
 		case 32: goto tr153;
@@ -2900,7 +2959,7 @@
 	if ( ++p == pe )
 		goto _test_eof90;
 case 90:
-#line 2904 "hpricot_scan.c"
+#line 2963 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 13: goto tr161;
 		case 32: goto tr161;
@@ -2930,6 +2989,8 @@
 tr198:
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 #line 127 "hpricot_scan.rl"
@@ -2947,6 +3008,8 @@
 	{ mark_aval = p; }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 #line 127 "hpricot_scan.rl"
@@ -2963,7 +3026,7 @@
 	if ( ++p == pe )
 		goto _test_eof91;
 case 91:
-#line 2967 "hpricot_scan.c"
+#line 3030 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 13: goto tr200;
 		case 32: goto tr200;
@@ -3011,7 +3074,7 @@
 	if ( ++p == pe )
 		goto _test_eof92;
 case 92:
-#line 3015 "hpricot_scan.c"
+#line 3078 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 13: goto tr206;
 		case 32: goto tr206;
@@ -3044,6 +3107,8 @@
 	{ mark_aval = p; }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 	goto st93;
@@ -3055,12 +3120,16 @@
   }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 	goto st93;
 tr199:
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 #line 116 "hpricot_scan.rl"
@@ -3079,6 +3148,8 @@
 	{ SET(akey, p); }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 	goto st93;
@@ -3092,6 +3163,8 @@
   }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 	goto st93;
@@ -3100,6 +3173,8 @@
 	{ mark_aval = p; }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 #line 116 "hpricot_scan.rl"
@@ -3112,7 +3187,7 @@
 	if ( ++p == pe )
 		goto _test_eof93;
 case 93:
-#line 3116 "hpricot_scan.c"
+#line 3191 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 13: goto tr161;
 		case 32: goto tr161;
@@ -3136,7 +3211,7 @@
 	if ( ++p == pe )
 		goto _test_eof94;
 case 94:
-#line 3140 "hpricot_scan.c"
+#line 3215 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 13: goto tr161;
 		case 32: goto tr161;
@@ -3164,7 +3239,7 @@
 	if ( ++p == pe )
 		goto _test_eof95;
 case 95:
-#line 3168 "hpricot_scan.c"
+#line 3243 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 13: goto tr191;
 		case 32: goto tr191;
@@ -3209,7 +3284,7 @@
 	if ( ++p == pe )
 		goto _test_eof97;
 case 97:
-#line 3213 "hpricot_scan.c"
+#line 3288 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 13: goto tr220;
 		case 32: goto tr220;
@@ -3254,7 +3329,7 @@
 	if ( ++p == pe )
 		goto _test_eof98;
 case 98:
-#line 3258 "hpricot_scan.c"
+#line 3333 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 32: goto st98;
 		case 34: goto tr228;
@@ -3285,7 +3360,7 @@
 	if ( ++p == pe )
 		goto _test_eof99;
 case 99:
-#line 3289 "hpricot_scan.c"
+#line 3364 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 34: goto tr228;
 		case 39: goto tr174;
@@ -3332,7 +3407,7 @@
 	if ( ++p == pe )
 		goto _test_eof100;
 case 100:
-#line 3336 "hpricot_scan.c"
+#line 3411 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 32: goto st100;
 		case 39: goto tr169;
@@ -3362,7 +3437,7 @@
 	if ( ++p == pe )
 		goto _test_eof101;
 case 101:
-#line 3366 "hpricot_scan.c"
+#line 3441 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 39: goto tr169;
 		case 92: goto st102;
@@ -3376,7 +3451,7 @@
 	if ( ++p == pe )
 		goto _test_eof102;
 case 102:
-#line 3380 "hpricot_scan.c"
+#line 3455 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 39: goto tr228;
 		case 92: goto st102;
@@ -3385,6 +3460,8 @@
 tr235:
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 #line 127 "hpricot_scan.rl"
@@ -3402,6 +3479,8 @@
 	{ mark_aval = p; }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 #line 127 "hpricot_scan.rl"
@@ -3418,7 +3497,7 @@
 	if ( ++p == pe )
 		goto _test_eof103;
 case 103:
-#line 3422 "hpricot_scan.c"
+#line 3501 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 32: goto tr239;
 		case 39: goto tr169;
@@ -3465,7 +3544,7 @@
 	if ( ++p == pe )
 		goto _test_eof104;
 case 104:
-#line 3469 "hpricot_scan.c"
+#line 3548 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 32: goto st104;
 		case 39: goto tr169;
@@ -3493,12 +3572,16 @@
 	{ SET(akey, p); }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 	goto st105;
 tr236:
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 	goto st105;
@@ -3507,6 +3590,8 @@
 	{ mark_aval = p; }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 	goto st105;
@@ -3514,7 +3599,7 @@
 	if ( ++p == pe )
 		goto _test_eof105;
 case 105:
-#line 3518 "hpricot_scan.c"
+#line 3603 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 39: goto tr169;
 		case 62: goto tr246;
@@ -3533,6 +3618,8 @@
   }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 #line 68 "hpricot_scan.rl"
@@ -3548,6 +3635,8 @@
   }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 #line 68 "hpricot_scan.rl"
@@ -3558,6 +3647,8 @@
 	{te = p+1;}
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 #line 68 "hpricot_scan.rl"
@@ -3570,6 +3661,8 @@
 	{ SET(akey, p); }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 #line 68 "hpricot_scan.rl"
@@ -3586,6 +3679,8 @@
 	{te = p+1;}
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 #line 116 "hpricot_scan.rl"
@@ -3603,6 +3698,8 @@
 	{ mark_aval = p; }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 #line 116 "hpricot_scan.rl"
@@ -3625,6 +3722,8 @@
 	{ SET(akey, p); }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 #line 68 "hpricot_scan.rl"
@@ -3637,6 +3736,8 @@
 	{ mark_aval = p; }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 #line 68 "hpricot_scan.rl"
@@ -3646,7 +3747,7 @@
 	if ( ++p == pe )
 		goto _test_eof210;
 case 210:
-#line 3650 "hpricot_scan.c"
+#line 3751 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 39: goto tr169;
 		case 92: goto st102;
@@ -3660,7 +3761,7 @@
 	if ( ++p == pe )
 		goto _test_eof106;
 case 106:
-#line 3664 "hpricot_scan.c"
+#line 3765 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 13: goto tr248;
 		case 32: goto tr248;
@@ -3685,7 +3786,7 @@
 	if ( ++p == pe )
 		goto _test_eof107;
 case 107:
-#line 3689 "hpricot_scan.c"
+#line 3790 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 13: goto tr255;
 		case 32: goto tr255;
@@ -3737,7 +3838,7 @@
 	if ( ++p == pe )
 		goto _test_eof108;
 case 108:
-#line 3741 "hpricot_scan.c"
+#line 3842 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 13: goto tr255;
 		case 32: goto tr255;
@@ -3767,6 +3868,8 @@
 tr260:
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 #line 127 "hpricot_scan.rl"
@@ -3784,6 +3887,8 @@
 	{ mark_aval = p; }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 #line 127 "hpricot_scan.rl"
@@ -3800,7 +3905,7 @@
 	if ( ++p == pe )
 		goto _test_eof109;
 case 109:
-#line 3804 "hpricot_scan.c"
+#line 3909 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 13: goto tr263;
 		case 32: goto tr263;
@@ -3848,7 +3953,7 @@
 	if ( ++p == pe )
 		goto _test_eof110;
 case 110:
-#line 3852 "hpricot_scan.c"
+#line 3957 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 13: goto tr269;
 		case 32: goto tr269;
@@ -3881,6 +3986,8 @@
 	{ mark_aval = p; }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 	goto st111;
@@ -3892,12 +3999,16 @@
   }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 	goto st111;
 tr261:
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 #line 116 "hpricot_scan.rl"
@@ -3916,6 +4027,8 @@
 	{ SET(akey, p); }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 	goto st111;
@@ -3929,6 +4042,8 @@
   }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 	goto st111;
@@ -3937,6 +4052,8 @@
 	{ mark_aval = p; }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 #line 116 "hpricot_scan.rl"
@@ -3949,7 +4066,7 @@
 	if ( ++p == pe )
 		goto _test_eof111;
 case 111:
-#line 3953 "hpricot_scan.c"
+#line 4070 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 13: goto tr255;
 		case 32: goto tr255;
@@ -3973,7 +4090,7 @@
 	if ( ++p == pe )
 		goto _test_eof112;
 case 112:
-#line 3977 "hpricot_scan.c"
+#line 4094 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 13: goto tr255;
 		case 32: goto tr255;
@@ -4001,7 +4118,7 @@
 	if ( ++p == pe )
 		goto _test_eof113;
 case 113:
-#line 4005 "hpricot_scan.c"
+#line 4122 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 13: goto tr272;
 		case 32: goto tr272;
@@ -4035,7 +4152,7 @@
 	if ( ++p == pe )
 		goto _test_eof114;
 case 114:
-#line 4039 "hpricot_scan.c"
+#line 4156 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 13: goto tr277;
 		case 32: goto tr277;
@@ -4080,7 +4197,7 @@
 	if ( ++p == pe )
 		goto _test_eof115;
 case 115:
-#line 4084 "hpricot_scan.c"
+#line 4201 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 13: goto tr272;
 		case 32: goto tr272;
@@ -4152,7 +4269,7 @@
 	if ( ++p == pe )
 		goto _test_eof117;
 case 117:
-#line 4156 "hpricot_scan.c"
+#line 4273 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 13: goto tr220;
 		case 32: goto tr220;
@@ -4183,6 +4300,8 @@
 tr282:
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 #line 127 "hpricot_scan.rl"
@@ -4200,6 +4319,8 @@
 	{ mark_aval = p; }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 #line 127 "hpricot_scan.rl"
@@ -4216,7 +4337,7 @@
 	if ( ++p == pe )
 		goto _test_eof118;
 case 118:
-#line 4220 "hpricot_scan.c"
+#line 4341 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 13: goto tr285;
 		case 32: goto tr285;
@@ -4269,7 +4390,7 @@
 	if ( ++p == pe )
 		goto _test_eof119;
 case 119:
-#line 4273 "hpricot_scan.c"
+#line 4394 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 32: goto st119;
 		case 34: goto tr228;
@@ -4296,6 +4417,8 @@
 tr229:
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 #line 127 "hpricot_scan.rl"
@@ -4313,6 +4436,8 @@
 	{ mark_aval = p; }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 #line 127 "hpricot_scan.rl"
@@ -4329,7 +4454,7 @@
 	if ( ++p == pe )
 		goto _test_eof120;
 case 120:
-#line 4333 "hpricot_scan.c"
+#line 4458 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 32: goto tr293;
 		case 34: goto tr228;
@@ -4358,12 +4483,16 @@
 	{ SET(akey, p); }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 	goto st121;
 tr230:
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 	goto st121;
@@ -4372,6 +4501,8 @@
 	{ mark_aval = p; }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 	goto st121;
@@ -4379,7 +4510,7 @@
 	if ( ++p == pe )
 		goto _test_eof121;
 case 121:
-#line 4383 "hpricot_scan.c"
+#line 4514 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 34: goto tr228;
 		case 39: goto tr174;
@@ -4399,6 +4530,8 @@
   }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 #line 68 "hpricot_scan.rl"
@@ -4414,6 +4547,8 @@
   }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 #line 68 "hpricot_scan.rl"
@@ -4424,6 +4559,8 @@
 	{te = p+1;}
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 #line 68 "hpricot_scan.rl"
@@ -4436,6 +4573,8 @@
 	{ SET(akey, p); }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 #line 68 "hpricot_scan.rl"
@@ -4452,6 +4591,8 @@
 	{te = p+1;}
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 #line 116 "hpricot_scan.rl"
@@ -4469,6 +4610,8 @@
 	{ mark_aval = p; }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 #line 116 "hpricot_scan.rl"
@@ -4491,6 +4634,8 @@
 	{ SET(akey, p); }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 #line 68 "hpricot_scan.rl"
@@ -4503,6 +4648,8 @@
 	{ mark_aval = p; }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 #line 68 "hpricot_scan.rl"
@@ -4512,7 +4659,7 @@
 	if ( ++p == pe )
 		goto _test_eof211;
 case 211:
-#line 4516 "hpricot_scan.c"
+#line 4663 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 34: goto tr228;
 		case 39: goto tr174;
@@ -4527,7 +4674,7 @@
 	if ( ++p == pe )
 		goto _test_eof122;
 case 122:
-#line 4531 "hpricot_scan.c"
+#line 4678 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 34: goto tr299;
 		case 39: goto tr299;
@@ -4542,7 +4689,7 @@
 	if ( ++p == pe )
 		goto _test_eof123;
 case 123:
-#line 4546 "hpricot_scan.c"
+#line 4693 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 13: goto tr300;
 		case 32: goto tr300;
@@ -4567,7 +4714,7 @@
 	if ( ++p == pe )
 		goto _test_eof124;
 case 124:
-#line 4571 "hpricot_scan.c"
+#line 4718 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 13: goto tr305;
 		case 32: goto tr305;
@@ -4601,7 +4748,7 @@
 	if ( ++p == pe )
 		goto _test_eof125;
 case 125:
-#line 4605 "hpricot_scan.c"
+#line 4752 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 13: goto tr305;
 		case 32: goto tr305;
@@ -4646,7 +4793,7 @@
 	if ( ++p == pe )
 		goto _test_eof126;
 case 126:
-#line 4650 "hpricot_scan.c"
+#line 4797 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 13: goto tr308;
 		case 32: goto tr308;
@@ -4682,7 +4829,7 @@
 	if ( ++p == pe )
 		goto _test_eof127;
 case 127:
-#line 4686 "hpricot_scan.c"
+#line 4833 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 13: goto tr211;
 		case 32: goto tr211;
@@ -4715,6 +4862,8 @@
 	{ mark_aval = p; }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 	goto st128;
@@ -4726,12 +4875,16 @@
   }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 	goto st128;
 tr283:
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 #line 116 "hpricot_scan.rl"
@@ -4750,6 +4903,8 @@
 	{ SET(akey, p); }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 	goto st128;
@@ -4763,6 +4918,8 @@
   }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 	goto st128;
@@ -4771,6 +4928,8 @@
 	{ mark_aval = p; }
 #line 134 "hpricot_scan.rl"
 	{
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 #line 116 "hpricot_scan.rl"
@@ -4783,7 +4942,7 @@
 	if ( ++p == pe )
 		goto _test_eof128;
 case 128:
-#line 4787 "hpricot_scan.c"
+#line 4946 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 13: goto tr220;
 		case 32: goto tr220;
@@ -4808,7 +4967,7 @@
 	if ( ++p == pe )
 		goto _test_eof129;
 case 129:
-#line 4812 "hpricot_scan.c"
+#line 4971 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 13: goto tr220;
 		case 32: goto tr220;
@@ -4833,7 +4992,7 @@
 	if ( ++p == pe )
 		goto _test_eof130;
 case 130:
-#line 4837 "hpricot_scan.c"
+#line 4996 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 13: goto tr211;
 		case 32: goto tr211;
@@ -4869,7 +5028,7 @@
 	if ( ++p == pe )
 		goto _test_eof131;
 case 131:
-#line 4873 "hpricot_scan.c"
+#line 5032 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 32: goto tr315;
 		case 34: goto tr316;
@@ -4900,7 +5059,7 @@
 	if ( ++p == pe )
 		goto _test_eof132;
 case 132:
-#line 4904 "hpricot_scan.c"
+#line 5063 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 32: goto tr315;
 		case 34: goto tr322;
@@ -4935,7 +5094,7 @@
 	if ( ++p == pe )
 		goto _test_eof133;
 case 133:
-#line 4939 "hpricot_scan.c"
+#line 5098 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 13: goto tr308;
 		case 32: goto tr308;
@@ -4972,7 +5131,7 @@
 	if ( ++p == pe )
 		goto _test_eof134;
 case 134:
-#line 4976 "hpricot_scan.c"
+#line 5135 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 13: goto tr323;
 		case 32: goto tr323;
@@ -5009,7 +5168,7 @@
 	if ( ++p == pe )
 		goto _test_eof135;
 case 135:
-#line 5013 "hpricot_scan.c"
+#line 5172 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 13: goto tr326;
 		case 32: goto tr326;
@@ -5054,7 +5213,7 @@
 	if ( ++p == pe )
 		goto _test_eof137;
 case 137:
-#line 5058 "hpricot_scan.c"
+#line 5217 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 32: goto tr330;
 		case 39: goto tr331;
@@ -5084,7 +5243,7 @@
 	if ( ++p == pe )
 		goto _test_eof138;
 case 138:
-#line 5088 "hpricot_scan.c"
+#line 5247 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 13: goto tr277;
 		case 32: goto tr277;
@@ -5109,7 +5268,7 @@
 	if ( ++p == pe )
 		goto _test_eof139;
 case 139:
-#line 5113 "hpricot_scan.c"
+#line 5272 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 32: goto tr336;
 		case 34: goto tr331;
@@ -5186,7 +5345,7 @@
 	if ( ++p == pe )
 		goto _test_eof144;
 case 144:
-#line 5190 "hpricot_scan.c"
+#line 5349 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 13: goto tr148;
 		case 32: goto tr148;
@@ -5225,7 +5384,7 @@
 	if ( ++p == pe )
 		goto _test_eof146;
 case 146:
-#line 5229 "hpricot_scan.c"
+#line 5388 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 32: goto st212;
 		case 63: goto st146;
@@ -5263,7 +5422,7 @@
 	if ( ++p == pe )
 		goto _test_eof147;
 case 147:
-#line 5267 "hpricot_scan.c"
+#line 5426 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 32: goto st212;
 		case 63: goto st146;
@@ -5342,7 +5501,7 @@
 	if ( ++p == pe )
 		goto _test_eof213;
 case 213:
-#line 5346 "hpricot_scan.c"
+#line 5505 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 32: goto tr348;
 		case 118: goto st150;
@@ -5441,7 +5600,7 @@
 	if ( ++p == pe )
 		goto _test_eof159;
 case 159:
-#line 5445 "hpricot_scan.c"
+#line 5604 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 34: goto tr360;
 		case 95: goto st159;
@@ -5466,7 +5625,7 @@
 	if ( ++p == pe )
 		goto _test_eof160;
 case 160:
-#line 5470 "hpricot_scan.c"
+#line 5629 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 32: goto st161;
 		case 62: goto tr363;
@@ -5586,7 +5745,7 @@
 	if ( ++p == pe )
 		goto _test_eof173;
 case 173:
-#line 5590 "hpricot_scan.c"
+#line 5749 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 34: goto tr378;
 		case 95: goto st173;
@@ -5611,7 +5770,7 @@
 	if ( ++p == pe )
 		goto _test_eof174;
 case 174:
-#line 5615 "hpricot_scan.c"
+#line 5774 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 32: goto st175;
 		case 62: goto tr363;
@@ -5736,7 +5895,7 @@
 	if ( ++p == pe )
 		goto _test_eof188;
 case 188:
-#line 5740 "hpricot_scan.c"
+#line 5899 "hpricot_scan.c"
 	if ( (*p) == 111 )
 		goto st189;
 	goto tr349;
@@ -5755,7 +5914,7 @@
 	if ( ++p == pe )
 		goto _test_eof190;
 case 190:
-#line 5759 "hpricot_scan.c"
+#line 5918 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 32: goto st190;
 		case 62: goto tr363;
@@ -5772,7 +5931,7 @@
 	if ( ++p == pe )
 		goto _test_eof191;
 case 191:
-#line 5776 "hpricot_scan.c"
+#line 5935 "hpricot_scan.c"
 	if ( (*p) == 101 )
 		goto st192;
 	goto tr349;
@@ -5800,7 +5959,7 @@
 	if ( ++p == pe )
 		goto _test_eof194;
 case 194:
-#line 5804 "hpricot_scan.c"
+#line 5963 "hpricot_scan.c"
 	if ( (*p) == 111 )
 		goto st195;
 	goto tr349;
@@ -5819,7 +5978,7 @@
 	if ( ++p == pe )
 		goto _test_eof196;
 case 196:
-#line 5823 "hpricot_scan.c"
+#line 5982 "hpricot_scan.c"
 	if ( (*p) == 101 )
 		goto st197;
 	goto tr349;
@@ -5848,7 +6007,7 @@
 	if ( ++p == pe )
 		goto _test_eof199;
 case 199:
-#line 5852 "hpricot_scan.c"
+#line 6011 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 39: goto tr378;
 		case 95: goto st199;
@@ -5891,7 +6050,7 @@
 	if ( ++p == pe )
 		goto _test_eof201;
 case 201:
-#line 5895 "hpricot_scan.c"
+#line 6054 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 39: goto tr360;
 		case 95: goto st201;
@@ -5940,7 +6099,7 @@
 case 214:
 #line 1 "hpricot_scan.rl"
 	{ts = p;}
-#line 5944 "hpricot_scan.c"
+#line 6103 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 10: goto tr423;
 		case 45: goto tr424;
@@ -5954,7 +6113,7 @@
 	if ( ++p == pe )
 		goto _test_eof215;
 case 215:
-#line 5958 "hpricot_scan.c"
+#line 6117 "hpricot_scan.c"
 	if ( (*p) == 45 )
 		goto st202;
 	goto tr425;
@@ -5997,7 +6156,7 @@
 case 216:
 #line 1 "hpricot_scan.rl"
 	{ts = p;}
-#line 6001 "hpricot_scan.c"
+#line 6160 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 10: goto tr428;
 		case 93: goto tr429;
@@ -6011,7 +6170,7 @@
 	if ( ++p == pe )
 		goto _test_eof217;
 case 217:
-#line 6015 "hpricot_scan.c"
+#line 6174 "hpricot_scan.c"
 	if ( (*p) == 93 )
 		goto st203;
 	goto tr430;
@@ -6050,7 +6209,7 @@
 case 218:
 #line 1 "hpricot_scan.rl"
 	{ts = p;}
-#line 6054 "hpricot_scan.c"
+#line 6213 "hpricot_scan.c"
 	switch( (*p) ) {
 		case 10: goto tr433;
 		case 62: goto tr434;
@@ -6510,7 +6669,7 @@
 	}
 
 	}
-#line 532 "hpricot_scan.rl"
+#line 534 "hpricot_scan.rl"
 
     if (cs == hpricot_scan_error) {
       if (buf != NULL)
diff -Nru /tmp/aPeI5X1Iz5/libhpricot-ruby-0.8/ext/hpricot_scan/hpricot_scan.java.rl /tmp/kCvPnLCzlr/libhpricot-ruby-0.8.2/ext/hpricot_scan/hpricot_scan.java.rl
--- libhpricot-ruby-0.8/ext/hpricot_scan/hpricot_scan.java.rl	2009-03-24 19:43:02.000000000 +0000
+++ libhpricot-ruby-0.8.2/ext/hpricot_scan/hpricot_scan.java.rl	2009-12-13 23:54:10.000000000 +0000
@@ -2,372 +2,1151 @@
 import java.io.IOException;
 
 import org.jruby.Ruby;
+import org.jruby.RubyArray;
 import org.jruby.RubyClass;
 import org.jruby.RubyHash;
 import org.jruby.RubyModule;
 import org.jruby.RubyNumeric;
+import org.jruby.RubyObject;
 import org.jruby.RubyObjectAdapter;
+import org.jruby.RubyRegexp;
 import org.jruby.RubyString;
+import org.jruby.anno.JRubyMethod;
+import org.jruby.exceptions.RaiseException;
 import org.jruby.javasupport.JavaEmbedUtils;
+import org.jruby.runtime.Arity;
 import org.jruby.runtime.Block;
-import org.jruby.runtime.CallbackFactory;
+import org.jruby.runtime.ObjectAllocator;
+import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
+import org.jruby.runtime.callback.Callback;
 import org.jruby.exceptions.RaiseException;
 import org.jruby.runtime.load.BasicLibraryService;
+import org.jruby.util.ByteList;
 
 public class HpricotScanService implements BasicLibraryService {
-       public static String NO_WAY_SERIOUSLY="*** This should not happen, please send a bug report with the HTML you're parsing to why@whytheluckystiff.net.  So sorry!";
-       private static RubyObjectAdapter rubyApi;
+    public static byte[] realloc(byte[] input, int size) {
+        byte[] newArray = new byte[size];
+        System.arraycopy(input, 0, newArray, 0, input.length);
+        return newArray;
+    }
+
+    // hpricot_state
+    public static class State {
+        public IRubyObject doc;
+        public IRubyObject focus;
+        public IRubyObject last;
+        public IRubyObject EC;
+        public boolean xml, strict, fixup;
+    }
+
+    static boolean OPT(IRubyObject opts, String key) {
+        Ruby runtime = opts.getRuntime();
+        return !opts.isNil() && ((RubyHash)opts).op_aref(runtime.getCurrentContext(), runtime.newSymbol(key)).isTrue();
+    }
+
+    // H_PROP(name, H_ELE_TAG)
+    public static IRubyObject hpricot_ele_set_name(IRubyObject self, IRubyObject x) {
+        H_ELE_SET(self, H_ELE_TAG, x);
+        return self;
+    }
+
+    public static IRubyObject hpricot_ele_clear_name(IRubyObject self) {
+        H_ELE_SET(self, H_ELE_TAG, self.getRuntime().getNil());
+        return self.getRuntime().getTrue();
+    }
+
+    public static IRubyObject hpricot_ele_get_name(IRubyObject self) {
+        return H_ELE_GET(self, H_ELE_TAG);
+    }
+
+    // H_PROP(raw, H_ELE_RAW)
+    public static IRubyObject hpricot_ele_set_raw(IRubyObject self, IRubyObject x) {
+        H_ELE_SET(self, H_ELE_RAW, x);
+        return self;
+    }
 
-       public void ELE(IRubyObject N) {
-         if (te > ts || text) {
-           IRubyObject raw_string = runtime.getNil();
-           ele_open = false; text = false;
-           if (ts != -1 && N != cdata && N != sym_text && N != procins && N != comment) { 
-             raw_string = runtime.newString(new String(buf,ts,te-ts));
-           } 
-           rb_yield_tokens(N, tag[0], attr, raw_string, taint);
-         }
-       }
-
-       public void SET(IRubyObject[] N, int E) {
-         int mark = 0;
-         if(N == tag) { 
-           if(mark_tag == -1 || E == mark_tag) {
-             tag[0] = runtime.newString("");
-           } else if(E > mark_tag) {
-             tag[0] = runtime.newString(new String(buf,mark_tag, E-mark_tag));
-           }
-         } else if(N == akey) {
-           if(mark_akey == -1 || E == mark_akey) {
-             akey[0] = runtime.newString("");
-           } else if(E > mark_akey) {
-             akey[0] = runtime.newString(new String(buf,mark_akey, E-mark_akey));
-           }
-         } else if(N == aval) {
-           if(mark_aval == -1 || E == mark_aval) {
-             aval[0] = runtime.newString("");
-           } else if(E > mark_aval) {
-             aval[0] = runtime.newString(new String(buf,mark_aval, E-mark_aval));
-           }
-         }
-       }
-
-       public void CAT(IRubyObject[] N, int E) {
-         if(N[0].isNil()) {
-           SET(N,E);
-         } else {
-           int mark = 0;
-           if(N == tag) {
-             mark = mark_tag;
-           } else if(N == akey) {
-             mark = mark_akey;
-           } else if(N == aval) {
-             mark = mark_aval;
-           }
-           ((RubyString)(N[0])).append(runtime.newString(new String(buf, mark, E-mark)));
-         }
-       }
-
-       public void SLIDE(Object N) {
-           int mark = 0;
-           if(N == tag) {
-             mark = mark_tag;
-           } else if(N == akey) {
-             mark = mark_akey;
-           } else if(N == aval) {
-             mark = mark_aval;
-           }
-           if(mark > ts) {
-             if(N == tag) {
-               mark_tag  -= ts;
-             } else if(N == akey) {
-               mark_akey -= ts;
-             } else if(N == aval) {
-               mark_aval -= ts;
-             }
-           }
-       }
-
-       public void ATTR(IRubyObject K, IRubyObject V) {
-         if(!K.isNil()) {
-           if(attr.isNil()) {
-             attr = RubyHash.newHash(runtime);
-           }
-           ((RubyHash)attr).op_aset(runtime.getCurrentContext(),K,V);
-           // ((RubyHash)attr).aset(K,V);
-         }
-       }
-
-       public void ATTR(IRubyObject[] K, IRubyObject V) {
-         ATTR(K[0],V);
-       }
-
-       public void ATTR(IRubyObject K, IRubyObject[] V) {
-         ATTR(K,V[0]);
-       }
-
-       public void ATTR(IRubyObject[] K, IRubyObject[] V) {
-         ATTR(K[0],V[0]);
-       }
-
-       public void TEXT_PASS() {
-         if(!text) { 
-           if(ele_open) { 
-             ele_open = false; 
-             if(ts > -1) { 
-               mark_tag = ts; 
-             } 
-           } else {
-             mark_tag = p; 
-           } 
-           attr = runtime.getNil(); 
-           tag[0] = runtime.getNil(); 
-           text = true; 
-         }
-       }
-
-       public void EBLK(IRubyObject N, int T) {
-         CAT(tag, p - T + 1);
-         ELE(N);
-       }
-
-
-       public void rb_raise(RubyClass error, String message) {
-              throw new RaiseException(runtime, error, message, true);
-       }
-
-       public IRubyObject rb_str_new2(String s) {
-              return runtime.newString(s);
-       }
+    public static IRubyObject hpricot_ele_clear_raw(IRubyObject self) {
+        H_ELE_SET(self, H_ELE_RAW, self.getRuntime().getNil());
+        return self.getRuntime().getTrue();
+    }
+
+    public static IRubyObject hpricot_ele_get_raw(IRubyObject self) {
+        return H_ELE_GET(self, H_ELE_RAW);
+    }
+
+    // H_PROP(parent, H_ELE_PARENT)
+    public static IRubyObject hpricot_ele_set_parent(IRubyObject self, IRubyObject x) {
+        H_ELE_SET(self, H_ELE_PARENT, x);
+        return self;
+    }
+
+    public static IRubyObject hpricot_ele_clear_parent(IRubyObject self) {
+        H_ELE_SET(self, H_ELE_PARENT, self.getRuntime().getNil());
+        return self.getRuntime().getTrue();
+    }
+
+    public static IRubyObject hpricot_ele_get_parent(IRubyObject self) {
+        return H_ELE_GET(self, H_ELE_PARENT);
+    }
+
+    // H_PROP(attr, H_ELE_ATTR)
+    public static IRubyObject hpricot_ele_set_attr(IRubyObject self, IRubyObject x) {
+        H_ELE_SET(self, H_ELE_ATTR, x);
+        return self;
+    }
+
+    public static IRubyObject hpricot_ele_clear_attr(IRubyObject self) {
+        H_ELE_SET(self, H_ELE_ATTR, self.getRuntime().getNil());
+        return self.getRuntime().getTrue();
+    }
+
+    public static IRubyObject hpricot_ele_get_attr(IRubyObject self) {
+        return H_ELE_GET(self, H_ELE_ATTR);
+    }
+
+    // H_PROP(etag, H_ELE_ETAG)
+    public static IRubyObject hpricot_ele_set_etag(IRubyObject self, IRubyObject x) {
+        H_ELE_SET(self, H_ELE_ETAG, x);
+        return self;
+    }
+
+    public static IRubyObject hpricot_ele_clear_etag(IRubyObject self) {
+        H_ELE_SET(self, H_ELE_ETAG, self.getRuntime().getNil());
+        return self.getRuntime().getTrue();
+    }
+
+    public static IRubyObject hpricot_ele_get_etag(IRubyObject self) {
+        return H_ELE_GET(self, H_ELE_ETAG);
+    }
+
+    // H_PROP(children, H_ELE_CHILDREN)
+    public static IRubyObject hpricot_ele_set_children(IRubyObject self, IRubyObject x) {
+        H_ELE_SET(self, H_ELE_CHILDREN, x);
+        return self;
+    }
+
+    public static IRubyObject hpricot_ele_clear_children(IRubyObject self) {
+        H_ELE_SET(self, H_ELE_CHILDREN, self.getRuntime().getNil());
+        return self.getRuntime().getTrue();
+    }
+
+    public static IRubyObject hpricot_ele_get_children(IRubyObject self) {
+        return H_ELE_GET(self, H_ELE_CHILDREN);
+    }
+
+    // H_ATTR(target)
+    public static IRubyObject hpricot_ele_set_target(IRubyObject self, IRubyObject x) {
+        ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("target"), x);
+        return self;
+    }
+
+    public static IRubyObject hpricot_ele_get_target(IRubyObject self) {
+        return ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("target"));
+    }
+
+    // H_ATTR(encoding)
+    public static IRubyObject hpricot_ele_set_encoding(IRubyObject self, IRubyObject x) {
+        ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("encoding"), x);
+        return self;
+    }
+
+    public static IRubyObject hpricot_ele_get_encoding(IRubyObject self) {
+        return ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("encoding"));
+    }
+
+    // H_ATTR(version)
+    public static IRubyObject hpricot_ele_set_version(IRubyObject self, IRubyObject x) {
+        ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("version"), x);
+        return self;
+    }
+
+    public static IRubyObject hpricot_ele_get_version(IRubyObject self) {
+        return ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("version"));
+    }
+
+    // H_ATTR(standalone)
+    public static IRubyObject hpricot_ele_set_standalone(IRubyObject self, IRubyObject x) {
+        ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("standalone"), x);
+        return self;
+    }
+
+    public static IRubyObject hpricot_ele_get_standalone(IRubyObject self) {
+        return ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("standalone"));
+    }
+
+    // H_ATTR(system_id)
+    public static IRubyObject hpricot_ele_set_system_id(IRubyObject self, IRubyObject x) {
+        ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("system_id"), x);
+        return self;
+    }
+
+    public static IRubyObject hpricot_ele_get_system_id(IRubyObject self) {
+        return ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("system_id"));
+    }
+
+    // H_ATTR(public_id)
+    public static IRubyObject hpricot_ele_set_public_id(IRubyObject self, IRubyObject x) {
+        ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("public_id"), x);
+        return self;
+    }
+
+    public static IRubyObject hpricot_ele_get_public_id(IRubyObject self) {
+        return ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("public_id"));
+    }
+
+    public static class Scanner {
+        public IRubyObject SET(int mark, int E, IRubyObject org) {
+            if(mark == -1 || E == mark) {
+                return runtime.newString("");
+            } else if(E > mark) {
+                return RubyString.newString(runtime, data, mark, E-mark);
+            } else {
+                return org;
+            }
+        }
+
+        public int SLIDE(int N) {
+            if(N > ts) {
+                return N - ts;
+            } else {
+                return N;
+            }
+        }
+
+        public IRubyObject CAT(IRubyObject N, int mark, int E) {
+            if(N.isNil()) {
+                return SET(mark, E, N);
+            } else {
+                ((RubyString)N).cat(data, mark, E-mark);
+                return N;
+            }
+        }
+
+        public void ATTR(IRubyObject K, IRubyObject V) {
+            if(!K.isNil()) {
+                if(attr.isNil()) {
+                    attr = RubyHash.newHash(runtime);
+                }
+                ((RubyHash)attr).fastASet(K, V);
+            }
+        }
+
+        public void TEXT_PASS() {
+            if(!text) {
+                if(ele_open) {
+                    ele_open = false;
+                    if(ts != -1) {
+                        mark_tag = ts;
+                    }
+                } else {
+                    mark_tag = p;
+                }
+                attr = runtime.getNil();
+                tag = runtime.getNil();
+                text = true;
+            }
+        }
+
+        public void ELE(IRubyObject N) {
+            if(te > ts || text) {
+                int raw = -1;
+                int rawlen = 0;
+                ele_open = false; 
+                text = false;
+
+                if(ts != -1 && N != x.sym_cdata && N != x.sym_text && N != x.sym_procins && N != x.sym_comment) {
+                    raw = ts; 
+                    rawlen = te - ts;
+                }
+
+                if(block.isGiven()) {
+                    IRubyObject raw_string = runtime.getNil();
+                    if(raw != -1) {
+                        raw_string = RubyString.newString(runtime, data, raw, rawlen);
+                    }
+                    yieldTokens(N, tag, attr, runtime.getNil(), taint);
+                } else {
+                    hpricotToken(S, N, tag, attr, raw, rawlen, taint);
+                }
+            }
+        }
+        
+
+        public void EBLK(IRubyObject N, int T) {
+            tag = CAT(tag, mark_tag, p - T + 1);
+            ELE(N);
+        }
+
+        public void hpricotAdd(IRubyObject focus, IRubyObject ele) {
+            IRubyObject children = H_ELE_GET(focus, H_ELE_CHILDREN);
+            if(children.isNil()) {
+                H_ELE_SET(focus, H_ELE_CHILDREN, children = RubyArray.newArray(runtime, 1));
+            }
+            ((RubyArray)children).append(ele);
+            H_ELE_SET(ele, H_ELE_PARENT, focus);
+        }
+
+        private static class TokenInfo {
+            public IRubyObject sym;
+            public IRubyObject tag;
+            public IRubyObject attr;
+            public int raw;
+            public int rawlen;
+            public IRubyObject ec;
+            public IRubyObject ele;
+            public Extra x;
+            public Ruby runtime;
+            public Scanner scanner;
+            public State S;
+
+            public void H_ELE(RubyClass klass) {
+                ele = klass.allocate();
+                if(klass == x.cElem) {
+                    H_ELE_SET(ele, H_ELE_TAG, tag);
+                    H_ELE_SET(ele, H_ELE_ATTR, attr);
+                    H_ELE_SET(ele, H_ELE_EC, ec);
+                    if(raw != -1 && (sym == x.sym_emptytag || sym == x.sym_stag || sym == x.sym_doctype)) {
+                        H_ELE_SET(ele, H_ELE_RAW, RubyString.newString(runtime, scanner.data, raw, rawlen));
+                    }
+                } else if(klass == x.cDocType || klass == x.cProcIns || klass == x.cXMLDecl || klass == x.cBogusETag) {
+                    if(klass == x.cBogusETag) {
+                        H_ELE_SET(ele, H_ELE_TAG, tag);
+                        if(raw != -1) {
+                            H_ELE_SET(ele, H_ELE_ATTR, RubyString.newString(runtime, scanner.data, raw, rawlen));
+                        }
+                    } else {
+                        if(klass == x.cDocType) {
+                            scanner.ATTR(runtime.newSymbol("target"), tag);
+                        }
+                        H_ELE_SET(ele, H_ELE_ATTR, attr);
+                        if(klass != x.cProcIns) {
+                            tag = runtime.getNil();
+                            if(raw != -1) {
+                                tag = RubyString.newString(runtime, scanner.data, raw, rawlen);
+                            }
+                        }
+                        H_ELE_SET(ele, H_ELE_TAG, tag);
+                    }
+                } else {
+                    H_ELE_SET(ele, H_ELE_TAG, tag);
+                }
+                S.last = ele;
+            }
+
+            public void hpricotToken(boolean taint) {
+                //
+                // in html mode, fix up start tags incorrectly formed as empty tags
+                //
+                if(!S.xml) {
+                    if(sym == x.sym_emptytag || sym == x.sym_stag || sym == x.sym_etag) {
+                        ec = ((RubyHash)S.EC).op_aref(scanner.ctx, tag);
+                        if(ec.isNil()) {
+                            tag = tag.callMethod(scanner.ctx, "downcase");
+                            ec = ((RubyHash)S.EC).op_aref(scanner.ctx, tag);
+                        }
+                    }
+
+                    if(H_ELE_GET(S.focus, H_ELE_EC) == x.sym_CDATA && 
+                       (sym != x.sym_procins && sym != x.sym_comment && sym != x.sym_cdata && sym != x.sym_text) && 
+                       !(sym == x.sym_etag && runtime.newFixnum(tag.hashCode()).equals(H_ELE_GET(S.focus, H_ELE_HASH)))) {
+                        sym = x.sym_text;
+                        tag = RubyString.newString(runtime, scanner.data, raw, rawlen);
+                    }
+
+                    if(!ec.isNil()) {
+                        if(sym == x.sym_emptytag) {
+                            if(ec != x.sym_EMPTY) {
+                                sym = x.sym_stag;
+                            }
+                        } else if(sym == x.sym_stag) {
+                            if(ec == x.sym_EMPTY) {
+                                sym = x.sym_emptytag;
+                            }
+                        }
+                    }
+                }
+
+                if(sym == x.sym_emptytag || sym == x.sym_stag) {
+                    IRubyObject name = runtime.newFixnum(tag.hashCode());
+                    H_ELE(x.cElem);
+                    H_ELE_SET(ele, H_ELE_HASH, name);
+
+                    if(!S.xml) {
+                        IRubyObject match = runtime.getNil(), e = S.focus;
+                        while(e != S.doc) {
+                            IRubyObject hEC = H_ELE_GET(e, H_ELE_EC);
+                            if(hEC instanceof RubyHash) {
+                                IRubyObject has = ((RubyHash)hEC).op_aref(scanner.ctx, name);
+                                if(!has.isNil()) {
+                                    if(has == runtime.getTrue()) {
+                                        if(match.isNil()) {
+                                            match = e;
+                                        }
+                                    } else if(has == x.symAllow) {
+                                        match = S.focus;
+                                    } else if(has == x.symDeny) {
+                                        match = runtime.getNil();
+                                    }
+                                }
+                            }
+                            e = H_ELE_GET(e, H_ELE_PARENT);
+                        }
+                    
+                        if(match.isNil()) {
+                            match = S.focus;
+                        }
+                        S.focus = match;
+                    }
+
+                    scanner.hpricotAdd(S.focus, ele);
+
+                    //
+                    // in the case of a start tag that should be empty, just
+                    // skip the step that focuses the element.  focusing moves
+                    // us deeper into the document.
+                    //
+                    if(sym == x.sym_stag) {
+                        if(S.xml || ec != x.sym_EMPTY) {
+                            S.focus = ele;
+                            S.last = runtime.getNil();
+                        }
+                    }
+                } else if(sym == x.sym_etag) {
+                    IRubyObject name, match = runtime.getNil(), e = S.focus;
+                    if(S.strict) {
+                        if(((RubyHash)S.EC).op_aref(scanner.ctx, tag).isNil()) {
+                            tag = runtime.newString("div");
+                        }
+                    }
+
+                    name = runtime.newFixnum(tag.hashCode());
+                    while(e != S.doc) {
+                        if(H_ELE_GET(e, H_ELE_HASH).equals(name)) {
+                            match = e;
+                            break;
+                        }
+                        e = H_ELE_GET(e, H_ELE_PARENT);
+
+                    }
+                    if(match.isNil()) {
+                        H_ELE(x.cBogusETag);
+                        scanner.hpricotAdd(S.focus, ele);
+                    } else {
+                        ele = runtime.getNil();
+                        if(raw != -1) {
+                            ele = RubyString.newString(runtime, scanner.data, raw, rawlen);
+                        }
+                        H_ELE_SET(match, H_ELE_ETAG, ele);
+                        S.focus = H_ELE_GET(match, H_ELE_PARENT);
+                        S.last = runtime.getNil();
+
+                    }
+                } else if(sym == x.sym_cdata) {
+                    H_ELE(x.cCData);
+                    scanner.hpricotAdd(S.focus, ele);
+                } else if(sym == x.sym_comment) {
+                    H_ELE(x.cComment);
+                    scanner.hpricotAdd(S.focus, ele);
+                } else if(sym == x.sym_doctype) {
+                    H_ELE(x.cDocType);
+                    if(S.strict) {
+                        RubyHash h = (RubyHash)attr;
+                        h.fastASet(runtime.newSymbol("system_id"), runtime.newString("http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"));
+                        h.fastASet(runtime.newSymbol("public_id"), runtime.newString("-//W3C//DTD XHTML 1.0 Strict//EN"));
+                    }
+                    scanner.hpricotAdd(S.focus, ele);
+                } else if(sym == x.sym_procins) {
+                    IRubyObject match = tag.callMethod(scanner.ctx, "match", x.reProcInsParse);
+                    tag = RubyRegexp.nth_match(1, match);
+                    attr = RubyRegexp.nth_match(2, match);
+                    H_ELE(x.cProcIns);
+                    scanner.hpricotAdd(S.focus, ele);
+                } else if(sym == x.sym_text) {
+                    if(!S.last.isNil() && S.last.getType() == x.cText) {
+                        ((RubyString)H_ELE_GET(S.last, H_ELE_TAG)).append(tag);
+                    } else {
+                        H_ELE(x.cText);
+                        scanner.hpricotAdd(S.focus, ele);
+                    }
+                } else if(sym == x.sym_xmldecl) {
+                    H_ELE(x.cXMLDecl);
+                    scanner.hpricotAdd(S.focus, ele);
+                }
+            }
+        }
+
+        public void hpricotToken(State S, IRubyObject _sym, IRubyObject _tag, IRubyObject _attr, int _raw, int _rawlen, boolean taint) {
+            TokenInfo t = new TokenInfo();
+            t.sym = _sym;
+            t.tag = _tag;
+            t.attr = _attr;
+            t.raw = _raw;
+            t.rawlen = _rawlen;
+            t.ec = runtime.getNil();
+            t.ele = runtime.getNil();
+            t.x = x;
+            t.runtime = runtime;
+            t.scanner = this;
+            t.S = S;
+
+            t.hpricotToken(taint);
+        }
+
+        public void yieldTokens(IRubyObject sym, IRubyObject tag, IRubyObject attr, IRubyObject raw, boolean taint) {
+            if(sym == x.sym_text) {
+                raw = tag;
+            }
+            IRubyObject ary = RubyArray.newArrayNoCopy(runtime, new IRubyObject[]{sym, tag, attr, raw});
+            if(taint) {
+                ary.setTaint(true);
+                tag.setTaint(true);
+                attr.setTaint(true);
+                raw.setTaint(true);
+            }
+
+            block.yield(ctx, ary);
+        }
 
 %%{
   machine hpricot_scan;
 
   action newEle {
-    if (text) {
-      CAT(tag, p);
-      ELE(sym_text);
-      text = false;
+    if(text) {
+        tag = CAT(tag, mark_tag, p);
+        ELE(x.sym_text);
+        text = false;
     }
     attr = runtime.getNil();
-    tag[0] = runtime.getNil();
+    tag = runtime.getNil();
     mark_tag = -1;
     ele_open = true;
   }
 
-  action _tag { mark_tag = p; }
+  action _tag  { mark_tag = p; }
   action _aval { mark_aval = p; }
   action _akey { mark_akey = p; }
-  action tag { SET(tag, p); }
-  action tagc { SET(tag, p-1); }
-  action aval { SET(aval, p); }
-  action aunq { 
-    if (buf[p-1] == '"' || buf[p-1] == '\'') { SET(aval, p-1); }
-    else { SET(aval, p); }
+  action tag   { tag = SET(mark_tag, p, tag); }
+  action tagc  { tag = SET(mark_tag, p-1, tag); }
+  action aval  { aval = SET(mark_aval, p, aval); }
+  action aunq {
+      if(data[p-1] == '"' || data[p-1] == '\'') {
+          aval = SET(mark_aval, p-1, aval);
+      } else {
+          aval = SET(mark_aval, p, aval);
+      }
   }
-  action akey { SET(akey, p); }
-  action xmlver { SET(aval, p); ATTR(rb_str_new2("version"), aval); }
-  action xmlenc { SET(aval, p); ATTR(rb_str_new2("encoding"), aval); }
-  action xmlsd  { SET(aval, p); ATTR(rb_str_new2("standalone"), aval); }
-  action pubid  { SET(aval, p); ATTR(rb_str_new2("public_id"), aval); }
-  action sysid  { SET(aval, p); ATTR(rb_str_new2("system_id"), aval); }
-
-  action new_attr { 
-    akey[0] = runtime.getNil();
-    aval[0] = runtime.getNil();
-    mark_akey = -1;
-    mark_aval = -1;
+  action akey {   akey = SET(mark_akey, p, akey); }
+  action xmlver { aval = SET(mark_aval, p, aval); ATTR(runtime.newSymbol("version"), aval); }
+  action xmlenc { aval = SET(mark_aval, p, aval); ATTR(runtime.newSymbol("encoding"), aval); }
+  action xmlsd  { aval = SET(mark_aval, p, aval); ATTR(runtime.newSymbol("standalone"), aval); }
+  action pubid  { aval = SET(mark_aval, p, aval); ATTR(runtime.newSymbol("public_id"), aval); }
+  action sysid  { aval = SET(mark_aval, p, aval); ATTR(runtime.newSymbol("system_id"), aval); }
+
+  action new_attr {
+      akey = runtime.getNil();
+      aval = runtime.getNil();
+      mark_akey = -1;
+      mark_aval = -1;
   }
 
-  action save_attr { 
-    ATTR(akey, aval);
+  action save_attr {
+      if(!S.xml) {
+          akey = akey.callMethod(runtime.getCurrentContext(), "downcase");
+      }
+      ATTR(akey, aval);
   }
 
   include hpricot_common "hpricot_common.rl";
-
 }%%
 
 %% write data nofinal;
 
-public final static int BUFSIZE=16384;
+        public final static int BUFSIZE = 16384;
 
-private void rb_yield_tokens(IRubyObject sym, IRubyObject tag, IRubyObject attr, IRubyObject raw, boolean taint) {
-  IRubyObject ary;
-  if (sym == runtime.newSymbol("text")) {
-    raw = tag;
-  }
-  ary = runtime.newArray(new IRubyObject[]{sym, tag, attr, raw});
-  if (taint) { 
-    ary.setTaint(true);
-    tag.setTaint(true);
-    attr.setTaint(true);
-    raw.setTaint(true);
-  }
-  block.yield(runtime.getCurrentContext(), ary, null, null, false);
-}
 
+        private int cs, act, have = 0, nread = 0, curline = 1;
+        private int ts = 0, te = 0, eof = -1, p = -1, pe = -1, buf = 0;
+        private byte[] data;
+        private State S = null;
+        private IRubyObject port, opts, attr, tag, akey, aval, bufsize;
+        private int mark_tag = -1, mark_akey = -1, mark_aval = -1;
+        private boolean done = false, ele_open = false, taint = false, io = false, text = false;
+        private int buffer_size = 0;
+
+        private Extra x;
+
+        private IRubyObject self;
+        private Ruby runtime;
+        private ThreadContext ctx;
+        private Block block;
+
+        private IRubyObject xmldecl, doctype, stag, etag, emptytag, comment, cdata, procins;
 
-int cs, act, have = 0, nread = 0, curline = 1, p=-1;
-boolean text = false;
-int ts=-1, te;
-int eof=-1;
-char[] buf;
-Ruby runtime;
-IRubyObject attr, bufsize;
-IRubyObject[] tag, akey, aval;
-int mark_tag, mark_akey, mark_aval;
-boolean done = false, ele_open = false;
-int buffer_size = 0;        
-boolean taint = false;
-Block block = null;
-
-
-IRubyObject xmldecl, doctype, procins, stag, etag, emptytag, comment,
-      cdata, sym_text;
-
-IRubyObject hpricot_scan(IRubyObject recv, IRubyObject port) {
-  attr = bufsize = runtime.getNil();
-  tag = new IRubyObject[]{runtime.getNil()};
-  akey = new IRubyObject[]{runtime.getNil()};
-  aval = new IRubyObject[]{runtime.getNil()};
-
-  RubyClass rb_eHpricotParseError = runtime.getModule("Hpricot").getClass("ParseError");
-
-  taint = port.isTaint();
-  if ( !port.respondsTo("read")) {
-    if ( port.respondsTo("to_str")) {
-      port = port.callMethod(runtime.getCurrentContext(),"to_str");
-    } else {
-      throw runtime.newArgumentError("bad Hpricot argument, String or IO only please.");
+        private RaiseException newRaiseException(RubyClass exceptionClass, String message) {
+            return new RaiseException(runtime, exceptionClass, message, true);
+        }
+
+        public Scanner(IRubyObject self, IRubyObject[] args, Block block) {
+            this.self = self;
+            this.runtime = self.getRuntime();
+            this.ctx = runtime.getCurrentContext();
+            this.block = block;
+            attr = runtime.getNil();
+            tag = runtime.getNil();
+            akey = runtime.getNil();
+            aval = runtime.getNil();
+            bufsize = runtime.getNil();
+
+            this.x = (Extra)this.runtime.getModule("Hpricot").dataGetStruct();
+
+            this.xmldecl = x.sym_xmldecl;
+            this.doctype = x.sym_doctype;
+            this.stag = x.sym_stag;
+            this.etag = x.sym_etag;
+            this.emptytag = x.sym_emptytag;
+            this.comment = x.sym_comment;
+            this.cdata = x.sym_cdata;
+            this.procins = x.sym_procins;
+
+            port = args[0];
+            if(args.length == 2) {
+                opts = args[1];
+            } else {
+                opts = runtime.getNil();
+            }
+
+            taint = port.isTaint();
+            io = port.respondsTo("read");
+            if(!io) {
+                if(port.respondsTo("to_str")) {
+                    port = port.callMethod(ctx, "to_str");
+                    port = port.convertToString();
+                } else {
+                    throw runtime.newArgumentError("an Hpricot document must be built from an input source (a String or IO object.)");
+                }
+            }
+
+            if(!(opts instanceof RubyHash)) {
+                opts = runtime.getNil();
+            }
+
+            if(!block.isGiven()) {
+                S = new State();
+                S.doc = x.cDoc.allocate();
+                S.focus = S.doc;
+                S.last = runtime.getNil();
+                S.xml = OPT(opts, "xml");
+                S.strict = OPT(opts, "xhtml_strict");
+                S.fixup = OPT(opts, "fixup_tags");
+                if(S.strict) {
+                    S.fixup = true;
+                }
+                S.doc.getInstanceVariables().fastSetInstanceVariable("@options", opts);
+                S.EC = x.mHpricot.getConstant("ElementContent");
+            }
+
+            buffer_size = BUFSIZE;
+            if(self.getInstanceVariables().fastHasInstanceVariable("@buffer_size")) {
+                bufsize = self.getInstanceVariables().fastGetInstanceVariable("@buffer_size");
+                if(!bufsize.isNil()) {
+                    buffer_size = RubyNumeric.fix2int(bufsize);
+                }
+            }
+
+            if(io) {
+                buf = 0;
+                data = new byte[buffer_size];
+            }
+        }
+        
+        private int len, space;
+        // hpricot_scan
+        public IRubyObject scan() {
+%% write init;
+            while(!done) {
+                p = pe = len = buf;
+                space = buffer_size - have;
+                
+                if(io) {
+                    if(space == 0) {
+                        /* We've used up the entire buffer storing an already-parsed token
+                         * prefix that must be preserved.  Likely caused by super-long attributes.
+                         * Increase buffer size and continue  */
+                        buffer_size += BUFSIZE;
+                        data = realloc(data, buffer_size);
+                        space = buffer_size - have;
+                    }
+
+                    p = have;
+                    IRubyObject str = port.callMethod(ctx, "read", runtime.newFixnum(space));
+                    ByteList bl = str.convertToString().getByteList();
+                    len = bl.realSize;
+                    System.arraycopy(bl.bytes, bl.begin, data, p, len);
+                } else {
+                    ByteList bl = port.convertToString().getByteList();
+                    data = bl.bytes;
+                    buf = bl.begin;
+                    p = bl.begin;
+                    len = bl.realSize + 1;
+                    if(p + len >= data.length) {
+                        data = new byte[len];
+                        System.arraycopy(bl.bytes, bl.begin, data, 0, bl.realSize);
+                        p = 0;
+                        buf = 0;
+                    }
+                    done = true;
+                    eof = p + len;
+                }
+
+                nread += len;
+
+                /* If this is the last buffer, tack on an EOF. */
+                if(io && len < space) {
+                    data[p + len++] = 0;
+                    eof = p + len;
+                    done = true;
+                }
+
+                pe = p + len;
+
+                %% write exec;
+
+                if(cs == hpricot_scan_error) {
+                    if(!tag.isNil()) {
+                        throw newRaiseException(x.rb_eHpricotParseError, "parse error on element <" + tag + ">, starting on line " + curline + ".\n" + NO_WAY_SERIOUSLY);
+                    } else {
+                        throw newRaiseException(x.rb_eHpricotParseError, "parse error on line " + curline + ".\n" + NO_WAY_SERIOUSLY);
+                    }
+                }
+
+                if(done && ele_open) {
+                    ele_open = false;
+                    if(ts > 0) {
+                        mark_tag = ts;
+                        ts = 0;
+                        text = true;
+                    }
+                }
+
+                if(ts == -1) {
+                    have = 0;
+                    if(mark_tag != -1 && text) {
+                        if(done) {
+                            if(mark_tag < p - 1) {
+                                tag = CAT(tag, mark_tag, p-1);
+                                ELE(x.sym_text);
+                            }
+                        } else {
+                            tag = CAT(tag, mark_tag, p);
+                        }
+                    }
+                    if(io) {
+                        mark_tag = 0;
+                    } else {
+                        mark_tag = ((RubyString)port).getByteList().begin;
+                    }
+                } else if(io) {
+                    have = pe - ts;
+                    System.arraycopy(data, ts, data, buf, have);
+                    mark_tag = SLIDE(mark_tag);
+                    mark_akey = SLIDE(mark_akey);
+                    mark_aval = SLIDE(mark_aval);
+                    te -= ts;
+                    ts = 0;
+                }
+            }
+
+            if(S != null) {
+                return S.doc;
+            }
+
+            return runtime.getNil();
+        }
     }
-  }
 
-  buffer_size = BUFSIZE;
-  if (rubyApi.getInstanceVariable(recv, "@buffer_size") != null) {
-    bufsize = rubyApi.getInstanceVariable(recv, "@buffer_size");
-    if (!bufsize.isNil()) {
-      buffer_size = RubyNumeric.fix2int(bufsize);
+    public static class HpricotModule {
+        // hpricot_scan
+        @JRubyMethod(module = true, optional = 1, required = 1, frame = true)
+        public static IRubyObject scan(IRubyObject self, IRubyObject[] args, Block block) {
+            return new Scanner(self, args, block).scan();
+        }
+
+        // hpricot_css
+        @JRubyMethod(module = true)
+        public static IRubyObject css(IRubyObject self, IRubyObject mod, IRubyObject str, IRubyObject node) {
+            return new HpricotCss(self, mod, str, node).scan();
+        }
     }
-  }
-  buf = new char[buffer_size];
 
-  %% write init;
+    public static class CData {
+        @JRubyMethod
+        public static IRubyObject content(IRubyObject self) {
+            return hpricot_ele_get_name(self);
+        }
+
+        @JRubyMethod(name = "content=")
+        public static IRubyObject content_set(IRubyObject self, IRubyObject value) {
+            return hpricot_ele_set_name(self, value);
+        }
+    }
 
-  while( !done ) {
-    IRubyObject str;
-    p = have;
-    int pe;
-    int len, space = buffer_size - have;
+    public static class Comment {
+        @JRubyMethod
+        public static IRubyObject content(IRubyObject self) {
+            return hpricot_ele_get_name(self);
+        }
 
-    if ( space == 0 ) {
-      /* We've used up the entire buffer storing an already-parsed token
-       * prefix that must be preserved.  Likely caused by super-long attributes.
-       * See ticket #13. */
-       buffer_size += BUFSIZE;
-       char[] new_buf = new char[buffer_size];
-       System.arraycopy(buf, 0, new_buf, 0, buf.length);
-       buf = new_buf;
-       space = buffer_size - have;
+        @JRubyMethod(name = "content=")
+        public static IRubyObject content_set(IRubyObject self, IRubyObject value) {
+            return hpricot_ele_set_name(self, value);
+        }
     }
 
-    if (port.respondsTo("read")) {
-      str = port.callMethod(runtime.getCurrentContext(),"read",runtime.newFixnum(space));
-    } else {
-      str = ((RubyString)port).substr(nread,space);
+    public static class DocType {
+        @JRubyMethod
+        public static IRubyObject raw_string(IRubyObject self) {
+            return hpricot_ele_get_name(self);
+        }
+
+        @JRubyMethod
+        public static IRubyObject clear_raw(IRubyObject self) {
+            return hpricot_ele_clear_name(self);
+        }
+
+        @JRubyMethod
+        public static IRubyObject target(IRubyObject self) {
+            return hpricot_ele_get_target(self);
+        }
+
+        @JRubyMethod(name = "target=")
+        public static IRubyObject target_set(IRubyObject self, IRubyObject value) {
+            return hpricot_ele_set_target(self, value);
+        }
+
+        @JRubyMethod
+        public static IRubyObject public_id(IRubyObject self) {
+            return hpricot_ele_get_public_id(self);
+        }
+
+        @JRubyMethod(name = "public_id=")
+        public static IRubyObject public_id_set(IRubyObject self, IRubyObject value) {
+            return hpricot_ele_set_public_id(self, value);
+        }
+
+        @JRubyMethod
+        public static IRubyObject system_id(IRubyObject self) {
+            return hpricot_ele_get_system_id(self);
+        }
+
+        @JRubyMethod(name = "system_id=")
+        public static IRubyObject system_id_set(IRubyObject self, IRubyObject value) {
+            return hpricot_ele_set_system_id(self, value);
+        }
     }
 
-    str = str.convertToString();
-    String sss = str.toString();
-    char[] chars = sss.toCharArray();
-    System.arraycopy(chars,0,buf,p,chars.length);
+    public static class Elem {
+        @JRubyMethod
+        public static IRubyObject clear_raw(IRubyObject self) {
+            return hpricot_ele_clear_raw(self);
+        }
+    }
 
-    len = sss.length();
-    nread += len;
+    public static class BogusETag {
+        @JRubyMethod
+        public static IRubyObject raw_string(IRubyObject self) {
+            return hpricot_ele_get_attr(self);
+        }
 
-    if ( len < space ) {
-      len++;
-      done = true;
+        @JRubyMethod
+        public static IRubyObject clear_raw(IRubyObject self) {
+            return hpricot_ele_clear_attr(self);
+        }
     }
 
-    pe = p + len;
-    char[] data = buf;
+    public static class Text {
+        @JRubyMethod
+        public static IRubyObject raw_string(IRubyObject self) {
+            return hpricot_ele_get_name(self);
+        }
 
-    %% write exec;
-    
-    if ( cs == hpricot_scan_error ) {
-      if(!tag[0].isNil()) {
-        rb_raise(rb_eHpricotParseError, "parse error on element <"+tag.toString()+">, starting on line "+curline+".\n" + NO_WAY_SERIOUSLY);
-      } else {
-        rb_raise(rb_eHpricotParseError, "parse error on line "+curline+".\n" + NO_WAY_SERIOUSLY);
-      }
+        @JRubyMethod
+        public static IRubyObject clear_raw(IRubyObject self) {
+            return hpricot_ele_clear_name(self);
+        }
+
+        @JRubyMethod
+        public static IRubyObject content(IRubyObject self) {
+            return hpricot_ele_get_name(self);
+        }
+
+        @JRubyMethod(name = "content=")
+        public static IRubyObject content_set(IRubyObject self, IRubyObject value) {
+            return hpricot_ele_set_name(self, value);
+        }
     }
+
+    public static class XMLDecl {
+        @JRubyMethod
+        public static IRubyObject raw_string(IRubyObject self) {
+            return hpricot_ele_get_name(self);
+        }
+
+        @JRubyMethod
+        public static IRubyObject clear_raw(IRubyObject self) {
+            return hpricot_ele_clear_name(self);
+        }
+
+        @JRubyMethod
+        public static IRubyObject encoding(IRubyObject self) {
+            return hpricot_ele_get_encoding(self);
+        }
+
+        @JRubyMethod(name = "encoding=")
+        public static IRubyObject encoding_set(IRubyObject self, IRubyObject value) {
+            return hpricot_ele_set_encoding(self, value);
+        }
+
+        @JRubyMethod
+        public static IRubyObject standalone(IRubyObject self) {
+            return hpricot_ele_get_standalone(self);
+        }
+
+        @JRubyMethod(name = "standalone=")
+        public static IRubyObject standalone_set(IRubyObject self, IRubyObject value) {
+            return hpricot_ele_set_standalone(self, value);
+        }
+
+        @JRubyMethod
+        public static IRubyObject version(IRubyObject self) {
+            return hpricot_ele_get_version(self);
+        }
+
+        @JRubyMethod(name = "version=")
+        public static IRubyObject version_set(IRubyObject self, IRubyObject value) {
+            return hpricot_ele_set_version(self, value);
+        }
+    }
+
+    public static class ProcIns {
+        @JRubyMethod
+        public static IRubyObject target(IRubyObject self) {
+            return hpricot_ele_get_name(self);
+        }
+
+        @JRubyMethod(name = "target=")
+        public static IRubyObject target_set(IRubyObject self, IRubyObject value) {
+            return hpricot_ele_set_name(self, value);
+        }
+
+        @JRubyMethod
+        public static IRubyObject content(IRubyObject self) {
+            return hpricot_ele_get_attr(self);
+        }
+
+        @JRubyMethod(name = "content=")
+        public static IRubyObject content_set(IRubyObject self, IRubyObject value) {
+            return hpricot_ele_set_attr(self, value);
+        }
+    }
+
+    public final static String NO_WAY_SERIOUSLY = "*** This should not happen, please send a bug report with the HTML you're parsing to why@whytheluckystiff.net.  So sorry!";
+
+    public final static int H_ELE_TAG = 0;
+    public final static int H_ELE_PARENT = 1;
+    public final static int H_ELE_ATTR = 2;
+    public final static int H_ELE_ETAG = 3;
+    public final static int H_ELE_RAW = 4;
+    public final static int H_ELE_EC = 5;
+    public final static int H_ELE_HASH = 6;
+    public final static int H_ELE_CHILDREN = 7;
+
+    public static IRubyObject H_ELE_GET(IRubyObject recv, int n) {
+        return ((IRubyObject[])recv.dataGetStruct())[n];
+    }
+
+    public static IRubyObject H_ELE_SET(IRubyObject recv, int n, IRubyObject value) {
+        ((IRubyObject[])recv.dataGetStruct())[n] = value;
+        return value;
+    }
+
+    private static class RefCallback implements Callback {
+        private final int n;
+        public RefCallback(int n) { this.n = n; }
+
+        public IRubyObject execute(IRubyObject recv, IRubyObject[] args, Block block) {
+            return H_ELE_GET(recv, n);
+        }
+
+        public Arity getArity() {
+            return Arity.NO_ARGUMENTS;
+        }
+    }
+
+    private static class SetCallback implements Callback {
+        private final int n;
+        public SetCallback(int n) { this.n = n; }
+
+        public IRubyObject execute(IRubyObject recv, IRubyObject[] args, Block block) {
+            return H_ELE_SET(recv, n, args[0]);
+        }
+
+        public Arity getArity() {
+            return Arity.ONE_ARGUMENT;
+        }
+    }
+
+    private final static Callback[] ref_func = new Callback[]{
+        new RefCallback(0),
+        new RefCallback(1),
+        new RefCallback(2),
+        new RefCallback(3),
+        new RefCallback(4),
+        new RefCallback(5),
+        new RefCallback(6),
+        new RefCallback(7),
+        new RefCallback(8),
+        new RefCallback(9)};
+
+    private final static Callback[] set_func = new Callback[]{
+        new SetCallback(0),
+        new SetCallback(1),
+        new SetCallback(2),
+        new SetCallback(3),
+        new SetCallback(4),
+        new SetCallback(5),
+        new SetCallback(6),
+        new SetCallback(7),
+        new SetCallback(8),
+        new SetCallback(9)};
+
+    public final static ObjectAllocator alloc_hpricot_struct = new ObjectAllocator() {
+            // alloc_hpricot_struct
+            public IRubyObject allocate(Ruby runtime, RubyClass klass) {
+                RubyClass kurrent = klass;
+                Object sz = kurrent.fastGetInternalVariable("__size__");
+                while(sz == null && kurrent != null) {
+                    kurrent = kurrent.getSuperClass();
+                    sz = kurrent.fastGetInternalVariable("__size__");
+                }
+                int size = RubyNumeric.fix2int((RubyObject)sz);
+                RubyObject obj = new RubyObject(runtime, klass);
+                IRubyObject[] all = new IRubyObject[size];
+                java.util.Arrays.fill(all, runtime.getNil());
+                obj.dataWrapStruct(all);
+                return obj;
+            }
+        };
+
+    public static RubyClass makeHpricotStruct(Ruby runtime, IRubyObject[] members) {
+        RubyClass klass = RubyClass.newClass(runtime, runtime.getObject());
+        klass.fastSetInternalVariable("__size__", runtime.newFixnum(members.length));
+        klass.setAllocator(alloc_hpricot_struct);
+
+        for(int i = 0; i < members.length; i++) {
+            String id = members[i].toString();
+            klass.defineMethod(id, ref_func[i]);
+            klass.defineMethod(id + "=", set_func[i]);
+        }
     
-    if ( done && ele_open ) {
-      ele_open = false;
-      if(ts > -1) {
-        mark_tag = ts;
-        ts = -1;
-        text = true;
-      }
+        return klass;
     }
 
-    if(ts == -1) {
-      have = 0;
-      /* text nodes have no ts because each byte is parsed alone */
-      if(mark_tag != -1 && text) {
-        if (done) {
-          if(mark_tag < p-1) {
-            CAT(tag, p-1);
-            ELE(sym_text);
-          }
-        } else {
-          CAT(tag, p);
+    public boolean basicLoad(final Ruby runtime) throws IOException {
+        Init_hpricot_scan(runtime);
+        return true;
+    }
+
+    public static class Extra {
+        IRubyObject symAllow, symDeny, sym_xmldecl, sym_doctype, 
+            sym_procins, sym_stag, sym_etag, sym_emptytag, 
+            sym_allowed, sym_children, sym_comment, 
+            sym_cdata, sym_name, sym_parent, 
+            sym_raw_attributes, sym_raw_string, sym_tagno, 
+            sym_text, sym_EMPTY, sym_CDATA;
+
+        public RubyModule mHpricot;
+        public RubyClass structElem;
+        public RubyClass structAttr;
+        public RubyClass structBasic;
+        public RubyClass cDoc;
+        public RubyClass cCData;
+        public RubyClass cComment;
+        public RubyClass cDocType;
+        public RubyClass cElem;
+        public RubyClass cBogusETag;
+        public RubyClass cText;
+        public RubyClass cXMLDecl;
+        public RubyClass cProcIns;
+        public RubyClass rb_eHpricotParseError;
+        public IRubyObject reProcInsParse;
+
+        public Extra(Ruby runtime) {
+            symAllow = runtime.newSymbol("allow");
+            symDeny = runtime.newSymbol("deny");
+            sym_xmldecl = runtime.newSymbol("xmldecl");
+            sym_doctype = runtime.newSymbol("doctype");
+            sym_procins = runtime.newSymbol("procins");
+            sym_stag = runtime.newSymbol("stag");
+            sym_etag = runtime.newSymbol("etag");
+            sym_emptytag = runtime.newSymbol("emptytag");
+            sym_allowed = runtime.newSymbol("allowed");
+            sym_children = runtime.newSymbol("children");
+            sym_comment = runtime.newSymbol("comment");
+            sym_cdata = runtime.newSymbol("cdata");
+            sym_name = runtime.newSymbol("name");
+            sym_parent = runtime.newSymbol("parent");
+            sym_raw_attributes = runtime.newSymbol("raw_attributes");
+            sym_raw_string = runtime.newSymbol("raw_string");
+            sym_tagno = runtime.newSymbol("tagno");
+            sym_text = runtime.newSymbol("text");
+            sym_EMPTY = runtime.newSymbol("EMPTY");
+            sym_CDATA = runtime.newSymbol("CDATA");
         }
-      }
-      mark_tag = 0;
-    } else {
-      have = pe - ts;
-      System.arraycopy(buf,ts,buf,0,have);
-      SLIDE(tag);
-      SLIDE(akey);
-      SLIDE(aval);
-      te = (te - ts);
-      ts = 0;
     }
-  }
-  return runtime.getNil();
-}
 
-public static IRubyObject __hpricot_scan(IRubyObject recv, IRubyObject port, Block block) {
-  Ruby runtime = recv.getRuntime();
-  HpricotScanService service = new HpricotScanService();
-  service.runtime = runtime;
-  service.xmldecl = runtime.newSymbol("xmldecl");
-  service.doctype = runtime.newSymbol("doctype");
-  service.procins = runtime.newSymbol("procins");
-  service.stag = runtime.newSymbol("stag");
-  service.etag = runtime.newSymbol("etag");
-  service.emptytag = runtime.newSymbol("emptytag");
-  service.comment = runtime.newSymbol("comment");
-  service.cdata = runtime.newSymbol("cdata");
-  service.sym_text = runtime.newSymbol("text");
-  service.block = block;
-  return service.hpricot_scan(recv, port);
-}
+    public static void Init_hpricot_scan(Ruby runtime) {
+        Extra x = new Extra(runtime);
 
+        x.mHpricot = runtime.defineModule("Hpricot");
+        x.mHpricot.dataWrapStruct(x);
 
-public boolean basicLoad(final Ruby runtime) throws IOException {
-       Init_hpricot_scan(runtime);
-       return true;
-}
+        x.mHpricot.getSingletonClass().attr_accessor(runtime.getCurrentContext(),new  IRubyObject[]{runtime.newSymbol("buffer_size")});
+        x.mHpricot.defineAnnotatedMethods(HpricotModule.class);
 
-public static void Init_hpricot_scan(Ruby runtime) {
-  RubyModule mHpricot = runtime.defineModule("Hpricot");
-  mHpricot.getMetaClass().attr_accessor(runtime.getCurrentContext(),new IRubyObject[]{runtime.newSymbol("buffer_size")});
-  CallbackFactory fact = runtime.callbackFactory(HpricotScanService.class);
-  mHpricot.getMetaClass().defineMethod("scan",fact.getSingletonMethod("__hpricot_scan",IRubyObject.class));
-  mHpricot.defineClassUnder("ParseError",runtime.getClass("StandardError"),runtime.getClass("StandardError").getAllocator());
-  rubyApi = JavaEmbedUtils.newObjectAdapter();
-}
+        x.rb_eHpricotParseError = x.mHpricot.defineClassUnder("ParseError",runtime.getClass("StandardError"),runtime.getClass("StandardError").getAllocator());
+
+        x.structElem = makeHpricotStruct(runtime, new IRubyObject[] {x.sym_name, x.sym_parent, x.sym_raw_attributes, x.sym_etag, x.sym_raw_string, x.sym_allowed, x.sym_tagno, x.sym_children});
+        x.structAttr = makeHpricotStruct(runtime, new IRubyObject[] {x.sym_name, x.sym_parent, x.sym_raw_attributes});
+        x.structBasic= makeHpricotStruct(runtime, new IRubyObject[] {x.sym_name, x.sym_parent});
+
+        x.cDoc = x.mHpricot.defineClassUnder("Doc", x.structElem, x.structElem.getAllocator());
+
+        x.cCData = x.mHpricot.defineClassUnder("CData", x.structBasic, x.structBasic.getAllocator());
+        x.cCData.defineAnnotatedMethods(CData.class);
+
+        x.cComment = x.mHpricot.defineClassUnder("Comment", x.structBasic, x.structBasic.getAllocator());
+        x.cComment.defineAnnotatedMethods(Comment.class);
+
+        x.cDocType = x.mHpricot.defineClassUnder("DocType", x.structAttr, x.structAttr.getAllocator());
+        x.cDocType.defineAnnotatedMethods(DocType.class);
+
+        x.cElem = x.mHpricot.defineClassUnder("Elem", x.structElem, x.structElem.getAllocator());
+        x.cElem.defineAnnotatedMethods(Elem.class);
+
+        x.cBogusETag = x.mHpricot.defineClassUnder("BogusETag", x.structAttr, x.structAttr.getAllocator());
+        x.cBogusETag.defineAnnotatedMethods(BogusETag.class);
+
+        x.cText = x.mHpricot.defineClassUnder("Text", x.structBasic, x.structBasic.getAllocator());
+        x.cText.defineAnnotatedMethods(Text.class);
+
+        x.cXMLDecl = x.mHpricot.defineClassUnder("XMLDecl", x.structAttr, x.structAttr.getAllocator());
+        x.cXMLDecl.defineAnnotatedMethods(XMLDecl.class);
+
+        x.cProcIns = x.mHpricot.defineClassUnder("ProcIns", x.structAttr, x.structAttr.getAllocator());
+        x.cProcIns.defineAnnotatedMethods(ProcIns.class);
+
+        x.reProcInsParse = runtime.evalScriptlet("/\\A<\\?(\\S+)\\s+(.+)/m");
+        x.mHpricot.setConstant("ProcInsParse", x.reProcInsParse);
+    }
 }
diff -Nru /tmp/aPeI5X1Iz5/libhpricot-ruby-0.8/ext/hpricot_scan/hpricot_scan.rl /tmp/kCvPnLCzlr/libhpricot-ruby-0.8.2/ext/hpricot_scan/hpricot_scan.rl
--- libhpricot-ruby-0.8/ext/hpricot_scan/hpricot_scan.rl	2009-03-24 19:43:02.000000000 +0000
+++ libhpricot-ruby-0.8.2/ext/hpricot_scan/hpricot_scan.rl	2009-12-13 23:54:10.000000000 +0000
@@ -132,6 +132,8 @@
   }
 
   action save_attr {
+    if (!S->xml)
+      akey = rb_funcall(akey, s_downcase, 0);
     ATTR(akey, aval);
   }
 
@@ -280,7 +282,7 @@
 
     if (H_ELE_GET(S->focus, H_ELE_EC) == sym_CDATA &&
        (sym != sym_procins && sym != sym_comment && sym != sym_cdata && sym != sym_text) &&
-      !(sym == sym_etag && INT2NUM(rb_str_hash(tag)) == H_ELE_GET(S->focus, H_ELE_HASH)))
+      !(sym == sym_etag && INT2FIX(rb_str_hash(tag)) == H_ELE_GET(S->focus, H_ELE_HASH)))
     {
       sym = sym_text;
       tag = rb_str_new(raw, rawlen);
@@ -298,7 +300,7 @@
   }
 
   if (sym == sym_emptytag || sym == sym_stag) {
-    VALUE name = INT2NUM(rb_str_hash(tag));
+    VALUE name = INT2FIX(rb_str_hash(tag));
     H_ELE(cElem);
     H_ELE_SET(ele, H_ELE_HASH, name);
 
@@ -358,7 +360,7 @@
     //
     // (see also: the search above for fixups)
     //
-    name = INT2NUM(rb_str_hash(tag));
+    name = INT2FIX(rb_str_hash(tag));
     while (e != S->doc)
     {
       if (H_ELE_GET(e, H_ELE_HASH) == name)
diff -Nru /tmp/aPeI5X1Iz5/libhpricot-ruby-0.8/ext/hpricot_scan/HpricotScanService.java /tmp/kCvPnLCzlr/libhpricot-ruby-0.8.2/ext/hpricot_scan/HpricotScanService.java
--- libhpricot-ruby-0.8/ext/hpricot_scan/HpricotScanService.java	2009-03-24 19:43:02.000000000 +0000
+++ libhpricot-ruby-0.8.2/ext/hpricot_scan/HpricotScanService.java	2009-12-13 23:54:10.000000000 +0000
@@ -1,152 +1,519 @@
-// line 1 "ext/hpricot_scan/hpricot_scan.java.rl"
+// line 1 "hpricot_scan.java.rl"
 
 import java.io.IOException;
 
 import org.jruby.Ruby;
+import org.jruby.RubyArray;
 import org.jruby.RubyClass;
 import org.jruby.RubyHash;
 import org.jruby.RubyModule;
 import org.jruby.RubyNumeric;
+import org.jruby.RubyObject;
 import org.jruby.RubyObjectAdapter;
+import org.jruby.RubyRegexp;
 import org.jruby.RubyString;
+import org.jruby.anno.JRubyMethod;
+import org.jruby.exceptions.RaiseException;
 import org.jruby.javasupport.JavaEmbedUtils;
+import org.jruby.runtime.Arity;
 import org.jruby.runtime.Block;
-import org.jruby.runtime.CallbackFactory;
+import org.jruby.runtime.ObjectAllocator;
+import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
+import org.jruby.runtime.callback.Callback;
 import org.jruby.exceptions.RaiseException;
 import org.jruby.runtime.load.BasicLibraryService;
+import org.jruby.util.ByteList;
 
 public class HpricotScanService implements BasicLibraryService {
-       public static String NO_WAY_SERIOUSLY="*** This should not happen, please send a bug report with the HTML you're parsing to why@whytheluckystiff.net.  So sorry!";
-       private static RubyObjectAdapter rubyApi;
+    public static byte[] realloc(byte[] input, int size) {
+        byte[] newArray = new byte[size];
+        System.arraycopy(input, 0, newArray, 0, input.length);
+        return newArray;
+    }
+
+    // hpricot_state
+    public static class State {
+        public IRubyObject doc;
+        public IRubyObject focus;
+        public IRubyObject last;
+        public IRubyObject EC;
+        public boolean xml, strict, fixup;
+    }
+
+    static boolean OPT(IRubyObject opts, String key) {
+        Ruby runtime = opts.getRuntime();
+        return !opts.isNil() && ((RubyHash)opts).op_aref(runtime.getCurrentContext(), runtime.newSymbol(key)).isTrue();
+    }
+
+    // H_PROP(name, H_ELE_TAG)
+    public static IRubyObject hpricot_ele_set_name(IRubyObject self, IRubyObject x) {
+        H_ELE_SET(self, H_ELE_TAG, x);
+        return self;
+    }
+
+    public static IRubyObject hpricot_ele_clear_name(IRubyObject self) {
+        H_ELE_SET(self, H_ELE_TAG, self.getRuntime().getNil());
+        return self.getRuntime().getTrue();
+    }
+
+    public static IRubyObject hpricot_ele_get_name(IRubyObject self) {
+        return H_ELE_GET(self, H_ELE_TAG);
+    }
+
+    // H_PROP(raw, H_ELE_RAW)
+    public static IRubyObject hpricot_ele_set_raw(IRubyObject self, IRubyObject x) {
+        H_ELE_SET(self, H_ELE_RAW, x);
+        return self;
+    }
+
+    public static IRubyObject hpricot_ele_clear_raw(IRubyObject self) {
+        H_ELE_SET(self, H_ELE_RAW, self.getRuntime().getNil());
+        return self.getRuntime().getTrue();
+    }
+
+    public static IRubyObject hpricot_ele_get_raw(IRubyObject self) {
+        return H_ELE_GET(self, H_ELE_RAW);
+    }
+
+    // H_PROP(parent, H_ELE_PARENT)
+    public static IRubyObject hpricot_ele_set_parent(IRubyObject self, IRubyObject x) {
+        H_ELE_SET(self, H_ELE_PARENT, x);
+        return self;
+    }
+
+    public static IRubyObject hpricot_ele_clear_parent(IRubyObject self) {
+        H_ELE_SET(self, H_ELE_PARENT, self.getRuntime().getNil());
+        return self.getRuntime().getTrue();
+    }
+
+    public static IRubyObject hpricot_ele_get_parent(IRubyObject self) {
+        return H_ELE_GET(self, H_ELE_PARENT);
+    }
+
+    // H_PROP(attr, H_ELE_ATTR)
+    public static IRubyObject hpricot_ele_set_attr(IRubyObject self, IRubyObject x) {
+        H_ELE_SET(self, H_ELE_ATTR, x);
+        return self;
+    }
+
+    public static IRubyObject hpricot_ele_clear_attr(IRubyObject self) {
+        H_ELE_SET(self, H_ELE_ATTR, self.getRuntime().getNil());
+        return self.getRuntime().getTrue();
+    }
+
+    public static IRubyObject hpricot_ele_get_attr(IRubyObject self) {
+        return H_ELE_GET(self, H_ELE_ATTR);
+    }
+
+    // H_PROP(etag, H_ELE_ETAG)
+    public static IRubyObject hpricot_ele_set_etag(IRubyObject self, IRubyObject x) {
+        H_ELE_SET(self, H_ELE_ETAG, x);
+        return self;
+    }
+
+    public static IRubyObject hpricot_ele_clear_etag(IRubyObject self) {
+        H_ELE_SET(self, H_ELE_ETAG, self.getRuntime().getNil());
+        return self.getRuntime().getTrue();
+    }
+
+    public static IRubyObject hpricot_ele_get_etag(IRubyObject self) {
+        return H_ELE_GET(self, H_ELE_ETAG);
+    }
+
+    // H_PROP(children, H_ELE_CHILDREN)
+    public static IRubyObject hpricot_ele_set_children(IRubyObject self, IRubyObject x) {
+        H_ELE_SET(self, H_ELE_CHILDREN, x);
+        return self;
+    }
+
+    public static IRubyObject hpricot_ele_clear_children(IRubyObject self) {
+        H_ELE_SET(self, H_ELE_CHILDREN, self.getRuntime().getNil());
+        return self.getRuntime().getTrue();
+    }
+
+    public static IRubyObject hpricot_ele_get_children(IRubyObject self) {
+        return H_ELE_GET(self, H_ELE_CHILDREN);
+    }
+
+    // H_ATTR(target)
+    public static IRubyObject hpricot_ele_set_target(IRubyObject self, IRubyObject x) {
+        ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("target"), x);
+        return self;
+    }
+
+    public static IRubyObject hpricot_ele_get_target(IRubyObject self) {
+        return ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("target"));
+    }
+
+    // H_ATTR(encoding)
+    public static IRubyObject hpricot_ele_set_encoding(IRubyObject self, IRubyObject x) {
+        ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("encoding"), x);
+        return self;
+    }
+
+    public static IRubyObject hpricot_ele_get_encoding(IRubyObject self) {
+        return ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("encoding"));
+    }
+
+    // H_ATTR(version)
+    public static IRubyObject hpricot_ele_set_version(IRubyObject self, IRubyObject x) {
+        ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("version"), x);
+        return self;
+    }
+
+    public static IRubyObject hpricot_ele_get_version(IRubyObject self) {
+        return ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("version"));
+    }
+
+    // H_ATTR(standalone)
+    public static IRubyObject hpricot_ele_set_standalone(IRubyObject self, IRubyObject x) {
+        ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("standalone"), x);
+        return self;
+    }
+
+    public static IRubyObject hpricot_ele_get_standalone(IRubyObject self) {
+        return ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("standalone"));
+    }
 
-       public void ELE(IRubyObject N) {
-         if (te > ts || text) {
-           IRubyObject raw_string = runtime.getNil();
-           ele_open = false; text = false;
-           if (ts != -1 && N != cdata && N != sym_text && N != procins && N != comment) { 
-             raw_string = runtime.newString(new String(buf,ts,te-ts));
-           } 
-           rb_yield_tokens(N, tag[0], attr, raw_string, taint);
-         }
-       }
-
-       public void SET(IRubyObject[] N, int E) {
-         int mark = 0;
-         if(N == tag) { 
-           if(mark_tag == -1 || E == mark_tag) {
-             tag[0] = runtime.newString("");
-           } else if(E > mark_tag) {
-             tag[0] = runtime.newString(new String(buf,mark_tag, E-mark_tag));
-           }
-         } else if(N == akey) {
-           if(mark_akey == -1 || E == mark_akey) {
-             akey[0] = runtime.newString("");
-           } else if(E > mark_akey) {
-             akey[0] = runtime.newString(new String(buf,mark_akey, E-mark_akey));
-           }
-         } else if(N == aval) {
-           if(mark_aval == -1 || E == mark_aval) {
-             aval[0] = runtime.newString("");
-           } else if(E > mark_aval) {
-             aval[0] = runtime.newString(new String(buf,mark_aval, E-mark_aval));
-           }
-         }
-       }
-
-       public void CAT(IRubyObject[] N, int E) {
-         if(N[0].isNil()) {
-           SET(N,E);
-         } else {
-           int mark = 0;
-           if(N == tag) {
-             mark = mark_tag;
-           } else if(N == akey) {
-             mark = mark_akey;
-           } else if(N == aval) {
-             mark = mark_aval;
-           }
-           ((RubyString)(N[0])).append(runtime.newString(new String(buf, mark, E-mark)));
-         }
-       }
-
-       public void SLIDE(Object N) {
-           int mark = 0;
-           if(N == tag) {
-             mark = mark_tag;
-           } else if(N == akey) {
-             mark = mark_akey;
-           } else if(N == aval) {
-             mark = mark_aval;
-           }
-           if(mark > ts) {
-             if(N == tag) {
-               mark_tag  -= ts;
-             } else if(N == akey) {
-               mark_akey -= ts;
-             } else if(N == aval) {
-               mark_aval -= ts;
-             }
-           }
-       }
-
-       public void ATTR(IRubyObject K, IRubyObject V) {
-         if(!K.isNil()) {
-           if(attr.isNil()) {
-             attr = RubyHash.newHash(runtime);
-           }
-           ((RubyHash)attr).op_aset(runtime.getCurrentContext(),K,V);
-           // ((RubyHash)attr).aset(K,V);
-         }
-       }
-
-       public void ATTR(IRubyObject[] K, IRubyObject V) {
-         ATTR(K[0],V);
-       }
-
-       public void ATTR(IRubyObject K, IRubyObject[] V) {
-         ATTR(K,V[0]);
-       }
-
-       public void ATTR(IRubyObject[] K, IRubyObject[] V) {
-         ATTR(K[0],V[0]);
-       }
-
-       public void TEXT_PASS() {
-         if(!text) { 
-           if(ele_open) { 
-             ele_open = false; 
-             if(ts > -1) { 
-               mark_tag = ts; 
-             } 
-           } else {
-             mark_tag = p; 
-           } 
-           attr = runtime.getNil(); 
-           tag[0] = runtime.getNil(); 
-           text = true; 
-         }
-       }
-
-       public void EBLK(IRubyObject N, int T) {
-         CAT(tag, p - T + 1);
-         ELE(N);
-       }
-
-
-       public void rb_raise(RubyClass error, String message) {
-              throw new RaiseException(runtime, error, message, true);
-       }
-
-       public IRubyObject rb_str_new2(String s) {
-              return runtime.newString(s);
-       }
+    // H_ATTR(system_id)
+    public static IRubyObject hpricot_ele_set_system_id(IRubyObject self, IRubyObject x) {
+        ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("system_id"), x);
+        return self;
+    }
+
+    public static IRubyObject hpricot_ele_get_system_id(IRubyObject self) {
+        return ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("system_id"));
+    }
+
+    // H_ATTR(public_id)
+    public static IRubyObject hpricot_ele_set_public_id(IRubyObject self, IRubyObject x) {
+        ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).fastASet(self.getRuntime().newSymbol("public_id"), x);
+        return self;
+    }
+
+    public static IRubyObject hpricot_ele_get_public_id(IRubyObject self) {
+        return ((RubyHash)H_ELE_GET(self, H_ELE_ATTR)).op_aref(self.getRuntime().getCurrentContext(), self.getRuntime().newSymbol("public_id"));
+    }
+
+    public static class Scanner {
+        public IRubyObject SET(int mark, int E, IRubyObject org) {
+            if(mark == -1 || E == mark) {
+                return runtime.newString("");
+            } else if(E > mark) {
+                return RubyString.newString(runtime, data, mark, E-mark);
+            } else {
+                return org;
+            }
+        }
+
+        public int SLIDE(int N) {
+            if(N > ts) {
+                return N - ts;
+            } else {
+                return N;
+            }
+        }
+
+        public IRubyObject CAT(IRubyObject N, int mark, int E) {
+            if(N.isNil()) {
+                return SET(mark, E, N);
+            } else {
+                ((RubyString)N).cat(data, mark, E-mark);
+                return N;
+            }
+        }
+
+        public void ATTR(IRubyObject K, IRubyObject V) {
+            if(!K.isNil()) {
+                if(attr.isNil()) {
+                    attr = RubyHash.newHash(runtime);
+                }
+                ((RubyHash)attr).fastASet(K, V);
+            }
+        }
+
+        public void TEXT_PASS() {
+            if(!text) {
+                if(ele_open) {
+                    ele_open = false;
+                    if(ts != -1) {
+                        mark_tag = ts;
+                    }
+                } else {
+                    mark_tag = p;
+                }
+                attr = runtime.getNil();
+                tag = runtime.getNil();
+                text = true;
+            }
+        }
+
+        public void ELE(IRubyObject N) {
+            if(te > ts || text) {
+                int raw = -1;
+                int rawlen = 0;
+                ele_open = false; 
+                text = false;
+
+                if(ts != -1 && N != x.sym_cdata && N != x.sym_text && N != x.sym_procins && N != x.sym_comment) {
+                    raw = ts; 
+                    rawlen = te - ts;
+                }
+
+                if(block.isGiven()) {
+                    IRubyObject raw_string = runtime.getNil();
+                    if(raw != -1) {
+                        raw_string = RubyString.newString(runtime, data, raw, rawlen);
+                    }
+                    yieldTokens(N, tag, attr, runtime.getNil(), taint);
+                } else {
+                    hpricotToken(S, N, tag, attr, raw, rawlen, taint);
+                }
+            }
+        }
+        
+
+        public void EBLK(IRubyObject N, int T) {
+            tag = CAT(tag, mark_tag, p - T + 1);
+            ELE(N);
+        }
+
+        public void hpricotAdd(IRubyObject focus, IRubyObject ele) {
+            IRubyObject children = H_ELE_GET(focus, H_ELE_CHILDREN);
+            if(children.isNil()) {
+                H_ELE_SET(focus, H_ELE_CHILDREN, children = RubyArray.newArray(runtime, 1));
+            }
+            ((RubyArray)children).append(ele);
+            H_ELE_SET(ele, H_ELE_PARENT, focus);
+        }
+
+        private static class TokenInfo {
+            public IRubyObject sym;
+            public IRubyObject tag;
+            public IRubyObject attr;
+            public int raw;
+            public int rawlen;
+            public IRubyObject ec;
+            public IRubyObject ele;
+            public Extra x;
+            public Ruby runtime;
+            public Scanner scanner;
+            public State S;
+
+            public void H_ELE(RubyClass klass) {
+                ele = klass.allocate();
+                if(klass == x.cElem) {
+                    H_ELE_SET(ele, H_ELE_TAG, tag);
+                    H_ELE_SET(ele, H_ELE_ATTR, attr);
+                    H_ELE_SET(ele, H_ELE_EC, ec);
+                    if(raw != -1 && (sym == x.sym_emptytag || sym == x.sym_stag || sym == x.sym_doctype)) {
+                        H_ELE_SET(ele, H_ELE_RAW, RubyString.newString(runtime, scanner.data, raw, rawlen));
+                    }
+                } else if(klass == x.cDocType || klass == x.cProcIns || klass == x.cXMLDecl || klass == x.cBogusETag) {
+                    if(klass == x.cBogusETag) {
+                        H_ELE_SET(ele, H_ELE_TAG, tag);
+                        if(raw != -1) {
+                            H_ELE_SET(ele, H_ELE_ATTR, RubyString.newString(runtime, scanner.data, raw, rawlen));
+                        }
+                    } else {
+                        if(klass == x.cDocType) {
+                            scanner.ATTR(runtime.newSymbol("target"), tag);
+                        }
+                        H_ELE_SET(ele, H_ELE_ATTR, attr);
+                        if(klass != x.cProcIns) {
+                            tag = runtime.getNil();
+                            if(raw != -1) {
+                                tag = RubyString.newString(runtime, scanner.data, raw, rawlen);
+                            }
+                        }
+                        H_ELE_SET(ele, H_ELE_TAG, tag);
+                    }
+                } else {
+                    H_ELE_SET(ele, H_ELE_TAG, tag);
+                }
+                S.last = ele;
+            }
+
+            public void hpricotToken(boolean taint) {
+                //
+                // in html mode, fix up start tags incorrectly formed as empty tags
+                //
+                if(!S.xml) {
+                    if(sym == x.sym_emptytag || sym == x.sym_stag || sym == x.sym_etag) {
+                        ec = ((RubyHash)S.EC).op_aref(scanner.ctx, tag);
+                        if(ec.isNil()) {
+                            tag = tag.callMethod(scanner.ctx, "downcase");
+                            ec = ((RubyHash)S.EC).op_aref(scanner.ctx, tag);
+                        }
+                    }
+
+                    if(H_ELE_GET(S.focus, H_ELE_EC) == x.sym_CDATA && 
+                       (sym != x.sym_procins && sym != x.sym_comment && sym != x.sym_cdata && sym != x.sym_text) && 
+                       !(sym == x.sym_etag && runtime.newFixnum(tag.hashCode()).equals(H_ELE_GET(S.focus, H_ELE_HASH)))) {
+                        sym = x.sym_text;
+                        tag = RubyString.newString(runtime, scanner.data, raw, rawlen);
+                    }
+
+                    if(!ec.isNil()) {
+                        if(sym == x.sym_emptytag) {
+                            if(ec != x.sym_EMPTY) {
+                                sym = x.sym_stag;
+                            }
+                        } else if(sym == x.sym_stag) {
+                            if(ec == x.sym_EMPTY) {
+                                sym = x.sym_emptytag;
+                            }
+                        }
+                    }
+                }
+
+                if(sym == x.sym_emptytag || sym == x.sym_stag) {
+                    IRubyObject name = runtime.newFixnum(tag.hashCode());
+                    H_ELE(x.cElem);
+                    H_ELE_SET(ele, H_ELE_HASH, name);
+
+                    if(!S.xml) {
+                        IRubyObject match = runtime.getNil(), e = S.focus;
+                        while(e != S.doc) {
+                            IRubyObject hEC = H_ELE_GET(e, H_ELE_EC);
+                            if(hEC instanceof RubyHash) {
+                                IRubyObject has = ((RubyHash)hEC).op_aref(scanner.ctx, name);
+                                if(!has.isNil()) {
+                                    if(has == runtime.getTrue()) {
+                                        if(match.isNil()) {
+                                            match = e;
+                                        }
+                                    } else if(has == x.symAllow) {
+                                        match = S.focus;
+                                    } else if(has == x.symDeny) {
+                                        match = runtime.getNil();
+                                    }
+                                }
+                            }
+                            e = H_ELE_GET(e, H_ELE_PARENT);
+                        }
+                    
+                        if(match.isNil()) {
+                            match = S.focus;
+                        }
+                        S.focus = match;
+                    }
+
+                    scanner.hpricotAdd(S.focus, ele);
+
+                    //
+                    // in the case of a start tag that should be empty, just
+                    // skip the step that focuses the element.  focusing moves
+                    // us deeper into the document.
+                    //
+                    if(sym == x.sym_stag) {
+                        if(S.xml || ec != x.sym_EMPTY) {
+                            S.focus = ele;
+                            S.last = runtime.getNil();
+                        }
+                    }
+                } else if(sym == x.sym_etag) {
+                    IRubyObject name, match = runtime.getNil(), e = S.focus;
+                    if(S.strict) {
+                        if(((RubyHash)S.EC).op_aref(scanner.ctx, tag).isNil()) {
+                            tag = runtime.newString("div");
+                        }
+                    }
+
+                    name = runtime.newFixnum(tag.hashCode());
+                    while(e != S.doc) {
+                        if(H_ELE_GET(e, H_ELE_HASH).equals(name)) {
+                            match = e;
+                            break;
+                        }
+                        e = H_ELE_GET(e, H_ELE_PARENT);
+
+                    }
+                    if(match.isNil()) {
+                        H_ELE(x.cBogusETag);
+                        scanner.hpricotAdd(S.focus, ele);
+                    } else {
+                        ele = runtime.getNil();
+                        if(raw != -1) {
+                            ele = RubyString.newString(runtime, scanner.data, raw, rawlen);
+                        }
+                        H_ELE_SET(match, H_ELE_ETAG, ele);
+                        S.focus = H_ELE_GET(match, H_ELE_PARENT);
+                        S.last = runtime.getNil();
+
+                    }
+                } else if(sym == x.sym_cdata) {
+                    H_ELE(x.cCData);
+                    scanner.hpricotAdd(S.focus, ele);
+                } else if(sym == x.sym_comment) {
+                    H_ELE(x.cComment);
+                    scanner.hpricotAdd(S.focus, ele);
+                } else if(sym == x.sym_doctype) {
+                    H_ELE(x.cDocType);
+                    if(S.strict) {
+                        RubyHash h = (RubyHash)attr;
+                        h.fastASet(runtime.newSymbol("system_id"), runtime.newString("http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"));
+                        h.fastASet(runtime.newSymbol("public_id"), runtime.newString("-//W3C//DTD XHTML 1.0 Strict//EN"));
+                    }
+                    scanner.hpricotAdd(S.focus, ele);
+                } else if(sym == x.sym_procins) {
+                    IRubyObject match = tag.callMethod(scanner.ctx, "match", x.reProcInsParse);
+                    tag = RubyRegexp.nth_match(1, match);
+                    attr = RubyRegexp.nth_match(2, match);
+                    H_ELE(x.cProcIns);
+                    scanner.hpricotAdd(S.focus, ele);
+                } else if(sym == x.sym_text) {
+                    if(!S.last.isNil() && S.last.getType() == x.cText) {
+                        ((RubyString)H_ELE_GET(S.last, H_ELE_TAG)).append(tag);
+                    } else {
+                        H_ELE(x.cText);
+                        scanner.hpricotAdd(S.focus, ele);
+                    }
+                } else if(sym == x.sym_xmldecl) {
+                    H_ELE(x.cXMLDecl);
+                    scanner.hpricotAdd(S.focus, ele);
+                }
+            }
+        }
+
+        public void hpricotToken(State S, IRubyObject _sym, IRubyObject _tag, IRubyObject _attr, int _raw, int _rawlen, boolean taint) {
+            TokenInfo t = new TokenInfo();
+            t.sym = _sym;
+            t.tag = _tag;
+            t.attr = _attr;
+            t.raw = _raw;
+            t.rawlen = _rawlen;
+            t.ec = runtime.getNil();
+            t.ele = runtime.getNil();
+            t.x = x;
+            t.runtime = runtime;
+            t.scanner = this;
+            t.S = S;
+
+            t.hpricotToken(taint);
+        }
+
+        public void yieldTokens(IRubyObject sym, IRubyObject tag, IRubyObject attr, IRubyObject raw, boolean taint) {
+            if(sym == x.sym_text) {
+                raw = tag;
+            }
+            IRubyObject ary = RubyArray.newArrayNoCopy(runtime, new IRubyObject[]{sym, tag, attr, raw});
+            if(taint) {
+                ary.setTaint(true);
+                tag.setTaint(true);
+                attr.setTaint(true);
+                raw.setTaint(true);
+            }
 
-// line 189 "ext/hpricot_scan/hpricot_scan.java.rl"
+            block.yield(ctx, ary);
+        }
+
+// line 561 "hpricot_scan.java.rl"
 
 
 
-// line 150 "ext/hpricot_scan/HpricotScanService.java"
+// line 517 "HpricotScanService.java"
 private static byte[] init__hpricot_scan_actions_0()
 {
 	return new byte [] {
@@ -568,7 +935,7 @@
 private static final short _hpricot_scan_indicies[] = init__hpricot_scan_indicies_0();
 
 
-private static short[] init__hpricot_scan_trans_targs_0()
+private static short[] init__hpricot_scan_trans_targs_wi_0()
 {
 	return new short [] {
 	  204,    1,    2,   53,  204,    3,    4,    5,    6,    7,    8,    9,
@@ -611,10 +978,10 @@
 	};
 }
 
-private static final short _hpricot_scan_trans_targs[] = init__hpricot_scan_trans_targs_0();
+private static final short _hpricot_scan_trans_targs_wi[] = init__hpricot_scan_trans_targs_wi_0();
 
 
-private static short[] init__hpricot_scan_trans_actions_0()
+private static short[] init__hpricot_scan_trans_actions_wi_0()
 {
 	return new short [] {
 	   73,    0,    0,    0,   59,    0,    0,    0,    0,    0,    0,    0,
@@ -657,7 +1024,7 @@
 	};
 }
 
-private static final short _hpricot_scan_trans_actions[] = init__hpricot_scan_trans_actions_0();
+private static final short _hpricot_scan_trans_actions_wi[] = init__hpricot_scan_trans_actions_wi_0();
 
 
 private static short[] init__hpricot_scan_to_state_actions_0()
@@ -752,121 +1119,166 @@
 static final int hpricot_scan_en_html_procins = 218;
 static final int hpricot_scan_en_main = 204;
 
-// line 192 "ext/hpricot_scan/hpricot_scan.java.rl"
+// line 564 "hpricot_scan.java.rl"
 
-public final static int BUFSIZE=16384;
+        public final static int BUFSIZE = 16384;
 
-private void rb_yield_tokens(IRubyObject sym, IRubyObject tag, IRubyObject attr, IRubyObject raw, boolean taint) {
-  IRubyObject ary;
-  if (sym == runtime.newSymbol("text")) {
-    raw = tag;
-  }
-  ary = runtime.newArray(new IRubyObject[]{sym, tag, attr, raw});
-  if (taint) { 
-    ary.setTaint(true);
-    tag.setTaint(true);
-    attr.setTaint(true);
-    raw.setTaint(true);
-  }
-  block.yield(runtime.getCurrentContext(), ary, null, null, false);
-}
 
+        private int cs, act, have = 0, nread = 0, curline = 1;
+        private int ts = 0, te = 0, eof = -1, p = -1, pe = -1, buf = 0;
+        private byte[] data;
+        private State S = null;
+        private IRubyObject port, opts, attr, tag, akey, aval, bufsize;
+        private int mark_tag = -1, mark_akey = -1, mark_aval = -1;
+        private boolean done = false, ele_open = false, taint = false, io = false, text = false;
+        private int buffer_size = 0;
 
-int cs, act, have = 0, nread = 0, curline = 1, p=-1;
-boolean text = false;
-int ts=-1, te;
-int eof=-1;
-char[] buf;
-Ruby runtime;
-IRubyObject attr, bufsize;
-IRubyObject[] tag, akey, aval;
-int mark_tag, mark_akey, mark_aval;
-boolean done = false, ele_open = false;
-int buffer_size = 0;        
-boolean taint = false;
-Block block = null;
-
-
-IRubyObject xmldecl, doctype, procins, stag, etag, emptytag, comment,
-      cdata, sym_text;
-
-IRubyObject hpricot_scan(IRubyObject recv, IRubyObject port) {
-  attr = bufsize = runtime.getNil();
-  tag = new IRubyObject[]{runtime.getNil()};
-  akey = new IRubyObject[]{runtime.getNil()};
-  aval = new IRubyObject[]{runtime.getNil()};
-
-  RubyClass rb_eHpricotParseError = runtime.getModule("Hpricot").getClass("ParseError");
-
-  taint = port.isTaint();
-  if ( !port.respondsTo("read")) {
-    if ( port.respondsTo("to_str")) {
-      port = port.callMethod(runtime.getCurrentContext(),"to_str");
-    } else {
-      throw runtime.newArgumentError("bad Hpricot argument, String or IO only please.");
-    }
-  }
+        private Extra x;
 
-  buffer_size = BUFSIZE;
-  if (rubyApi.getInstanceVariable(recv, "@buffer_size") != null) {
-    bufsize = rubyApi.getInstanceVariable(recv, "@buffer_size");
-    if (!bufsize.isNil()) {
-      buffer_size = RubyNumeric.fix2int(bufsize);
-    }
-  }
-  buf = new char[buffer_size];
+        private IRubyObject self;
+        private Ruby runtime;
+        private ThreadContext ctx;
+        private Block block;
+
+        private IRubyObject xmldecl, doctype, stag, etag, emptytag, comment, cdata, procins;
+
+        private RaiseException newRaiseException(RubyClass exceptionClass, String message) {
+            return new RaiseException(runtime, exceptionClass, message, true);
+        }
 
-  
-// line 821 "ext/hpricot_scan/HpricotScanService.java"
+        public Scanner(IRubyObject self, IRubyObject[] args, Block block) {
+            this.self = self;
+            this.runtime = self.getRuntime();
+            this.ctx = runtime.getCurrentContext();
+            this.block = block;
+            attr = runtime.getNil();
+            tag = runtime.getNil();
+            akey = runtime.getNil();
+            aval = runtime.getNil();
+            bufsize = runtime.getNil();
+
+            this.x = (Extra)this.runtime.getModule("Hpricot").dataGetStruct();
+
+            this.xmldecl = x.sym_xmldecl;
+            this.doctype = x.sym_doctype;
+            this.stag = x.sym_stag;
+            this.etag = x.sym_etag;
+            this.emptytag = x.sym_emptytag;
+            this.comment = x.sym_comment;
+            this.cdata = x.sym_cdata;
+            this.procins = x.sym_procins;
+
+            port = args[0];
+            if(args.length == 2) {
+                opts = args[1];
+            } else {
+                opts = runtime.getNil();
+            }
+
+            taint = port.isTaint();
+            io = port.respondsTo("read");
+            if(!io) {
+                if(port.respondsTo("to_str")) {
+                    port = port.callMethod(ctx, "to_str");
+                    port = port.convertToString();
+                } else {
+                    throw runtime.newArgumentError("an Hpricot document must be built from an input source (a String or IO object.)");
+                }
+            }
+
+            if(!(opts instanceof RubyHash)) {
+                opts = runtime.getNil();
+            }
+
+            if(!block.isGiven()) {
+                S = new State();
+                S.doc = x.cDoc.allocate();
+                S.focus = S.doc;
+                S.last = runtime.getNil();
+                S.xml = OPT(opts, "xml");
+                S.strict = OPT(opts, "xhtml_strict");
+                S.fixup = OPT(opts, "fixup_tags");
+                if(S.strict) {
+                    S.fixup = true;
+                }
+                S.doc.getInstanceVariables().fastSetInstanceVariable("@options", opts);
+                S.EC = x.mHpricot.getConstant("ElementContent");
+            }
+
+            buffer_size = BUFSIZE;
+            if(self.getInstanceVariables().fastHasInstanceVariable("@buffer_size")) {
+                bufsize = self.getInstanceVariables().fastGetInstanceVariable("@buffer_size");
+                if(!bufsize.isNil()) {
+                    buffer_size = RubyNumeric.fix2int(bufsize);
+                }
+            }
+
+            if(io) {
+                buf = 0;
+                data = new byte[buffer_size];
+            }
+        }
+        
+        private int len, space;
+        // hpricot_scan
+        public IRubyObject scan() {
+
+// line 1227 "HpricotScanService.java"
 	{
 	cs = hpricot_scan_start;
 	ts = -1;
 	te = -1;
 	act = 0;
 	}
-// line 256 "ext/hpricot_scan/hpricot_scan.java.rl"
+// line 667 "hpricot_scan.java.rl"
+            while(!done) {
+                p = pe = len = buf;
+                space = buffer_size - have;
+                
+                if(io) {
+                    if(space == 0) {
+                        /* We've used up the entire buffer storing an already-parsed token
+                         * prefix that must be preserved.  Likely caused by super-long attributes.
+                         * Increase buffer size and continue  */
+                        buffer_size += BUFSIZE;
+                        data = realloc(data, buffer_size);
+                        space = buffer_size - have;
+                    }
+
+                    p = have;
+                    IRubyObject str = port.callMethod(ctx, "read", runtime.newFixnum(space));
+                    ByteList bl = str.convertToString().getByteList();
+                    len = bl.realSize;
+                    System.arraycopy(bl.bytes, bl.begin, data, p, len);
+                } else {
+                    ByteList bl = port.convertToString().getByteList();
+                    data = bl.bytes;
+                    buf = bl.begin;
+                    p = bl.begin;
+                    len = bl.realSize + 1;
+                    if(p + len >= data.length) {
+                        data = new byte[len];
+                        System.arraycopy(bl.bytes, bl.begin, data, 0, bl.realSize);
+                        p = 0;
+                        buf = 0;
+                    }
+                    done = true;
+                    eof = p + len;
+                }
+
+                nread += len;
+
+                /* If this is the last buffer, tack on an EOF. */
+                if(io && len < space) {
+                    data[p + len++] = 0;
+                    eof = p + len;
+                    done = true;
+                }
 
-  while( !done ) {
-    IRubyObject str;
-    p = have;
-    int pe;
-    int len, space = buffer_size - have;
-
-    if ( space == 0 ) {
-      /* We've used up the entire buffer storing an already-parsed token
-       * prefix that must be preserved.  Likely caused by super-long attributes.
-       * See ticket #13. */
-       buffer_size += BUFSIZE;
-       char[] new_buf = new char[buffer_size];
-       System.arraycopy(buf, 0, new_buf, 0, buf.length);
-       buf = new_buf;
-       space = buffer_size - have;
-    }
-
-    if (port.respondsTo("read")) {
-      str = port.callMethod(runtime.getCurrentContext(),"read",runtime.newFixnum(space));
-    } else {
-      str = ((RubyString)port).substr(nread,space);
-    }
-
-    str = str.convertToString();
-    String sss = str.toString();
-    char[] chars = sss.toCharArray();
-    System.arraycopy(chars,0,buf,p,chars.length);
-
-    len = sss.length();
-    nread += len;
-
-    if ( len < space ) {
-      len++;
-      done = true;
-    }
+                pe = p + len;
 
-    pe = p + len;
-    char[] data = buf;
-
-    
-// line 870 "ext/hpricot_scan/HpricotScanService.java"
+                
+// line 1282 "HpricotScanService.java"
 	{
 	int _klen;
 	int _trans = 0;
@@ -888,10 +1300,10 @@
 	while ( _nacts-- > 0 ) {
 		switch ( _hpricot_scan_actions[_acts++] ) {
 	case 21:
-// line 1 "ext/hpricot_scan/hpricot_scan.java.rl"
+// line 1 "hpricot_scan.java.rl"
 	{ts = p;}
 	break;
-// line 895 "ext/hpricot_scan/HpricotScanService.java"
+// line 1307 "HpricotScanService.java"
 		}
 	}
 
@@ -946,233 +1358,239 @@
 
 	_trans = _hpricot_scan_indicies[_trans];
 case 3:
-	cs = _hpricot_scan_trans_targs[_trans];
+	cs = _hpricot_scan_trans_targs_wi[_trans];
 
-	if ( _hpricot_scan_trans_actions[_trans] != 0 ) {
-		_acts = _hpricot_scan_trans_actions[_trans];
+	if ( _hpricot_scan_trans_actions_wi[_trans] != 0 ) {
+		_acts = _hpricot_scan_trans_actions_wi[_trans];
 		_nacts = (int) _hpricot_scan_actions[_acts++];
 		while ( _nacts-- > 0 )
 	{
 			switch ( _hpricot_scan_actions[_acts++] )
 			{
 	case 0:
-// line 147 "ext/hpricot_scan/hpricot_scan.java.rl"
+// line 514 "hpricot_scan.java.rl"
 	{
-    if (text) {
-      CAT(tag, p);
-      ELE(sym_text);
-      text = false;
+    if(text) {
+        tag = CAT(tag, mark_tag, p);
+        ELE(x.sym_text);
+        text = false;
     }
     attr = runtime.getNil();
-    tag[0] = runtime.getNil();
+    tag = runtime.getNil();
     mark_tag = -1;
     ele_open = true;
   }
 	break;
 	case 1:
-// line 159 "ext/hpricot_scan/hpricot_scan.java.rl"
+// line 526 "hpricot_scan.java.rl"
 	{ mark_tag = p; }
 	break;
 	case 2:
-// line 160 "ext/hpricot_scan/hpricot_scan.java.rl"
+// line 527 "hpricot_scan.java.rl"
 	{ mark_aval = p; }
 	break;
 	case 3:
-// line 161 "ext/hpricot_scan/hpricot_scan.java.rl"
+// line 528 "hpricot_scan.java.rl"
 	{ mark_akey = p; }
 	break;
 	case 4:
-// line 162 "ext/hpricot_scan/hpricot_scan.java.rl"
-	{ SET(tag, p); }
+// line 529 "hpricot_scan.java.rl"
+	{ tag = SET(mark_tag, p, tag); }
 	break;
 	case 5:
-// line 164 "ext/hpricot_scan/hpricot_scan.java.rl"
-	{ SET(aval, p); }
+// line 531 "hpricot_scan.java.rl"
+	{ aval = SET(mark_aval, p, aval); }
 	break;
 	case 6:
-// line 165 "ext/hpricot_scan/hpricot_scan.java.rl"
-	{ 
-    if (buf[p-1] == '"' || buf[p-1] == '\'') { SET(aval, p-1); }
-    else { SET(aval, p); }
+// line 532 "hpricot_scan.java.rl"
+	{
+      if(data[p-1] == '"' || data[p-1] == '\'') {
+          aval = SET(mark_aval, p-1, aval);
+      } else {
+          aval = SET(mark_aval, p, aval);
+      }
   }
 	break;
 	case 7:
-// line 169 "ext/hpricot_scan/hpricot_scan.java.rl"
-	{ SET(akey, p); }
+// line 539 "hpricot_scan.java.rl"
+	{   akey = SET(mark_akey, p, akey); }
 	break;
 	case 8:
-// line 170 "ext/hpricot_scan/hpricot_scan.java.rl"
-	{ SET(aval, p); ATTR(rb_str_new2("version"), aval); }
+// line 540 "hpricot_scan.java.rl"
+	{ aval = SET(mark_aval, p, aval); ATTR(runtime.newSymbol("version"), aval); }
 	break;
 	case 9:
-// line 171 "ext/hpricot_scan/hpricot_scan.java.rl"
-	{ SET(aval, p); ATTR(rb_str_new2("encoding"), aval); }
+// line 541 "hpricot_scan.java.rl"
+	{ aval = SET(mark_aval, p, aval); ATTR(runtime.newSymbol("encoding"), aval); }
 	break;
 	case 10:
-// line 172 "ext/hpricot_scan/hpricot_scan.java.rl"
-	{ SET(aval, p); ATTR(rb_str_new2("standalone"), aval); }
+// line 542 "hpricot_scan.java.rl"
+	{ aval = SET(mark_aval, p, aval); ATTR(runtime.newSymbol("standalone"), aval); }
 	break;
 	case 11:
-// line 173 "ext/hpricot_scan/hpricot_scan.java.rl"
-	{ SET(aval, p); ATTR(rb_str_new2("public_id"), aval); }
+// line 543 "hpricot_scan.java.rl"
+	{ aval = SET(mark_aval, p, aval); ATTR(runtime.newSymbol("public_id"), aval); }
 	break;
 	case 12:
-// line 174 "ext/hpricot_scan/hpricot_scan.java.rl"
-	{ SET(aval, p); ATTR(rb_str_new2("system_id"), aval); }
+// line 544 "hpricot_scan.java.rl"
+	{ aval = SET(mark_aval, p, aval); ATTR(runtime.newSymbol("system_id"), aval); }
 	break;
 	case 13:
-// line 176 "ext/hpricot_scan/hpricot_scan.java.rl"
-	{ 
-    akey[0] = runtime.getNil();
-    aval[0] = runtime.getNil();
-    mark_akey = -1;
-    mark_aval = -1;
+// line 546 "hpricot_scan.java.rl"
+	{
+      akey = runtime.getNil();
+      aval = runtime.getNil();
+      mark_akey = -1;
+      mark_aval = -1;
   }
 	break;
 	case 14:
-// line 183 "ext/hpricot_scan/hpricot_scan.java.rl"
-	{ 
-    ATTR(akey, aval);
+// line 553 "hpricot_scan.java.rl"
+	{
+      if(!S.xml) {
+          akey = akey.callMethod(runtime.getCurrentContext(), "downcase");
+      }
+      ATTR(akey, aval);
   }
 	break;
 	case 15:
-// line 9 "ext/hpricot_scan/hpricot_scan.java.rl"
+// line 9 "hpricot_scan.java.rl"
 	{curline += 1;}
 	break;
 	case 16:
-// line 46 "ext/hpricot_scan/hpricot_scan.java.rl"
+// line 46 "hpricot_scan.java.rl"
 	{ TEXT_PASS(); }
 	break;
 	case 17:
-// line 50 "ext/hpricot_scan/hpricot_scan.java.rl"
+// line 50 "hpricot_scan.java.rl"
 	{ EBLK(comment, 3); {cs = 204; _goto_targ = 2; if (true) continue _goto;} }
 	break;
 	case 18:
-// line 55 "ext/hpricot_scan/hpricot_scan.java.rl"
+// line 55 "hpricot_scan.java.rl"
 	{ EBLK(cdata, 3); {cs = 204; _goto_targ = 2; if (true) continue _goto;} }
 	break;
 	case 19:
-// line 60 "ext/hpricot_scan/hpricot_scan.java.rl"
+// line 60 "hpricot_scan.java.rl"
 	{ EBLK(procins, 2); {cs = 204; _goto_targ = 2; if (true) continue _goto;} }
 	break;
 	case 22:
-// line 1 "ext/hpricot_scan/hpricot_scan.java.rl"
+// line 1 "hpricot_scan.java.rl"
 	{te = p+1;}
 	break;
 	case 23:
-// line 50 "ext/hpricot_scan/hpricot_scan.java.rl"
+// line 50 "hpricot_scan.java.rl"
 	{te = p+1;}
 	break;
 	case 24:
-// line 51 "ext/hpricot_scan/hpricot_scan.java.rl"
+// line 51 "hpricot_scan.java.rl"
 	{te = p+1;{ TEXT_PASS(); }}
 	break;
 	case 25:
-// line 51 "ext/hpricot_scan/hpricot_scan.java.rl"
+// line 51 "hpricot_scan.java.rl"
 	{te = p;p--;{ TEXT_PASS(); }}
 	break;
 	case 26:
-// line 51 "ext/hpricot_scan/hpricot_scan.java.rl"
+// line 51 "hpricot_scan.java.rl"
 	{{p = ((te))-1;}{ TEXT_PASS(); }}
 	break;
 	case 27:
-// line 55 "ext/hpricot_scan/hpricot_scan.java.rl"
+// line 55 "hpricot_scan.java.rl"
 	{te = p+1;}
 	break;
 	case 28:
-// line 56 "ext/hpricot_scan/hpricot_scan.java.rl"
+// line 56 "hpricot_scan.java.rl"
 	{te = p+1;{ TEXT_PASS(); }}
 	break;
 	case 29:
-// line 56 "ext/hpricot_scan/hpricot_scan.java.rl"
+// line 56 "hpricot_scan.java.rl"
 	{te = p;p--;{ TEXT_PASS(); }}
 	break;
 	case 30:
-// line 56 "ext/hpricot_scan/hpricot_scan.java.rl"
+// line 56 "hpricot_scan.java.rl"
 	{{p = ((te))-1;}{ TEXT_PASS(); }}
 	break;
 	case 31:
-// line 60 "ext/hpricot_scan/hpricot_scan.java.rl"
+// line 60 "hpricot_scan.java.rl"
 	{te = p+1;}
 	break;
 	case 32:
-// line 61 "ext/hpricot_scan/hpricot_scan.java.rl"
+// line 61 "hpricot_scan.java.rl"
 	{te = p+1;{ TEXT_PASS(); }}
 	break;
 	case 33:
-// line 61 "ext/hpricot_scan/hpricot_scan.java.rl"
+// line 61 "hpricot_scan.java.rl"
 	{te = p;p--;{ TEXT_PASS(); }}
 	break;
 	case 34:
-// line 66 "ext/hpricot_scan/hpricot_scan.java.rl"
+// line 66 "hpricot_scan.java.rl"
 	{act = 8;}
 	break;
 	case 35:
-// line 68 "ext/hpricot_scan/hpricot_scan.java.rl"
+// line 68 "hpricot_scan.java.rl"
 	{act = 10;}
 	break;
 	case 36:
-// line 70 "ext/hpricot_scan/hpricot_scan.java.rl"
+// line 70 "hpricot_scan.java.rl"
 	{act = 12;}
 	break;
 	case 37:
-// line 73 "ext/hpricot_scan/hpricot_scan.java.rl"
+// line 73 "hpricot_scan.java.rl"
 	{act = 15;}
 	break;
 	case 38:
-// line 65 "ext/hpricot_scan/hpricot_scan.java.rl"
+// line 65 "hpricot_scan.java.rl"
 	{te = p+1;{ ELE(xmldecl); }}
 	break;
 	case 39:
-// line 66 "ext/hpricot_scan/hpricot_scan.java.rl"
+// line 66 "hpricot_scan.java.rl"
 	{te = p+1;{ ELE(doctype); }}
 	break;
 	case 40:
-// line 68 "ext/hpricot_scan/hpricot_scan.java.rl"
+// line 68 "hpricot_scan.java.rl"
 	{te = p+1;{ ELE(stag); }}
 	break;
 	case 41:
-// line 69 "ext/hpricot_scan/hpricot_scan.java.rl"
+// line 69 "hpricot_scan.java.rl"
 	{te = p+1;{ ELE(etag); }}
 	break;
 	case 42:
-// line 70 "ext/hpricot_scan/hpricot_scan.java.rl"
+// line 70 "hpricot_scan.java.rl"
 	{te = p+1;{ ELE(emptytag); }}
 	break;
 	case 43:
-// line 71 "ext/hpricot_scan/hpricot_scan.java.rl"
+// line 71 "hpricot_scan.java.rl"
 	{te = p+1;{ {cs = 214; _goto_targ = 2; if (true) continue _goto;} }}
 	break;
 	case 44:
-// line 72 "ext/hpricot_scan/hpricot_scan.java.rl"
+// line 72 "hpricot_scan.java.rl"
 	{te = p+1;{ {cs = 216; _goto_targ = 2; if (true) continue _goto;} }}
 	break;
 	case 45:
-// line 73 "ext/hpricot_scan/hpricot_scan.java.rl"
+// line 73 "hpricot_scan.java.rl"
 	{te = p+1;{ TEXT_PASS(); }}
 	break;
 	case 46:
-// line 66 "ext/hpricot_scan/hpricot_scan.java.rl"
+// line 66 "hpricot_scan.java.rl"
 	{te = p;p--;{ ELE(doctype); }}
 	break;
 	case 47:
-// line 67 "ext/hpricot_scan/hpricot_scan.java.rl"
+// line 67 "hpricot_scan.java.rl"
 	{te = p;p--;{ {cs = 218; _goto_targ = 2; if (true) continue _goto;} }}
 	break;
 	case 48:
-// line 73 "ext/hpricot_scan/hpricot_scan.java.rl"
+// line 73 "hpricot_scan.java.rl"
 	{te = p;p--;{ TEXT_PASS(); }}
 	break;
 	case 49:
-// line 67 "ext/hpricot_scan/hpricot_scan.java.rl"
+// line 67 "hpricot_scan.java.rl"
 	{{p = ((te))-1;}{ {cs = 218; _goto_targ = 2; if (true) continue _goto;} }}
 	break;
 	case 50:
-// line 73 "ext/hpricot_scan/hpricot_scan.java.rl"
+// line 73 "hpricot_scan.java.rl"
 	{{p = ((te))-1;}{ TEXT_PASS(); }}
 	break;
 	case 51:
-// line 1 "ext/hpricot_scan/hpricot_scan.java.rl"
+// line 1 "hpricot_scan.java.rl"
 	{	switch( act ) {
 	case 8:
 	{{p = ((te))-1;} ELE(doctype); }
@@ -1186,10 +1604,11 @@
 	case 15:
 	{{p = ((te))-1;} TEXT_PASS(); }
 	break;
+	default: break;
 	}
 	}
 	break;
-// line 1193 "ext/hpricot_scan/HpricotScanService.java"
+// line 1612 "HpricotScanService.java"
 			}
 		}
 	}
@@ -1200,10 +1619,10 @@
 	while ( _nacts-- > 0 ) {
 		switch ( _hpricot_scan_actions[_acts++] ) {
 	case 20:
-// line 1 "ext/hpricot_scan/hpricot_scan.java.rl"
+// line 1 "hpricot_scan.java.rl"
 	{ts = -1;}
 	break;
-// line 1207 "ext/hpricot_scan/HpricotScanService.java"
+// line 1626 "HpricotScanService.java"
 		}
 	}
 
@@ -1225,81 +1644,443 @@
 	}
 	break; }
 	}
-// line 297 "ext/hpricot_scan/hpricot_scan.java.rl"
-    
-    if ( cs == hpricot_scan_error ) {
-      if(!tag[0].isNil()) {
-        rb_raise(rb_eHpricotParseError, "parse error on element <"+tag.toString()+">, starting on line "+curline+".\n" + NO_WAY_SERIOUSLY);
-      } else {
-        rb_raise(rb_eHpricotParseError, "parse error on line "+curline+".\n" + NO_WAY_SERIOUSLY);
-      }
+// line 714 "hpricot_scan.java.rl"
+
+                if(cs == hpricot_scan_error) {
+                    if(!tag.isNil()) {
+                        throw newRaiseException(x.rb_eHpricotParseError, "parse error on element <" + tag + ">, starting on line " + curline + ".\n" + NO_WAY_SERIOUSLY);
+                    } else {
+                        throw newRaiseException(x.rb_eHpricotParseError, "parse error on line " + curline + ".\n" + NO_WAY_SERIOUSLY);
+                    }
+                }
+
+                if(done && ele_open) {
+                    ele_open = false;
+                    if(ts > 0) {
+                        mark_tag = ts;
+                        ts = 0;
+                        text = true;
+                    }
+                }
+
+                if(ts == -1) {
+                    have = 0;
+                    if(mark_tag != -1 && text) {
+                        if(done) {
+                            if(mark_tag < p - 1) {
+                                tag = CAT(tag, mark_tag, p-1);
+                                ELE(x.sym_text);
+                            }
+                        } else {
+                            tag = CAT(tag, mark_tag, p);
+                        }
+                    }
+                    if(io) {
+                        mark_tag = 0;
+                    } else {
+                        mark_tag = ((RubyString)port).getByteList().begin;
+                    }
+                } else if(io) {
+                    have = pe - ts;
+                    System.arraycopy(data, ts, data, buf, have);
+                    mark_tag = SLIDE(mark_tag);
+                    mark_akey = SLIDE(mark_akey);
+                    mark_aval = SLIDE(mark_aval);
+                    te -= ts;
+                    ts = 0;
+                }
+            }
+
+            if(S != null) {
+                return S.doc;
+            }
+
+            return runtime.getNil();
+        }
     }
+
+    public static class HpricotModule {
+        // hpricot_scan
+        @JRubyMethod(module = true, optional = 1, required = 1, frame = true)
+        public static IRubyObject scan(IRubyObject self, IRubyObject[] args, Block block) {
+            return new Scanner(self, args, block).scan();
+        }
+
+        // hpricot_css
+        @JRubyMethod(module = true)
+        public static IRubyObject css(IRubyObject self, IRubyObject mod, IRubyObject str, IRubyObject node) {
+            return new HpricotCss(self, mod, str, node).scan();
+        }
+    }
+
+    public static class CData {
+        @JRubyMethod
+        public static IRubyObject content(IRubyObject self) {
+            return hpricot_ele_get_name(self);
+        }
+
+        @JRubyMethod(name = "content=")
+        public static IRubyObject content_set(IRubyObject self, IRubyObject value) {
+            return hpricot_ele_set_name(self, value);
+        }
+    }
+
+    public static class Comment {
+        @JRubyMethod
+        public static IRubyObject content(IRubyObject self) {
+            return hpricot_ele_get_name(self);
+        }
+
+        @JRubyMethod(name = "content=")
+        public static IRubyObject content_set(IRubyObject self, IRubyObject value) {
+            return hpricot_ele_set_name(self, value);
+        }
+    }
+
+    public static class DocType {
+        @JRubyMethod
+        public static IRubyObject raw_string(IRubyObject self) {
+            return hpricot_ele_get_name(self);
+        }
+
+        @JRubyMethod
+        public static IRubyObject clear_raw(IRubyObject self) {
+            return hpricot_ele_clear_name(self);
+        }
+
+        @JRubyMethod
+        public static IRubyObject target(IRubyObject self) {
+            return hpricot_ele_get_target(self);
+        }
+
+        @JRubyMethod(name = "target=")
+        public static IRubyObject target_set(IRubyObject self, IRubyObject value) {
+            return hpricot_ele_set_target(self, value);
+        }
+
+        @JRubyMethod
+        public static IRubyObject public_id(IRubyObject self) {
+            return hpricot_ele_get_public_id(self);
+        }
+
+        @JRubyMethod(name = "public_id=")
+        public static IRubyObject public_id_set(IRubyObject self, IRubyObject value) {
+            return hpricot_ele_set_public_id(self, value);
+        }
+
+        @JRubyMethod
+        public static IRubyObject system_id(IRubyObject self) {
+            return hpricot_ele_get_system_id(self);
+        }
+
+        @JRubyMethod(name = "system_id=")
+        public static IRubyObject system_id_set(IRubyObject self, IRubyObject value) {
+            return hpricot_ele_set_system_id(self, value);
+        }
+    }
+
+    public static class Elem {
+        @JRubyMethod
+        public static IRubyObject clear_raw(IRubyObject self) {
+            return hpricot_ele_clear_raw(self);
+        }
+    }
+
+    public static class BogusETag {
+        @JRubyMethod
+        public static IRubyObject raw_string(IRubyObject self) {
+            return hpricot_ele_get_attr(self);
+        }
+
+        @JRubyMethod
+        public static IRubyObject clear_raw(IRubyObject self) {
+            return hpricot_ele_clear_attr(self);
+        }
+    }
+
+    public static class Text {
+        @JRubyMethod
+        public static IRubyObject raw_string(IRubyObject self) {
+            return hpricot_ele_get_name(self);
+        }
+
+        @JRubyMethod
+        public static IRubyObject clear_raw(IRubyObject self) {
+            return hpricot_ele_clear_name(self);
+        }
+
+        @JRubyMethod
+        public static IRubyObject content(IRubyObject self) {
+            return hpricot_ele_get_name(self);
+        }
+
+        @JRubyMethod(name = "content=")
+        public static IRubyObject content_set(IRubyObject self, IRubyObject value) {
+            return hpricot_ele_set_name(self, value);
+        }
+    }
+
+    public static class XMLDecl {
+        @JRubyMethod
+        public static IRubyObject raw_string(IRubyObject self) {
+            return hpricot_ele_get_name(self);
+        }
+
+        @JRubyMethod
+        public static IRubyObject clear_raw(IRubyObject self) {
+            return hpricot_ele_clear_name(self);
+        }
+
+        @JRubyMethod
+        public static IRubyObject encoding(IRubyObject self) {
+            return hpricot_ele_get_encoding(self);
+        }
+
+        @JRubyMethod(name = "encoding=")
+        public static IRubyObject encoding_set(IRubyObject self, IRubyObject value) {
+            return hpricot_ele_set_encoding(self, value);
+        }
+
+        @JRubyMethod
+        public static IRubyObject standalone(IRubyObject self) {
+            return hpricot_ele_get_standalone(self);
+        }
+
+        @JRubyMethod(name = "standalone=")
+        public static IRubyObject standalone_set(IRubyObject self, IRubyObject value) {
+            return hpricot_ele_set_standalone(self, value);
+        }
+
+        @JRubyMethod
+        public static IRubyObject version(IRubyObject self) {
+            return hpricot_ele_get_version(self);
+        }
+
+        @JRubyMethod(name = "version=")
+        public static IRubyObject version_set(IRubyObject self, IRubyObject value) {
+            return hpricot_ele_set_version(self, value);
+        }
+    }
+
+    public static class ProcIns {
+        @JRubyMethod
+        public static IRubyObject target(IRubyObject self) {
+            return hpricot_ele_get_name(self);
+        }
+
+        @JRubyMethod(name = "target=")
+        public static IRubyObject target_set(IRubyObject self, IRubyObject value) {
+            return hpricot_ele_set_name(self, value);
+        }
+
+        @JRubyMethod
+        public static IRubyObject content(IRubyObject self) {
+            return hpricot_ele_get_attr(self);
+        }
+
+        @JRubyMethod(name = "content=")
+        public static IRubyObject content_set(IRubyObject self, IRubyObject value) {
+            return hpricot_ele_set_attr(self, value);
+        }
+    }
+
+    public final static String NO_WAY_SERIOUSLY = "*** This should not happen, please send a bug report with the HTML you're parsing to why@whytheluckystiff.net.  So sorry!";
+
+    public final static int H_ELE_TAG = 0;
+    public final static int H_ELE_PARENT = 1;
+    public final static int H_ELE_ATTR = 2;
+    public final static int H_ELE_ETAG = 3;
+    public final static int H_ELE_RAW = 4;
+    public final static int H_ELE_EC = 5;
+    public final static int H_ELE_HASH = 6;
+    public final static int H_ELE_CHILDREN = 7;
+
+    public static IRubyObject H_ELE_GET(IRubyObject recv, int n) {
+        return ((IRubyObject[])recv.dataGetStruct())[n];
+    }
+
+    public static IRubyObject H_ELE_SET(IRubyObject recv, int n, IRubyObject value) {
+        ((IRubyObject[])recv.dataGetStruct())[n] = value;
+        return value;
+    }
+
+    private static class RefCallback implements Callback {
+        private final int n;
+        public RefCallback(int n) { this.n = n; }
+
+        public IRubyObject execute(IRubyObject recv, IRubyObject[] args, Block block) {
+            return H_ELE_GET(recv, n);
+        }
+
+        public Arity getArity() {
+            return Arity.NO_ARGUMENTS;
+        }
+    }
+
+    private static class SetCallback implements Callback {
+        private final int n;
+        public SetCallback(int n) { this.n = n; }
+
+        public IRubyObject execute(IRubyObject recv, IRubyObject[] args, Block block) {
+            return H_ELE_SET(recv, n, args[0]);
+        }
+
+        public Arity getArity() {
+            return Arity.ONE_ARGUMENT;
+        }
+    }
+
+    private final static Callback[] ref_func = new Callback[]{
+        new RefCallback(0),
+        new RefCallback(1),
+        new RefCallback(2),
+        new RefCallback(3),
+        new RefCallback(4),
+        new RefCallback(5),
+        new RefCallback(6),
+        new RefCallback(7),
+        new RefCallback(8),
+        new RefCallback(9)};
+
+    private final static Callback[] set_func = new Callback[]{
+        new SetCallback(0),
+        new SetCallback(1),
+        new SetCallback(2),
+        new SetCallback(3),
+        new SetCallback(4),
+        new SetCallback(5),
+        new SetCallback(6),
+        new SetCallback(7),
+        new SetCallback(8),
+        new SetCallback(9)};
+
+    public final static ObjectAllocator alloc_hpricot_struct = new ObjectAllocator() {
+            // alloc_hpricot_struct
+            public IRubyObject allocate(Ruby runtime, RubyClass klass) {
+                RubyClass kurrent = klass;
+                Object sz = kurrent.fastGetInternalVariable("__size__");
+                while(sz == null && kurrent != null) {
+                    kurrent = kurrent.getSuperClass();
+                    sz = kurrent.fastGetInternalVariable("__size__");
+                }
+                int size = RubyNumeric.fix2int((RubyObject)sz);
+                RubyObject obj = new RubyObject(runtime, klass);
+                IRubyObject[] all = new IRubyObject[size];
+                java.util.Arrays.fill(all, runtime.getNil());
+                obj.dataWrapStruct(all);
+                return obj;
+            }
+        };
+
+    public static RubyClass makeHpricotStruct(Ruby runtime, IRubyObject[] members) {
+        RubyClass klass = RubyClass.newClass(runtime, runtime.getObject());
+        klass.fastSetInternalVariable("__size__", runtime.newFixnum(members.length));
+        klass.setAllocator(alloc_hpricot_struct);
+
+        for(int i = 0; i < members.length; i++) {
+            String id = members[i].toString();
+            klass.defineMethod(id, ref_func[i]);
+            klass.defineMethod(id + "=", set_func[i]);
+        }
     
-    if ( done && ele_open ) {
-      ele_open = false;
-      if(ts > -1) {
-        mark_tag = ts;
-        ts = -1;
-        text = true;
-      }
+        return klass;
+    }
+
+    public boolean basicLoad(final Ruby runtime) throws IOException {
+        Init_hpricot_scan(runtime);
+        return true;
     }
 
-    if(ts == -1) {
-      have = 0;
-      /* text nodes have no ts because each byte is parsed alone */
-      if(mark_tag != -1 && text) {
-        if (done) {
-          if(mark_tag < p-1) {
-            CAT(tag, p-1);
-            ELE(sym_text);
-          }
-        } else {
-          CAT(tag, p);
+    public static class Extra {
+        IRubyObject symAllow, symDeny, sym_xmldecl, sym_doctype, 
+            sym_procins, sym_stag, sym_etag, sym_emptytag, 
+            sym_allowed, sym_children, sym_comment, 
+            sym_cdata, sym_name, sym_parent, 
+            sym_raw_attributes, sym_raw_string, sym_tagno, 
+            sym_text, sym_EMPTY, sym_CDATA;
+
+        public RubyModule mHpricot;
+        public RubyClass structElem;
+        public RubyClass structAttr;
+        public RubyClass structBasic;
+        public RubyClass cDoc;
+        public RubyClass cCData;
+        public RubyClass cComment;
+        public RubyClass cDocType;
+        public RubyClass cElem;
+        public RubyClass cBogusETag;
+        public RubyClass cText;
+        public RubyClass cXMLDecl;
+        public RubyClass cProcIns;
+        public RubyClass rb_eHpricotParseError;
+        public IRubyObject reProcInsParse;
+
+        public Extra(Ruby runtime) {
+            symAllow = runtime.newSymbol("allow");
+            symDeny = runtime.newSymbol("deny");
+            sym_xmldecl = runtime.newSymbol("xmldecl");
+            sym_doctype = runtime.newSymbol("doctype");
+            sym_procins = runtime.newSymbol("procins");
+            sym_stag = runtime.newSymbol("stag");
+            sym_etag = runtime.newSymbol("etag");
+            sym_emptytag = runtime.newSymbol("emptytag");
+            sym_allowed = runtime.newSymbol("allowed");
+            sym_children = runtime.newSymbol("children");
+            sym_comment = runtime.newSymbol("comment");
+            sym_cdata = runtime.newSymbol("cdata");
+            sym_name = runtime.newSymbol("name");
+            sym_parent = runtime.newSymbol("parent");
+            sym_raw_attributes = runtime.newSymbol("raw_attributes");
+            sym_raw_string = runtime.newSymbol("raw_string");
+            sym_tagno = runtime.newSymbol("tagno");
+            sym_text = runtime.newSymbol("text");
+            sym_EMPTY = runtime.newSymbol("EMPTY");
+            sym_CDATA = runtime.newSymbol("CDATA");
         }
-      }
-      mark_tag = 0;
-    } else {
-      have = pe - ts;
-      System.arraycopy(buf,ts,buf,0,have);
-      SLIDE(tag);
-      SLIDE(akey);
-      SLIDE(aval);
-      te = (te - ts);
-      ts = 0;
     }
-  }
-  return runtime.getNil();
-}
 
-public static IRubyObject __hpricot_scan(IRubyObject recv, IRubyObject port, Block block) {
-  Ruby runtime = recv.getRuntime();
-  HpricotScanService service = new HpricotScanService();
-  service.runtime = runtime;
-  service.xmldecl = runtime.newSymbol("xmldecl");
-  service.doctype = runtime.newSymbol("doctype");
-  service.procins = runtime.newSymbol("procins");
-  service.stag = runtime.newSymbol("stag");
-  service.etag = runtime.newSymbol("etag");
-  service.emptytag = runtime.newSymbol("emptytag");
-  service.comment = runtime.newSymbol("comment");
-  service.cdata = runtime.newSymbol("cdata");
-  service.sym_text = runtime.newSymbol("text");
-  service.block = block;
-  return service.hpricot_scan(recv, port);
-}
+    public static void Init_hpricot_scan(Ruby runtime) {
+        Extra x = new Extra(runtime);
 
+        x.mHpricot = runtime.defineModule("Hpricot");
+        x.mHpricot.dataWrapStruct(x);
 
-public boolean basicLoad(final Ruby runtime) throws IOException {
-       Init_hpricot_scan(runtime);
-       return true;
-}
+        x.mHpricot.getSingletonClass().attr_accessor(runtime.getCurrentContext(),new  IRubyObject[]{runtime.newSymbol("buffer_size")});
+        x.mHpricot.defineAnnotatedMethods(HpricotModule.class);
 
-public static void Init_hpricot_scan(Ruby runtime) {
-  RubyModule mHpricot = runtime.defineModule("Hpricot");
-  mHpricot.getMetaClass().attr_accessor(runtime.getCurrentContext(),new IRubyObject[]{runtime.newSymbol("buffer_size")});
-  CallbackFactory fact = runtime.callbackFactory(HpricotScanService.class);
-  mHpricot.getMetaClass().defineMethod("scan",fact.getSingletonMethod("__hpricot_scan",IRubyObject.class));
-  mHpricot.defineClassUnder("ParseError",runtime.getClass("StandardError"),runtime.getClass("StandardError").getAllocator());
-  rubyApi = JavaEmbedUtils.newObjectAdapter();
-}
+        x.rb_eHpricotParseError = x.mHpricot.defineClassUnder("ParseError",runtime.getClass("StandardError"),runtime.getClass("StandardError").getAllocator());
+
+        x.structElem = makeHpricotStruct(runtime, new IRubyObject[] {x.sym_name, x.sym_parent, x.sym_raw_attributes, x.sym_etag, x.sym_raw_string, x.sym_allowed, x.sym_tagno, x.sym_children});
+        x.structAttr = makeHpricotStruct(runtime, new IRubyObject[] {x.sym_name, x.sym_parent, x.sym_raw_attributes});
+        x.structBasic= makeHpricotStruct(runtime, new IRubyObject[] {x.sym_name, x.sym_parent});
+
+        x.cDoc = x.mHpricot.defineClassUnder("Doc", x.structElem, x.structElem.getAllocator());
+
+        x.cCData = x.mHpricot.defineClassUnder("CData", x.structBasic, x.structBasic.getAllocator());
+        x.cCData.defineAnnotatedMethods(CData.class);
+
+        x.cComment = x.mHpricot.defineClassUnder("Comment", x.structBasic, x.structBasic.getAllocator());
+        x.cComment.defineAnnotatedMethods(Comment.class);
+
+        x.cDocType = x.mHpricot.defineClassUnder("DocType", x.structAttr, x.structAttr.getAllocator());
+        x.cDocType.defineAnnotatedMethods(DocType.class);
+
+        x.cElem = x.mHpricot.defineClassUnder("Elem", x.structElem, x.structElem.getAllocator());
+        x.cElem.defineAnnotatedMethods(Elem.class);
+
+        x.cBogusETag = x.mHpricot.defineClassUnder("BogusETag", x.structAttr, x.structAttr.getAllocator());
+        x.cBogusETag.defineAnnotatedMethods(BogusETag.class);
+
+        x.cText = x.mHpricot.defineClassUnder("Text", x.structBasic, x.structBasic.getAllocator());
+        x.cText.defineAnnotatedMethods(Text.class);
+
+        x.cXMLDecl = x.mHpricot.defineClassUnder("XMLDecl", x.structAttr, x.structAttr.getAllocator());
+        x.cXMLDecl.defineAnnotatedMethods(XMLDecl.class);
+
+        x.cProcIns = x.mHpricot.defineClassUnder("ProcIns", x.structAttr, x.structAttr.getAllocator());
+        x.cProcIns.defineAnnotatedMethods(ProcIns.class);
+
+        x.reProcInsParse = runtime.evalScriptlet("/\\A<\\?(\\S+)\\s+(.+)/m");
+        x.mHpricot.setConstant("ProcInsParse", x.reProcInsParse);
+    }
 }
diff -Nru /tmp/aPeI5X1Iz5/libhpricot-ruby-0.8/hpricot.gemspec /tmp/kCvPnLCzlr/libhpricot-ruby-0.8.2/hpricot.gemspec
--- libhpricot-ruby-0.8/hpricot.gemspec	2009-03-24 19:43:02.000000000 +0000
+++ libhpricot-ruby-0.8.2/hpricot.gemspec	1970-01-01 01:00:00.000000000 +0100
@@ -1,17 +0,0 @@
-Gem::Specification.new do |s|
-  s.name = %q{hpricot}
-  s.version = "0.7.229"
- 
-  s.authors = ["why the lucky stiff"]
-  s.date = %q{2009-03-23}
-  s.description = %q{a swift, liberal HTML parser with a fantastic library}
-  s.email = %q{why@ruby-lang.org}
-  s.extensions = ["ext/fast_xs/extconf.rb", "ext/hpricot_scan/extconf.rb"]
-  s.extra_rdoc_files = ["README", "CHANGELOG", "COPYING"]
-  s.files = ["CHANGELOG", "COPYING", "README", "Rakefile", "test/files", "test/files/basic.xhtml", "test/files/boingboing.html", "test/files/cy0.html", "test/files/immob.html", "test/files/pace_application.html", "test/files/tenderlove.html", "test/files/uswebgen.html", "test/files/utf8.html", "test/files/week9.html", "test/files/why.xml", "test/load_files.rb", "test/test_alter.rb", "test/test_builder.rb", "test/test_parser.rb", "test/test_paths.rb", "test/test_preserved.rb", "test/test_xml.rb", "lib/hpricot", "lib/hpricot/blankslate.rb", "lib/hpricot/builder.rb", "lib/hpricot/elements.rb", "lib/hpricot/htmlinfo.rb", "lib/hpricot/inspect.rb", "lib/hpricot/modules.rb", "lib/hpricot/parse.rb", "lib/hpricot/tag.rb", "lib/hpricot/tags.rb", "lib/hpricot/traverse.rb", "lib/hpricot/xchar.rb", "lib/hpricot.rb", "extras/mingw-rbconfig.rb", "ext/hpricot_scan/hpricot_scan.h", "ext/fast_xs/FastXsService.java", "ext/hpricot_scan/HpricotScanService.java", "ext/fast_xs/fast_xs.c", "ext/hpricot_scan/hpricot_scan.c", "ext/hpricot_scan/hpricot_css.c", "ext/fast_xs/extconf.rb", "ext/hpricot_scan/extconf.rb", "ext/hpricot_scan/hpricot_common.rl", "ext/hpricot_scan/hpricot_scan.java.rl", "ext/hpricot_scan/hpricot_scan.rl"]
-  s.has_rdoc = true
-  s.homepage = %q{http://code.whytheluckystiff.net/hpricot/}
-  s.rdoc_options = ["--quiet", "--title", "The Hpricot Reference", "--main", "README", "--inline-source"]
-  s.require_paths = ["lib"]
-  s.summary = %q{a swift, liberal HTML parser with a fantastic library}
-end
diff -Nru /tmp/aPeI5X1Iz5/libhpricot-ruby-0.8/lib/hpricot/inspect.rb /tmp/kCvPnLCzlr/libhpricot-ruby-0.8.2/lib/hpricot/inspect.rb
--- libhpricot-ruby-0.8/lib/hpricot/inspect.rb	2009-03-24 19:43:02.000000000 +0000
+++ libhpricot-ruby-0.8.2/lib/hpricot/inspect.rb	2009-12-13 23:54:10.000000000 +0000
@@ -11,7 +11,7 @@
 
   class Doc
     def pretty_print(q)
-      q.object_group(self) { children.each {|elt| q.breakable; q.pp elt } }
+      q.object_group(self) { children.each {|elt| q.breakable; q.pp elt } if children }
     end
     alias inspect pretty_print_inspect
   end
diff -Nru /tmp/aPeI5X1Iz5/libhpricot-ruby-0.8/lib/hpricot/tag.rb /tmp/kCvPnLCzlr/libhpricot-ruby-0.8.2/lib/hpricot/tag.rb
--- libhpricot-ruby-0.8/lib/hpricot/tag.rb	2009-03-24 19:43:02.000000000 +0000
+++ libhpricot-ruby-0.8.2/lib/hpricot/tag.rb	2009-12-13 23:54:10.000000000 +0000
@@ -38,6 +38,35 @@
     end
   end
 
+  class Attributes
+    attr_accessor :element
+    def initialize e
+      @element = e
+    end
+    def [] k 
+      Hpricot.uxs((@element.raw_attributes || {})[k])
+    end
+    def []= k, v
+      (@element.raw_attributes ||= {})[k] = v.fast_xs
+    end
+    def to_hash
+      if @element.raw_attributes
+        @element.raw_attributes.inject({}) do |hsh, (k, v)|
+          hsh[k] = Hpricot.uxs(v)
+          hsh
+        end
+      else
+        {}
+      end
+    end
+    def to_s
+      to_hash.to_s
+    end
+    def inspect
+      to_hash.inspect
+    end
+  end
+
   class Elem
     def initialize tag, attrs = nil, children = nil, etag = nil
       self.name, self.raw_attributes, self.children, self.etag =
@@ -45,14 +74,7 @@
     end
     def empty?; children.nil? or children.empty? end
     def attributes
-      if raw_attributes
-        raw_attributes.inject({}) do |hsh, (k, v)|
-          hsh[k] = Hpricot.uxs(v)
-          hsh
-        end
-      else
-        {}
-      end
+      Attributes.new self
     end
     def to_plain_text
       if self.name == 'br'
@@ -102,10 +124,7 @@
   class BogusETag
     def initialize name; self.name = name end
     def output(out, opts = {})
-      out <<
-        if_output(opts) do
-          "</#{name}>"
-        end
+      out << if_output(opts) { "" }
     end
   end
 
diff -Nru /tmp/aPeI5X1Iz5/libhpricot-ruby-0.8/lib/hpricot/traverse.rb /tmp/kCvPnLCzlr/libhpricot-ruby-0.8.2/lib/hpricot/traverse.rb
--- libhpricot-ruby-0.8/lib/hpricot/traverse.rb	2009-03-24 19:43:02.000000000 +0000
+++ libhpricot-ruby-0.8.2/lib/hpricot/traverse.rb	2009-12-13 23:54:10.000000000 +0000
@@ -194,6 +194,7 @@
     alias_method :innerHTML=, :inner_html=
 
     def reparent(nodes)
+      return unless nodes
       altered!
       [*nodes].each { |e| e.parent = self }
     end
diff -Nru /tmp/aPeI5X1Iz5/libhpricot-ruby-0.8/Rakefile /tmp/kCvPnLCzlr/libhpricot-ruby-0.8.2/Rakefile
--- libhpricot-ruby-0.8/Rakefile	2009-03-24 19:43:02.000000000 +0000
+++ libhpricot-ruby-0.8.2/Rakefile	2009-12-13 23:54:10.000000000 +0000
@@ -10,16 +10,16 @@
 
 NAME = "hpricot"
 REV = (`#{ENV['GIT'] || "git"} rev-list HEAD`.split.length + 1).to_s
-VERS = ENV['VERSION'] || "0.7" + (REV ? ".#{REV}" : "")
+VERS = ENV['VERSION'] || "0.8" + (REV ? ".#{REV}" : "")
 PKG = "#{NAME}-#{VERS}"
 BIN = "*.{bundle,jar,so,o,obj,pdb,lib,def,exp,class}"
 CLEAN.include ["ext/hpricot_scan/#{BIN}", "ext/fast_xs/#{BIN}", "lib/**/#{BIN}",
-               'ext/fast_xs/Makefile', 'ext/hpricot_scan/Makefile', 
+               'ext/fast_xs/Makefile', 'ext/hpricot_scan/Makefile',
                '**/.*.sw?', '*.gem', '.config', 'pkg']
 RDOC_OPTS = ['--quiet', '--title', 'The Hpricot Reference', '--main', 'README', '--inline-source']
 PKG_FILES = %w(CHANGELOG COPYING README Rakefile) +
-      Dir.glob("{bin,doc,test,lib,extras}/**/*") + 
-      Dir.glob("ext/**/*.{h,java,c,rb,rl}") + 
+      Dir.glob("{bin,doc,test,lib,extras}/**/*") +
+      Dir.glob("ext/**/*.{h,java,c,rb,rl}") +
       %w[ext/hpricot_scan/hpricot_scan.c ext/hpricot_scan/hpricot_css.c ext/hpricot_scan/HpricotScanService.java] # needed because they are generated later
 RAGEL_C_CODE_GENERATION_STYLES = {
   "table_driven" => 'T0',
@@ -47,7 +47,7 @@
     s.homepage = 'http://code.whytheluckystiff.net/hpricot/'
     s.rubyforge_project = 'hobix'
     s.files = PKG_FILES
-    s.require_paths = ["lib"] 
+    s.require_paths = ["lib"]
     s.extensions = FileList["ext/**/extconf.rb"].to_a
     s.bindir = "bin"
   end
@@ -56,11 +56,15 @@
 Win32Spec.platform = 'x86-mswin32'
 Win32Spec.files = PKG_FILES + ["lib/hpricot_scan.so", "lib/fast_xs.so"]
 Win32Spec.extensions = []
-  
+
 WIN32_PKG_DIR = "#{PKG}-mswin32"
 
 desc "Does a full compile, test run"
+if defined?(JRUBY_VERSION)
+task :default => [:compile_java, :test]
+else
 task :default => [:compile, :test]
+end
 
 desc "Packages up Hpricot."
 task :package => [:clean, :ragel]
@@ -68,6 +72,7 @@
 desc "Releases packages for all Hpricot packages and platforms."
 task :release => [:package, :package_win32, :package_jruby]
 
+
 desc "Run all the tests"
 Rake::TestTask.new do |t|
     t.libs << "test"
@@ -97,7 +102,7 @@
     "#{ext}/extconf.rb",
     "#{ext}/Makefile",
     "lib"
-  ] 
+  ]
 
   desc "Builds just the #{extension} extension"
   task extension.to_sym => [:ragel, "#{ext}/Makefile", ext_so ]
@@ -147,21 +152,26 @@
 task :ragel => [:ragel_version] do
   if @ragel_v >= 6.1
     @ragel_c_code_generation_style = RAGEL_C_CODE_GENERATION_STYLES[DEFAULT_RAGEL_C_CODE_GENERATION]
-    console_sep = (ENV['COMSPEC'] =~ /cmd\.exe/) ? '&' : ';'
-    sh %{cd ext/hpricot_scan #{console_sep} ragel hpricot_scan.rl -#{@ragel_c_code_generation_style} -o hpricot_scan.c && ragel hpricot_css.rl -#{@ragel_c_code_generation_style} -o hpricot_css.c}
+    Dir.chdir("ext/hpricot_scan") do
+      sh %{ragel hpricot_scan.rl -#{@ragel_c_code_generation_style} -o hpricot_scan.c}
+      sh %{ragel hpricot_css.rl -#{@ragel_c_code_generation_style} -o hpricot_css.c}
+    end
   else
     STDERR.puts "Ragel 6.1 or greater is required."
     exit(1)
   end
 end
 
-# Java only supports the table-driven code 
-# generation style at this point. 
+# Java only supports the table-driven code
+# generation style at this point.
 desc "Generates the Java scanner code using the Ragel table-driven code generation style."
 task :ragel_java => [:ragel_version] do
   if @ragel_v >= 6.1
     puts "compiling with ragel version #{@ragel_v}"
-    sh %{ragel -J -o ext/hpricot_scan/HpricotScanService.java ext/hpricot_scan/hpricot_scan.java.rl}    
+    Dir.chdir("ext/hpricot_scan") do
+      sh %{ragel -J -o HpricotCss.java hpricot_css.java.rl}
+      sh %{ragel -J -o HpricotScanService.java hpricot_scan.java.rl}
+    end
   else
     STDERR.puts "Ragel 6.1 or greater is required."
     exit(1)
@@ -190,46 +200,48 @@
 
 ### JRuby Packages ###
 
-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
 
-def compile_java(filename, jarname)
-  sh %{javac -source 1.4 -target 1.4 #{java_classpath_arg} #{filename}}
+def compile_java(filenames, jarname)
+  sh %{javac -source 1.5 -target 1.5 #{java_classpath_arg} #{filenames.join(" ")}}
   sh %{jar cf #{jarname} *.class}
 end
 
 task :hpricot_scan_java => [:ragel_java] do
   Dir.chdir "ext/hpricot_scan" do
-    compile_java("HpricotScanService.java", "hpricot_scan.jar")
+    compile_java(["HpricotScanService.java", "HpricotCss.java"], "hpricot_scan.jar")
   end
 end
 
 task :fast_xs_java do
   Dir.chdir "ext/fast_xs" do
-    compile_java("FastXsService.java", "fast_xs.jar")
+    compile_java(["FastXsService.java"], "fast_xs.jar")
   end
 end
 
 desc "Compiles the JRuby extensions"
-task :hpricot_java => [:hpricot_scan_java, :fast_xs_java] do
+task :compile_java => [:hpricot_scan_java, :fast_xs_java] do
   %w(hpricot_scan fast_xs).each {|ext| mv "ext/#{ext}/#{ext}.jar", "lib"}
 end
 
 JRubySpec = SPEC.dup
-JRubySpec.platform = 'jruby'
+JRubySpec.platform = 'java'
 JRubySpec.files = PKG_FILES + ["lib/hpricot_scan.jar", "lib/fast_xs.jar"]
 JRubySpec.extensions = []
 
-JRUBY_PKG_DIR = "#{PKG}-jruby"
+JRUBY_PKG_DIR = "#{PKG}-java"
 
 desc "Package up the JRuby distribution."
 file JRUBY_PKG_DIR => [:ragel_java, :package] do
@@ -240,7 +252,7 @@
 desc "Build the RubyGems package for JRuby"
 task :package_jruby => JRUBY_PKG_DIR do
   Dir.chdir("#{JRUBY_PKG_DIR}") do
-    Rake::Task[:hpricot_java].invoke
+    Rake::Task[:compile_java].invoke
     Gem::Builder.new(JRubySpec).build
     verbose(true) {
       mv Dir["*.gem"].first, "../pkg/#{JRUBY_PKG_DIR}.gem"
diff -Nru /tmp/aPeI5X1Iz5/libhpricot-ruby-0.8/README /tmp/kCvPnLCzlr/libhpricot-ruby-0.8.2/README
--- libhpricot-ruby-0.8/README	2009-03-24 19:43:02.000000000 +0000
+++ libhpricot-ruby-0.8.2/README	2009-12-13 23:54:10.000000000 +0000
@@ -31,12 +31,11 @@
 
 First, here are all the links you need to know:
 
-* http://code.whytheluckystiff.net/hpricot is the Hpricot wiki and bug tracker.
+* http://wiki.github.com/hpricot/hpricot is the Hpricot wiki and
+  http://github.com/hpricot/hpricot/issues is the bug tracker.
   Go there for news and recipes and patches.  It's the center of activity.
-* http://code.whytheluckystiff.net/svn/hpricot/trunk is the main Subversion
+* http://github.com/hpricot/hpricot is the main Git
   repository for Hpricot.  You can get the latest code there.
-* http://code.whytheluckystiff.net/doc/hpricot is the home for the latest copy of
-  this reference.
 * See COPYING for the terms of this software. (Spoiler: it's absolutely free.)
 
 If you have any trouble, don't hesitate to contact the author.  As always, I'm
@@ -46,24 +45,16 @@
 
 == Installing Hpricot
 
-You may get the latest stable version from Rubyforge. Win32 binaries and source 
-gems are available.
+You may get the latest stable version from Rubyforge. Win32 binaries,
+Java binaries (for JRuby), and source gems are available.
 
   $ gem install hpricot
 
-As Hpricot is still under active development, you can also try the most recent 
-candidate build here:
-
-  $ gem install hpricot --source http://code.whytheluckystiff.net
-
-The development gem is usually in pretty good shape actually.  You can also
-get the bleeding edge code or plain Ruby tarballs on the wiki.
-
 == An Hpricot Showcase
 
 We're going to run through a big pile of examples to get you jump-started.
 Many of these examples are also found at
-http://code.whytheluckystiff.net/hpricot/wiki/HpricotBasics, in case you
+http://wiki.github.com/hpricot/hpricot/hpricot-basics, in case you
 want to add some of your own.
 
 === Loading Hpricot Itself
diff -Nru /tmp/aPeI5X1Iz5/libhpricot-ruby-0.8/setup.rb /tmp/kCvPnLCzlr/libhpricot-ruby-0.8.2/setup.rb
--- libhpricot-ruby-0.8/setup.rb	2009-03-24 19:43:02.000000000 +0000
+++ libhpricot-ruby-0.8.2/setup.rb	1970-01-01 01:00:00.000000000 +0100
@@ -1,1585 +0,0 @@
-#
-# setup.rb
-#
-# Copyright (c) 2000-2005 Minero Aoki
-#
-# This program is free software.
-# You can distribute/modify this program under the terms of
-# the GNU LGPL, Lesser General Public License version 2.1.
-#
-
-unless Enumerable.method_defined?(:map)   # Ruby 1.4.6
-  module Enumerable
-    alias map collect
-  end
-end
-
-unless File.respond_to?(:read)   # Ruby 1.6
-  def File.read(fname)
-    open(fname) {|f|
-      return f.read
-    }
-  end
-end
-
-unless Errno.const_defined?(:ENOTEMPTY)   # Windows?
-  module Errno
-    class ENOTEMPTY
-      # We do not raise this exception, implementation is not needed.
-    end
-  end
-end
-
-def File.binread(fname)
-  open(fname, 'rb') {|f|
-    return f.read
-  }
-end
-
-# for corrupted Windows' stat(2)
-def File.dir?(path)
-  File.directory?((path[-1,1] == '/') ? path : path + '/')
-end
-
-
-class ConfigTable
-
-  include Enumerable
-
-  def initialize(rbconfig)
-    @rbconfig = rbconfig
-    @items = []
-    @table = {}
-    # options
-    @install_prefix = nil
-    @config_opt = nil
-    @verbose = true
-    @no_harm = false
-  end
-
-  attr_accessor :install_prefix
-  attr_accessor :config_opt
-
-  attr_writer :verbose
-
-  def verbose?
-    @verbose
-  end
-
-  attr_writer :no_harm
-
-  def no_harm?
-    @no_harm
-  end
-
-  def [](key)
-    lookup(key).resolve(self)
-  end
-
-  def []=(key, val)
-    lookup(key).set val
-  end
-
-  def names
-    @items.map {|i| i.name }
-  end
-
-  def each(&block)
-    @items.each(&block)
-  end
-
-  def key?(name)
-    @table.key?(name)
-  end
-
-  def lookup(name)
-    @table[name] or setup_rb_error "no such config item: #{name}"
-  end
-
-  def add(item)
-    @items.push item
-    @table[item.name] = item
-  end
-
-  def remove(name)
-    item = lookup(name)
-    @items.delete_if {|i| i.name == name }
-    @table.delete_if {|name, i| i.name == name }
-    item
-  end
-
-  def load_script(path, inst = nil)
-    if File.file?(path)
-      MetaConfigEnvironment.new(self, inst).instance_eval File.read(path), path
-    end
-  end
-
-  def savefile
-    '.config'
-  end
-
-  def load_savefile
-    begin
-      File.foreach(savefile()) do |line|
-        k, v = *line.split(/=/, 2)
-        self[k] = v.strip
-      end
-    rescue Errno::ENOENT
-      setup_rb_error $!.message + "\n#{File.basename($0)} config first"
-    end
-  end
-
-  def save
-    @items.each {|i| i.value }
-    File.open(savefile(), 'w') {|f|
-      @items.each do |i|
-        f.printf "%s=%s\n", i.name, i.value if i.value? and i.value
-      end
-    }
-  end
-
-  def load_standard_entries
-    standard_entries(@rbconfig).each do |ent|
-      add ent
-    end
-  end
-
-  def standard_entries(rbconfig)
-    c = rbconfig
-
-    rubypath = File.join(c['bindir'], c['ruby_install_name'] + c['EXEEXT'])
-
-    major = c['MAJOR'].to_i
-    minor = c['MINOR'].to_i
-    teeny = c['TEENY'].to_i
-    version = "#{major}.#{minor}"
-
-    # ruby ver. >= 1.4.4?
-    newpath_p = ((major >= 2) or
-                 ((major == 1) and
-                  ((minor >= 5) or
-                   ((minor == 4) and (teeny >= 4)))))
-
-    if c['rubylibdir']
-      # V > 1.6.3
-      libruby         = "#{c['prefix']}/lib/ruby"
-      librubyver      = c['rubylibdir']
-      librubyverarch  = c['archdir']
-      siteruby        = c['sitedir']
-      siterubyver     = c['sitelibdir']
-      siterubyverarch = c['sitearchdir']
-    elsif newpath_p
-      # 1.4.4 <= V <= 1.6.3
-      libruby         = "#{c['prefix']}/lib/ruby"
-      librubyver      = "#{c['prefix']}/lib/ruby/#{version}"
-      librubyverarch  = "#{c['prefix']}/lib/ruby/#{version}/#{c['arch']}"
-      siteruby        = c['sitedir']
-      siterubyver     = "$siteruby/#{version}"
-      siterubyverarch = "$siterubyver/#{c['arch']}"
-    else
-      # V < 1.4.4
-      libruby         = "#{c['prefix']}/lib/ruby"
-      librubyver      = "#{c['prefix']}/lib/ruby/#{version}"
-      librubyverarch  = "#{c['prefix']}/lib/ruby/#{version}/#{c['arch']}"
-      siteruby        = "#{c['prefix']}/lib/ruby/#{version}/site_ruby"
-      siterubyver     = siteruby
-      siterubyverarch = "$siterubyver/#{c['arch']}"
-    end
-    parameterize = lambda {|path|
-      path.sub(/\A#{Regexp.quote(c['prefix'])}/, '$prefix')
-    }
-
-    if arg = c['configure_args'].split.detect {|arg| /--with-make-prog=/ =~ arg }
-      makeprog = arg.sub(/'/, '').split(/=/, 2)[1]
-    else
-      makeprog = 'make'
-    end
-
-    [
-      ExecItem.new('installdirs', 'std/site/home',
-                   'std: install under libruby; site: install under site_ruby; home: install under $HOME')\
-          {|val, table|
-            case val
-            when 'std'
-              table['rbdir'] = '$librubyver'
-              table['sodir'] = '$librubyverarch'
-            when 'site'
-              table['rbdir'] = '$siterubyver'
-              table['sodir'] = '$siterubyverarch'
-            when 'home'
-              setup_rb_error '$HOME was not set' unless ENV['HOME']
-              table['prefix'] = ENV['HOME']
-              table['rbdir'] = '$libdir/ruby'
-              table['sodir'] = '$libdir/ruby'
-            end
-          },
-      PathItem.new('prefix', 'path', c['prefix'],
-                   'path prefix of target environment'),
-      PathItem.new('bindir', 'path', parameterize.call(c['bindir']),
-                   'the directory for commands'),
-      PathItem.new('libdir', 'path', parameterize.call(c['libdir']),
-                   'the directory for libraries'),
-      PathItem.new('datadir', 'path', parameterize.call(c['datadir']),
-                   'the directory for shared data'),
-      PathItem.new('mandir', 'path', parameterize.call(c['mandir']),
-                   'the directory for man pages'),
-      PathItem.new('sysconfdir', 'path', parameterize.call(c['sysconfdir']),
-                   'the directory for system configuration files'),
-      PathItem.new('localstatedir', 'path', parameterize.call(c['localstatedir']),
-                   'the directory for local state data'),
-      PathItem.new('libruby', 'path', libruby,
-                   'the directory for ruby libraries'),
-      PathItem.new('librubyver', 'path', librubyver,
-                   'the directory for standard ruby libraries'),
-      PathItem.new('librubyverarch', 'path', librubyverarch,
-                   'the directory for standard ruby extensions'),
-      PathItem.new('siteruby', 'path', siteruby,
-          'the directory for version-independent aux ruby libraries'),
-      PathItem.new('siterubyver', 'path', siterubyver,
-                   'the directory for aux ruby libraries'),
-      PathItem.new('siterubyverarch', 'path', siterubyverarch,
-                   'the directory for aux ruby binaries'),
-      PathItem.new('rbdir', 'path', '$siterubyver',
-                   'the directory for ruby scripts'),
-      PathItem.new('sodir', 'path', '$siterubyverarch',
-                   'the directory for ruby extentions'),
-      PathItem.new('rubypath', 'path', rubypath,
-                   'the path to set to #! line'),
-      ProgramItem.new('rubyprog', 'name', rubypath,
-                      'the ruby program using for installation'),
-      ProgramItem.new('makeprog', 'name', makeprog,
-                      'the make program to compile ruby extentions'),
-      SelectItem.new('shebang', 'all/ruby/never', 'ruby',
-                     'shebang line (#!) editing mode'),
-      BoolItem.new('without-ext', 'yes/no', 'no',
-                   'does not compile/install ruby extentions')
-    ]
-  end
-  private :standard_entries
-
-  def load_multipackage_entries
-    multipackage_entries().each do |ent|
-      add ent
-    end
-  end
-
-  def multipackage_entries
-    [
-      PackageSelectionItem.new('with', 'name,name...', '', 'ALL',
-                               'package names that you want to install'),
-      PackageSelectionItem.new('without', 'name,name...', '', 'NONE',
-                               'package names that you do not want to install')
-    ]
-  end
-  private :multipackage_entries
-
-  ALIASES = {
-    'std-ruby'         => 'librubyver',
-    'stdruby'          => 'librubyver',
-    'rubylibdir'       => 'librubyver',
-    'archdir'          => 'librubyverarch',
-    'site-ruby-common' => 'siteruby',     # For backward compatibility
-    'site-ruby'        => 'siterubyver',  # For backward compatibility
-    'bin-dir'          => 'bindir',
-    'bin-dir'          => 'bindir',
-    'rb-dir'           => 'rbdir',
-    'so-dir'           => 'sodir',
-    'data-dir'         => 'datadir',
-    'ruby-path'        => 'rubypath',
-    'ruby-prog'        => 'rubyprog',
-    'ruby'             => 'rubyprog',
-    'make-prog'        => 'makeprog',
-    'make'             => 'makeprog'
-  }
-
-  def fixup
-    ALIASES.each do |ali, name|
-      @table[ali] = @table[name]
-    end
-    @items.freeze
-    @table.freeze
-    @options_re = /\A--(#{@table.keys.join('|')})(?:=(.*))?\z/
-  end
-
-  def parse_opt(opt)
-    m = @options_re.match(opt) or setup_rb_error "config: unknown option #{opt}"
-    m.to_a[1,2]
-  end
-
-  def dllext
-    @rbconfig['DLEXT']
-  end
-
-  def value_config?(name)
-    lookup(name).value?
-  end
-
-  class Item
-    def initialize(name, template, default, desc)
-      @name = name.freeze
-      @template = template
-      @value = default
-      @default = default
-      @description = desc
-    end
-
-    attr_reader :name
-    attr_reader :description
-
-    attr_accessor :default
-    alias help_default default
-
-    def help_opt
-      "--#{@name}=#{@template}"
-    end
-
-    def value?
-      true
-    end
-
-    def value
-      @value
-    end
-
-    def resolve(table)
-      @value.gsub(%r<\$([^/]+)>) { table[$1] }
-    end
-
-    def set(val)
-      @value = check(val)
-    end
-
-    private
-
-    def check(val)
-      setup_rb_error "config: --#{name} requires argument" unless val
-      val
-    end
-  end
-
-  class BoolItem < Item
-    def config_type
-      'bool'
-    end
-
-    def help_opt
-      "--#{@name}"
-    end
-
-    private
-
-    def check(val)
-      return 'yes' unless val
-      case val
-      when /\Ay(es)?\z/i, /\At(rue)?\z/i then 'yes'
-      when /\An(o)?\z/i, /\Af(alse)\z/i  then 'no'
-      else
-        setup_rb_error "config: --#{@name} accepts only yes/no for argument"
-      end
-    end
-  end
-
-  class PathItem < Item
-    def config_type
-      'path'
-    end
-
-    private
-
-    def check(path)
-      setup_rb_error "config: --#{@name} requires argument"  unless path
-      path[0,1] == '$' ? path : File.expand_path(path)
-    end
-  end
-
-  class ProgramItem < Item
-    def config_type
-      'program'
-    end
-  end
-
-  class SelectItem < Item
-    def initialize(name, selection, default, desc)
-      super
-      @ok = selection.split('/')
-    end
-
-    def config_type
-      'select'
-    end
-
-    private
-
-    def check(val)
-      unless @ok.include?(val.strip)
-        setup_rb_error "config: use --#{@name}=#{@template} (#{val})"
-      end
-      val.strip
-    end
-  end
-
-  class ExecItem < Item
-    def initialize(name, selection, desc, &block)
-      super name, selection, nil, desc
-      @ok = selection.split('/')
-      @action = block
-    end
-
-    def config_type
-      'exec'
-    end
-
-    def value?
-      false
-    end
-
-    def resolve(table)
-      setup_rb_error "$#{name()} wrongly used as option value"
-    end
-
-    undef set
-
-    def evaluate(val, table)
-      v = val.strip.downcase
-      unless @ok.include?(v)
-        setup_rb_error "invalid option --#{@name}=#{val} (use #{@template})"
-      end
-      @action.call v, table
-    end
-  end
-
-  class PackageSelectionItem < Item
-    def initialize(name, template, default, help_default, desc)
-      super name, template, default, desc
-      @help_default = help_default
-    end
-
-    attr_reader :help_default
-
-    def config_type
-      'package'
-    end
-
-    private
-
-    def check(val)
-      unless File.dir?("packages/#{val}")
-        setup_rb_error "config: no such package: #{val}"
-      end
-      val
-    end
-  end
-
-  class MetaConfigEnvironment
-    def initialize(config, installer)
-      @config = config
-      @installer = installer
-    end
-
-    def config_names
-      @config.names
-    end
-
-    def config?(name)
-      @config.key?(name)
-    end
-
-    def bool_config?(name)
-      @config.lookup(name).config_type == 'bool'
-    end
-
-    def path_config?(name)
-      @config.lookup(name).config_type == 'path'
-    end
-
-    def value_config?(name)
-      @config.lookup(name).config_type != 'exec'
-    end
-
-    def add_config(item)
-      @config.add item
-    end
-
-    def add_bool_config(name, default, desc)
-      @config.add BoolItem.new(name, 'yes/no', default ? 'yes' : 'no', desc)
-    end
-
-    def add_path_config(name, default, desc)
-      @config.add PathItem.new(name, 'path', default, desc)
-    end
-
-    def set_config_default(name, default)
-      @config.lookup(name).default = default
-    end
-
-    def remove_config(name)
-      @config.remove(name)
-    end
-
-    # For only multipackage
-    def packages
-      raise '[setup.rb fatal] multi-package metaconfig API packages() called for single-package; contact application package vendor' unless @installer
-      @installer.packages
-    end
-
-    # For only multipackage
-    def declare_packages(list)
-      raise '[setup.rb fatal] multi-package metaconfig API declare_packages() called for single-package; contact application package vendor' unless @installer
-      @installer.packages = list
-    end
-  end
-
-end   # class ConfigTable
-
-
-# This module requires: #verbose?, #no_harm?
-module FileOperations
-
-  def mkdir_p(dirname, prefix = nil)
-    dirname = prefix + File.expand_path(dirname) if prefix
-    $stderr.puts "mkdir -p #{dirname}" if verbose?
-    return if no_harm?
-
-    # Does not check '/', it's too abnormal.
-    dirs = File.expand_path(dirname).split(%r<(?=/)>)
-    if /\A[a-z]:\z/i =~ dirs[0]
-      disk = dirs.shift
-      dirs[0] = disk + dirs[0]
-    end
-    dirs.each_index do |idx|
-      path = dirs[0..idx].join('')
-      Dir.mkdir path unless File.dir?(path)
-    end
-  end
-
-  def rm_f(path)
-    $stderr.puts "rm -f #{path}" if verbose?
-    return if no_harm?
-    force_remove_file path
-  end
-
-  def rm_rf(path)
-    $stderr.puts "rm -rf #{path}" if verbose?
-    return if no_harm?
-    remove_tree path
-  end
-
-  def remove_tree(path)
-    if File.symlink?(path)
-      remove_file path
-    elsif File.dir?(path)
-      remove_tree0 path
-    else
-      force_remove_file path
-    end
-  end
-
-  def remove_tree0(path)
-    Dir.foreach(path) do |ent|
-      next if ent == '.'
-      next if ent == '..'
-      entpath = "#{path}/#{ent}"
-      if File.symlink?(entpath)
-        remove_file entpath
-      elsif File.dir?(entpath)
-        remove_tree0 entpath
-      else
-        force_remove_file entpath
-      end
-    end
-    begin
-      Dir.rmdir path
-    rescue Errno::ENOTEMPTY
-      # directory may not be empty
-    end
-  end
-
-  def move_file(src, dest)
-    force_remove_file dest
-    begin
-      File.rename src, dest
-    rescue
-      File.open(dest, 'wb') {|f|
-        f.write File.binread(src)
-      }
-      File.chmod File.stat(src).mode, dest
-      File.unlink src
-    end
-  end
-
-  def force_remove_file(path)
-    begin
-      remove_file path
-    rescue
-    end
-  end
-
-  def remove_file(path)
-    File.chmod 0777, path
-    File.unlink path
-  end
-
-  def install(from, dest, mode, prefix = nil)
-    $stderr.puts "install #{from} #{dest}" if verbose?
-    return if no_harm?
-
-    realdest = prefix ? prefix + File.expand_path(dest) : dest
-    realdest = File.join(realdest, File.basename(from)) if File.dir?(realdest)
-    str = File.binread(from)
-    if diff?(str, realdest)
-      verbose_off {
-        rm_f realdest if File.exist?(realdest)
-      }
-      File.open(realdest, 'wb') {|f|
-        f.write str
-      }
-      File.chmod mode, realdest
-
-      File.open("#{objdir_root()}/InstalledFiles", 'a') {|f|
-        if prefix
-          f.puts realdest.sub(prefix, '')
-        else
-          f.puts realdest
-        end
-      }
-    end
-  end
-
-  def diff?(new_content, path)
-    return true unless File.exist?(path)
-    new_content != File.binread(path)
-  end
-
-  def command(*args)
-    $stderr.puts args.join(' ') if verbose?
-    system(*args) or raise RuntimeError,
-        "system(#{args.map{|a| a.inspect }.join(' ')}) failed"
-  end
-
-  def ruby(*args)
-    command config('rubyprog'), *args
-  end
-  
-  def make(task = nil)
-    command(*[config('makeprog'), task].compact)
-  end
-
-  def extdir?(dir)
-    File.exist?("#{dir}/MANIFEST") or File.exist?("#{dir}/extconf.rb")
-  end
-
-  def files_of(dir)
-    Dir.open(dir) {|d|
-      return d.select {|ent| File.file?("#{dir}/#{ent}") }
-    }
-  end
-
-  DIR_REJECT = %w( . .. CVS SCCS RCS CVS.adm .svn )
-
-  def directories_of(dir)
-    Dir.open(dir) {|d|
-      return d.select {|ent| File.dir?("#{dir}/#{ent}") } - DIR_REJECT
-    }
-  end
-
-end
-
-
-# This module requires: #srcdir_root, #objdir_root, #relpath
-module HookScriptAPI
-
-  def get_config(key)
-    @config[key]
-  end
-
-  alias config get_config
-
-  # obsolete: use metaconfig to change configuration
-  def set_config(key, val)
-    @config[key] = val
-  end
-
-  #
-  # srcdir/objdir (works only in the package directory)
-  #
-
-  def curr_srcdir
-    "#{srcdir_root()}/#{relpath()}"
-  end
-
-  def curr_objdir
-    "#{objdir_root()}/#{relpath()}"
-  end
-
-  def srcfile(path)
-    "#{curr_srcdir()}/#{path}"
-  end
-
-  def srcexist?(path)
-    File.exist?(srcfile(path))
-  end
-
-  def srcdirectory?(path)
-    File.dir?(srcfile(path))
-  end
-  
-  def srcfile?(path)
-    File.file?(srcfile(path))
-  end
-
-  def srcentries(path = '.')
-    Dir.open("#{curr_srcdir()}/#{path}") {|d|
-      return d.to_a - %w(. ..)
-    }
-  end
-
-  def srcfiles(path = '.')
-    srcentries(path).select {|fname|
-      File.file?(File.join(curr_srcdir(), path, fname))
-    }
-  end
-
-  def srcdirectories(path = '.')
-    srcentries(path).select {|fname|
-      File.dir?(File.join(curr_srcdir(), path, fname))
-    }
-  end
-
-end
-
-
-class ToplevelInstaller
-
-  Version   = '3.4.1'
-  Copyright = 'Copyright (c) 2000-2005 Minero Aoki'
-
-  TASKS = [
-    [ 'all',      'do config, setup, then install' ],
-    [ 'config',   'saves your configurations' ],
-    [ 'show',     'shows current configuration' ],
-    [ 'setup',    'compiles ruby extentions and others' ],
-    [ 'install',  'installs files' ],
-    [ 'test',     'run all tests in test/' ],
-    [ 'clean',    "does `make clean' for each extention" ],
-    [ 'distclean',"does `make distclean' for each extention" ]
-  ]
-
-  def ToplevelInstaller.invoke
-    config = ConfigTable.new(load_rbconfig())
-    config.load_standard_entries
-    config.load_multipackage_entries if multipackage?
-    config.fixup
-    klass = (multipackage?() ? ToplevelInstallerMulti : ToplevelInstaller)
-    klass.new(File.dirname($0), config).invoke
-  end
-
-  def ToplevelInstaller.multipackage?
-    File.dir?(File.dirname($0) + '/packages')
-  end
-
-  def ToplevelInstaller.load_rbconfig
-    if arg = ARGV.detect {|arg| /\A--rbconfig=/ =~ arg }
-      ARGV.delete(arg)
-      load File.expand_path(arg.split(/=/, 2)[1])
-      $".push 'rbconfig.rb'
-    else
-      require 'rbconfig'
-    end
-    ::Config::CONFIG
-  end
-
-  def initialize(ardir_root, config)
-    @ardir = File.expand_path(ardir_root)
-    @config = config
-    # cache
-    @valid_task_re = nil
-  end
-
-  def config(key)
-    @config[key]
-  end
-
-  def inspect
-    "#<#{self.class} #{__id__()}>"
-  end
-
-  def invoke
-    run_metaconfigs
-    case task = parsearg_global()
-    when nil, 'all'
-      parsearg_config
-      init_installers
-      exec_config
-      exec_setup
-      exec_install
-    else
-      case task
-      when 'config', 'test'
-        ;
-      when 'clean', 'distclean'
-        @config.load_savefile if File.exist?(@config.savefile)
-      else
-        @config.load_savefile
-      end
-      __send__ "parsearg_#{task}"
-      init_installers
-      __send__ "exec_#{task}"
-    end
-  end
-  
-  def run_metaconfigs
-    @config.load_script "#{@ardir}/metaconfig"
-  end
-
-  def init_installers
-    @installer = Installer.new(@config, @ardir, File.expand_path('.'))
-  end
-
-  #
-  # Hook Script API bases
-  #
-
-  def srcdir_root
-    @ardir
-  end
-
-  def objdir_root
-    '.'
-  end
-
-  def relpath
-    '.'
-  end
-
-  #
-  # Option Parsing
-  #
-
-  def parsearg_global
-    while arg = ARGV.shift
-      case arg
-      when /\A\w+\z/
-        setup_rb_error "invalid task: #{arg}" unless valid_task?(arg)
-        return arg
-      when '-q', '--quiet'
-        @config.verbose = false
-      when '--verbose'
-        @config.verbose = true
-      when '--help'
-        print_usage $stdout
-        exit 0
-      when '--version'
-        puts "#{File.basename($0)} version #{Version}"
-        exit 0
-      when '--copyright'
-        puts Copyright
-        exit 0
-      else
-        setup_rb_error "unknown global option '#{arg}'"
-      end
-    end
-    nil
-  end
-
-  def valid_task?(t)
-    valid_task_re() =~ t
-  end
-
-  def valid_task_re
-    @valid_task_re ||= /\A(?:#{TASKS.map {|task,desc| task }.join('|')})\z/
-  end
-
-  def parsearg_no_options
-    unless ARGV.empty?
-      task = caller(0).first.slice(%r<`parsearg_(\w+)'>, 1)
-      setup_rb_error "#{task}: unknown options: #{ARGV.join(' ')}"
-    end
-  end
-
-  alias parsearg_show       parsearg_no_options
-  alias parsearg_setup      parsearg_no_options
-  alias parsearg_test       parsearg_no_options
-  alias parsearg_clean      parsearg_no_options
-  alias parsearg_distclean  parsearg_no_options
-
-  def parsearg_config
-    evalopt = []
-    set = []
-    @config.config_opt = []
-    while i = ARGV.shift
-      if /\A--?\z/ =~ i
-        @config.config_opt = ARGV.dup
-        break
-      end
-      name, value = *@config.parse_opt(i)
-      if @config.value_config?(name)
-        @config[name] = value
-      else
-        evalopt.push [name, value]
-      end
-      set.push name
-    end
-    evalopt.each do |name, value|
-      @config.lookup(name).evaluate value, @config
-    end
-    # Check if configuration is valid
-    set.each do |n|
-      @config[n] if @config.value_config?(n)
-    end
-  end
-
-  def parsearg_install
-    @config.no_harm = false
-    @config.install_prefix = ''
-    while a = ARGV.shift
-      case a
-      when '--no-harm'
-        @config.no_harm = true
-      when /\A--prefix=/
-        path = a.split(/=/, 2)[1]
-        path = File.expand_path(path) unless path[0,1] == '/'
-        @config.install_prefix = path
-      else
-        setup_rb_error "install: unknown option #{a}"
-      end
-    end
-  end
-
-  def print_usage(out)
-    out.puts 'Typical Installation Procedure:'
-    out.puts "  $ ruby #{File.basename $0} config"
-    out.puts "  $ ruby #{File.basename $0} setup"
-    out.puts "  # ruby #{File.basename $0} install (may require root privilege)"
-    out.puts
-    out.puts 'Detailed Usage:'
-    out.puts "  ruby #{File.basename $0} <global option>"
-    out.puts "  ruby #{File.basename $0} [<global options>] <task> [<task options>]"
-
-    fmt = "  %-24s %s\n"
-    out.puts
-    out.puts 'Global options:'
-    out.printf fmt, '-q,--quiet',   'suppress message outputs'
-    out.printf fmt, '   --verbose', 'output messages verbosely'
-    out.printf fmt, '   --help',    'print this message'
-    out.printf fmt, '   --version', 'print version and quit'
-    out.printf fmt, '   --copyright',  'print copyright and quit'
-    out.puts
-    out.puts 'Tasks:'
-    TASKS.each do |name, desc|
-      out.printf fmt, name, desc
-    end
-
-    fmt = "  %-24s %s [%s]\n"
-    out.puts
-    out.puts 'Options for CONFIG or ALL:'
-    @config.each do |item|
-      out.printf fmt, item.help_opt, item.description, item.help_default
-    end
-    out.printf fmt, '--rbconfig=path', 'rbconfig.rb to load',"running ruby's"
-    out.puts
-    out.puts 'Options for INSTALL:'
-    out.printf fmt, '--no-harm', 'only display what to do if given', 'off'
-    out.printf fmt, '--prefix=path',  'install path prefix', ''
-    out.puts
-  end
-
-  #
-  # Task Handlers
-  #
-
-  def exec_config
-    @installer.exec_config
-    @config.save   # must be final
-  end
-
-  def exec_setup
-    @installer.exec_setup
-  end
-
-  def exec_install
-    @installer.exec_install
-  end
-
-  def exec_test
-    @installer.exec_test
-  end
-
-  def exec_show
-    @config.each do |i|
-      printf "%-20s %s\n", i.name, i.value if i.value?
-    end
-  end
-
-  def exec_clean
-    @installer.exec_clean
-  end
-
-  def exec_distclean
-    @installer.exec_distclean
-  end
-
-end   # class ToplevelInstaller
-
-
-class ToplevelInstallerMulti < ToplevelInstaller
-
-  include FileOperations
-
-  def initialize(ardir_root, config)
-    super
-    @packages = directories_of("#{@ardir}/packages")
-    raise 'no package exists' if @packages.empty?
-    @root_installer = Installer.new(@config, @ardir, File.expand_path('.'))
-  end
-
-  def run_metaconfigs
-    @config.load_script "#{@ardir}/metaconfig", self
-    @packages.each do |name|
-      @config.load_script "#{@ardir}/packages/#{name}/metaconfig"
-    end
-  end
-
-  attr_reader :packages
-
-  def packages=(list)
-    raise 'package list is empty' if list.empty?
-    list.each do |name|
-      raise "directory packages/#{name} does not exist"\
-              unless File.dir?("#{@ardir}/packages/#{name}")
-    end
-    @packages = list
-  end
-
-  def init_installers
-    @installers = {}
-    @packages.each do |pack|
-      @installers[pack] = Installer.new(@config,
-                                       "#{@ardir}/packages/#{pack}",
-                                       "packages/#{pack}")
-    end
-    with    = extract_selection(config('with'))
-    without = extract_selection(config('without'))
-    @selected = @installers.keys.select {|name|
-                  (with.empty? or with.include?(name)) \
-                      and not without.include?(name)
-                }
-  end
-
-  def extract_selection(list)
-    a = list.split(/,/)
-    a.each do |name|
-      setup_rb_error "no such package: #{name}"  unless @installers.key?(name)
-    end
-    a
-  end
-
-  def print_usage(f)
-    super
-    f.puts 'Inluded packages:'
-    f.puts '  ' + @packages.sort.join(' ')
-    f.puts
-  end
-
-  #
-  # Task Handlers
-  #
-
-  def exec_config
-    run_hook 'pre-config'
-    each_selected_installers {|inst| inst.exec_config }
-    run_hook 'post-config'
-    @config.save   # must be final
-  end
-
-  def exec_setup
-    run_hook 'pre-setup'
-    each_selected_installers {|inst| inst.exec_setup }
-    run_hook 'post-setup'
-  end
-
-  def exec_install
-    run_hook 'pre-install'
-    each_selected_installers {|inst| inst.exec_install }
-    run_hook 'post-install'
-  end
-
-  def exec_test
-    run_hook 'pre-test'
-    each_selected_installers {|inst| inst.exec_test }
-    run_hook 'post-test'
-  end
-
-  def exec_clean
-    rm_f @config.savefile
-    run_hook 'pre-clean'
-    each_selected_installers {|inst| inst.exec_clean }
-    run_hook 'post-clean'
-  end
-
-  def exec_distclean
-    rm_f @config.savefile
-    run_hook 'pre-distclean'
-    each_selected_installers {|inst| inst.exec_distclean }
-    run_hook 'post-distclean'
-  end
-
-  #
-  # lib
-  #
-
-  def each_selected_installers
-    Dir.mkdir 'packages' unless File.dir?('packages')
-    @selected.each do |pack|
-      $stderr.puts "Processing the package `#{pack}' ..." if verbose?
-      Dir.mkdir "packages/#{pack}" unless File.dir?("packages/#{pack}")
-      Dir.chdir "packages/#{pack}"
-      yield @installers[pack]
-      Dir.chdir '../..'
-    end
-  end
-
-  def run_hook(id)
-    @root_installer.run_hook id
-  end
-
-  # module FileOperations requires this
-  def verbose?
-    @config.verbose?
-  end
-
-  # module FileOperations requires this
-  def no_harm?
-    @config.no_harm?
-  end
-
-end   # class ToplevelInstallerMulti
-
-
-class Installer
-
-  FILETYPES = %w( bin lib ext data conf man )
-
-  include FileOperations
-  include HookScriptAPI
-
-  def initialize(config, srcroot, objroot)
-    @config = config
-    @srcdir = File.expand_path(srcroot)
-    @objdir = File.expand_path(objroot)
-    @currdir = '.'
-  end
-
-  def inspect
-    "#<#{self.class} #{File.basename(@srcdir)}>"
-  end
-
-  def noop(rel)
-  end
-
-  #
-  # Hook Script API base methods
-  #
-
-  def srcdir_root
-    @srcdir
-  end
-
-  def objdir_root
-    @objdir
-  end
-
-  def relpath
-    @currdir
-  end
-
-  #
-  # Config Access
-  #
-
-  # module FileOperations requires this
-  def verbose?
-    @config.verbose?
-  end
-
-  # module FileOperations requires this
-  def no_harm?
-    @config.no_harm?
-  end
-
-  def verbose_off
-    begin
-      save, @config.verbose = @config.verbose?, false
-      yield
-    ensure
-      @config.verbose = save
-    end
-  end
-
-  #
-  # TASK config
-  #
-
-  def exec_config
-    exec_task_traverse 'config'
-  end
-
-  alias config_dir_bin noop
-  alias config_dir_lib noop
-
-  def config_dir_ext(rel)
-    extconf if extdir?(curr_srcdir())
-  end
-
-  alias config_dir_data noop
-  alias config_dir_conf noop
-  alias config_dir_man noop
-
-  def extconf
-    ruby "#{curr_srcdir()}/extconf.rb", *@config.config_opt
-  end
-
-  #
-  # TASK setup
-  #
-
-  def exec_setup
-    exec_task_traverse 'setup'
-  end
-
-  def setup_dir_bin(rel)
-    files_of(curr_srcdir()).each do |fname|
-      update_shebang_line "#{curr_srcdir()}/#{fname}"
-    end
-  end
-
-  alias setup_dir_lib noop
-
-  def setup_dir_ext(rel)
-    make if extdir?(curr_srcdir())
-  end
-
-  alias setup_dir_data noop
-  alias setup_dir_conf noop
-  alias setup_dir_man noop
-
-  def update_shebang_line(path)
-    return if no_harm?
-    return if config('shebang') == 'never'
-    old = Shebang.load(path)
-    if old
-      $stderr.puts "warning: #{path}: Shebang line includes too many args.  It is not portable and your program may not work." if old.args.size > 1
-      new = new_shebang(old)
-      return if new.to_s == old.to_s
-    else
-      return unless config('shebang') == 'all'
-      new = Shebang.new(config('rubypath'))
-    end
-    $stderr.puts "updating shebang: #{File.basename(path)}" if verbose?
-    open_atomic_writer(path) {|output|
-      File.open(path, 'rb') {|f|
-        f.gets if old   # discard
-        output.puts new.to_s
-        output.print f.read
-      }
-    }
-  end
-
-  def new_shebang(old)
-    if /\Aruby/ =~ File.basename(old.cmd)
-      Shebang.new(config('rubypath'), old.args)
-    elsif File.basename(old.cmd) == 'env' and old.args.first == 'ruby'
-      Shebang.new(config('rubypath'), old.args[1..-1])
-    else
-      return old unless config('shebang') == 'all'
-      Shebang.new(config('rubypath'))
-    end
-  end
-
-  def open_atomic_writer(path, &block)
-    tmpfile = File.basename(path) + '.tmp'
-    begin
-      File.open(tmpfile, 'wb', &block)
-      File.rename tmpfile, File.basename(path)
-    ensure
-      File.unlink tmpfile if File.exist?(tmpfile)
-    end
-  end
-
-  class Shebang
-    def Shebang.load(path)
-      line = nil
-      File.open(path) {|f|
-        line = f.gets
-      }
-      return nil unless /\A#!/ =~ line
-      parse(line)
-    end
-
-    def Shebang.parse(line)
-      cmd, *args = *line.strip.sub(/\A\#!/, '').split(' ')
-      new(cmd, args)
-    end
-
-    def initialize(cmd, args = [])
-      @cmd = cmd
-      @args = args
-    end
-
-    attr_reader :cmd
-    attr_reader :args
-
-    def to_s
-      "#! #{@cmd}" + (@args.empty? ? '' : " #{@args.join(' ')}")
-    end
-  end
-
-  #
-  # TASK install
-  #
-
-  def exec_install
-    rm_f 'InstalledFiles'
-    exec_task_traverse 'install'
-  end
-
-  def install_dir_bin(rel)
-    install_files targetfiles(), "#{config('bindir')}/#{rel}", 0755
-  end
-
-  def install_dir_lib(rel)
-    install_files libfiles(), "#{config('rbdir')}/#{rel}", 0644
-  end
-
-  def install_dir_ext(rel)
-    return unless extdir?(curr_srcdir())
-    install_files rubyextentions('.'),
-                  "#{config('sodir')}/#{File.dirname(rel)}",
-                  0555
-  end
-
-  def install_dir_data(rel)
-    install_files targetfiles(), "#{config('datadir')}/#{rel}", 0644
-  end
-
-  def install_dir_conf(rel)
-    # FIXME: should not remove current config files
-    # (rename previous file to .old/.org)
-    install_files targetfiles(), "#{config('sysconfdir')}/#{rel}", 0644
-  end
-
-  def install_dir_man(rel)
-    install_files targetfiles(), "#{config('mandir')}/#{rel}", 0644
-  end
-
-  def install_files(list, dest, mode)
-    mkdir_p dest, @config.install_prefix
-    list.each do |fname|
-      install fname, dest, mode, @config.install_prefix
-    end
-  end
-
-  def libfiles
-    glob_reject(%w(*.y *.output), targetfiles())
-  end
-
-  def rubyextentions(dir)
-    ents = glob_select("*.#{@config.dllext}", targetfiles())
-    if ents.empty?
-      setup_rb_error "no ruby extention exists: 'ruby #{$0} setup' first"
-    end
-    ents
-  end
-
-  def targetfiles
-    mapdir(existfiles() - hookfiles())
-  end
-
-  def mapdir(ents)
-    ents.map {|ent|
-      if File.exist?(ent)
-      then ent                         # objdir
-      else "#{curr_srcdir()}/#{ent}"   # srcdir
-      end
-    }
-  end
-
-  # picked up many entries from cvs-1.11.1/src/ignore.c
-  JUNK_FILES = %w( 
-    core RCSLOG tags TAGS .make.state
-    .nse_depinfo #* .#* cvslog.* ,* .del-* *.olb
-    *~ *.old *.bak *.BAK *.orig *.rej _$* *$
-
-    *.org *.in .*
-  )
-
-  def existfiles
-    glob_reject(JUNK_FILES, (files_of(curr_srcdir()) | files_of('.')))
-  end
-
-  def hookfiles
-    %w( pre-%s post-%s pre-%s.rb post-%s.rb ).map {|fmt|
-      %w( config setup install clean ).map {|t| sprintf(fmt, t) }
-    }.flatten
-  end
-
-  def glob_select(pat, ents)
-    re = globs2re([pat])
-    ents.select {|ent| re =~ ent }
-  end
-
-  def glob_reject(pats, ents)
-    re = globs2re(pats)
-    ents.reject {|ent| re =~ ent }
-  end
-
-  GLOB2REGEX = {
-    '.' => '\.',
-    '$' => '\$',
-    '#' => '\#',
-    '*' => '.*'
-  }
-
-  def globs2re(pats)
-    /\A(?:#{
-      pats.map {|pat| pat.gsub(/[\.\$\#\*]/) {|ch| GLOB2REGEX[ch] } }.join('|')
-    })\z/
-  end
-
-  #
-  # TASK test
-  #
-
-  TESTDIR = 'test'
-
-  def exec_test
-    unless File.directory?('test')
-      $stderr.puts 'no test in this package' if verbose?
-      return
-    end
-    $stderr.puts 'Running tests...' if verbose?
-    begin
-      require 'test/unit'
-    rescue LoadError
-      setup_rb_error 'test/unit cannot loaded.  You need Ruby 1.8 or later to invoke this task.'
-    end
-    runner = Test::Unit::AutoRunner.new(true)
-    runner.to_run << TESTDIR
-    runner.run
-  end
-
-  #
-  # TASK clean
-  #
-
-  def exec_clean
-    exec_task_traverse 'clean'
-    rm_f @config.savefile
-    rm_f 'InstalledFiles'
-  end
-
-  alias clean_dir_bin noop
-  alias clean_dir_lib noop
-  alias clean_dir_data noop
-  alias clean_dir_conf noop
-  alias clean_dir_man noop
-
-  def clean_dir_ext(rel)
-    return unless extdir?(curr_srcdir())
-    make 'clean' if File.file?('Makefile')
-  end
-
-  #
-  # TASK distclean
-  #
-
-  def exec_distclean
-    exec_task_traverse 'distclean'
-    rm_f @config.savefile
-    rm_f 'InstalledFiles'
-  end
-
-  alias distclean_dir_bin noop
-  alias distclean_dir_lib noop
-
-  def distclean_dir_ext(rel)
-    return unless extdir?(curr_srcdir())
-    make 'distclean' if File.file?('Makefile')
-  end
-
-  alias distclean_dir_data noop
-  alias distclean_dir_conf noop
-  alias distclean_dir_man noop
-
-  #
-  # Traversing
-  #
-
-  def exec_task_traverse(task)
-    run_hook "pre-#{task}"
-    FILETYPES.each do |type|
-      if type == 'ext' and config('without-ext') == 'yes'
-        $stderr.puts 'skipping ext/* by user option' if verbose?
-        next
-      end
-      traverse task, type, "#{task}_dir_#{type}"
-    end
-    run_hook "post-#{task}"
-  end
-
-  def traverse(task, rel, mid)
-    dive_into(rel) {
-      run_hook "pre-#{task}"
-      __send__ mid, rel.sub(%r[\A.*?(?:/|\z)], '')
-      directories_of(curr_srcdir()).each do |d|
-        traverse task, "#{rel}/#{d}", mid
-      end
-      run_hook "post-#{task}"
-    }
-  end
-
-  def dive_into(rel)
-    return unless File.dir?("#{@srcdir}/#{rel}")
-
-    dir = File.basename(rel)
-    Dir.mkdir dir unless File.dir?(dir)
-    prevdir = Dir.pwd
-    Dir.chdir dir
-    $stderr.puts '---> ' + rel if verbose?
-    @currdir = rel
-    yield
-    Dir.chdir prevdir
-    $stderr.puts '<--- ' + rel if verbose?
-    @currdir = File.dirname(rel)
-  end
-
-  def run_hook(id)
-    path = [ "#{curr_srcdir()}/#{id}",
-             "#{curr_srcdir()}/#{id}.rb" ].detect {|cand| File.file?(cand) }
-    return unless path
-    begin
-      instance_eval File.read(path), path, 1
-    rescue
-      raise if $DEBUG
-      setup_rb_error "hook #{path} failed:\n" + $!.message
-    end
-  end
-
-end   # class Installer
-
-
-class SetupError < StandardError; end
-
-def setup_rb_error(msg)
-  raise SetupError, msg
-end
-
-if $0 == __FILE__
-  begin
-    ToplevelInstaller.invoke
-  rescue SetupError
-    raise if $DEBUG
-    $stderr.puts $!.message
-    $stderr.puts "Try 'ruby #{$0} --help' for detailed usage."
-    exit 1
-  end
-end
diff -Nru /tmp/aPeI5X1Iz5/libhpricot-ruby-0.8/test/test_alter.rb /tmp/kCvPnLCzlr/libhpricot-ruby-0.8.2/test/test_alter.rb
--- libhpricot-ruby-0.8/test/test_alter.rb	2009-03-24 19:43:02.000000000 +0000
+++ libhpricot-ruby-0.8.2/test/test_alter.rb	2009-12-13 23:54:10.000000000 +0000
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 #!/usr/bin/env ruby
 
 require 'test/unit'
@@ -35,14 +36,22 @@
   end
   
   def test_change_attributes
-    all_ps = (@basic/"p").attr("title", "Some Title")
+    all_ps = (@basic/"p").attr("title", "Some Title & Etc…")
     all_as = (@basic/"a").attr("href", "http://my_new_href.com")
     all_lb = (@basic/"link").attr("href") { |e| e.name }
-    assert_changed(@basic, "p", all_ps) {|p| p.attributes["title"] == "Some Title"}
+    assert_changed(@basic, "p", all_ps) {|p| p.raw_attributes["title"] == "Some Title &amp; Etc&#8230;"}
     assert_changed(@basic, "a", all_as) {|a| a.attributes["href"] == "http://my_new_href.com"}
     assert_changed(@basic, "link", all_lb) {|a| a.attributes["href"] == "link" }
   end
   
+  def test_change_attributes2
+    all_as = (@basic%"a").attributes["href"] = "http://my_new_href.com"
+    all_ps = (@basic%"p").attributes["title"] = "Some Title & Etc…"
+    assert_equal (@basic%"a").raw_attributes["href"], "http://my_new_href.com"
+    assert_equal (@basic%"p").raw_attributes["title"], "Some Title &amp; Etc&#8230;"
+    assert_equal (@basic%"p").attributes["title"], "Some Title & Etc…"
+  end
+  
   def test_remove_attr
     all_rl = (@basic/"link").remove_attr("href")
     assert_changed(@basic, "link", all_rl) { |link| link['href'].nil? }
@@ -70,6 +79,16 @@
     assert_equal frag.to_s, "<b><i>A bit of HTML</i></b><beanPole>gravity</beanPole>"
   end
 
+  def test_reparent_empty_nodes
+    doc = Hpricot("<div/>")
+    doc.root.inner_html = "foo"
+    assert_equal doc.root.inner_html, "foo"
+    doc.root.inner_html = ""
+    assert_equal doc.root.inner_html, ""
+    doc.root.swap { b "test" }
+    assert_equal doc.root.inner_html, "test"
+  end
+
   def assert_changed original, selector, set, &block
     assert set.all?(&block)
     assert Hpricot(original.to_html).search(selector).all?(&block)
diff -Nru /tmp/aPeI5X1Iz5/libhpricot-ruby-0.8/test/test_parser.rb /tmp/kCvPnLCzlr/libhpricot-ruby-0.8.2/test/test_parser.rb
--- libhpricot-ruby-0.8/test/test_parser.rb	2009-03-24 19:43:02.000000000 +0000
+++ libhpricot-ruby-0.8.2/test/test_parser.rb	2009-12-13 23:54:10.000000000 +0000
@@ -227,6 +227,14 @@
     assert_kind_of Hpricot::Elements, @boingboing.search('//div/p').search('a img')
   end
 
+  def test_attr_casing
+    doc = Hpricot("<a HREF='a'>A simple <b>test</b> string.</a>")
+    assert_equal (doc % :a)[:href], "a"
+    assert_equal (doc % :a)[:HREF], nil
+    assert_equal (doc % :a)['href'], "a"
+    assert_equal (doc % :a)['HREF'], nil
+  end
+
   def test_class_search
     # test case sent by Chih-Chao Lam
     doc = Hpricot("<div class=xyz'>abc</div>")
diff -Nru /tmp/aPeI5X1Iz5/libhpricot-ruby-0.8/test/test_preserved.rb /tmp/kCvPnLCzlr/libhpricot-ruby-0.8.2/test/test_preserved.rb
--- libhpricot-ruby-0.8/test/test_preserved.rb	2009-03-24 19:43:02.000000000 +0000
+++ libhpricot-ruby-0.8.2/test/test_preserved.rb	2009-12-13 23:54:10.000000000 +0000
@@ -5,6 +5,15 @@
 require 'hpricot'
 require 'load_files'
 
+unless "".respond_to?(:lines)
+  require 'enumerator'
+  class String
+    def lines
+      Enumerable::Enumerator.new(self, :each_line)
+    end
+  end
+end
+
 class TestPreserved < Test::Unit::TestCase
   def assert_roundtrip str
     doc = Hpricot(str)
@@ -53,6 +62,15 @@
     assert_roundtrip TestFiles::CY0
   end
 
+  def test_fixup_link
+    doc = %{<?xml version="1.0" encoding="UTF-8"?><rss><channel><link>ht</link></channel></rss>}
+    assert_roundtrip doc
+    assert_equal Hpricot(doc).to_s,
+      %{<?xml version="1.0" encoding="UTF-8"?><rss><channel><link />ht</channel></rss>}
+    assert_equal Hpricot.XML(doc).to_s,
+      %{<?xml version="1.0" encoding="UTF-8"?><rss><channel><link>ht</link></channel></rss>}
+  end
+
   def test_escaping_of_attrs
     # ampersands in URLs
     str = %{<a href="http://google.com/search?q=hpricot&amp;l=en">Google</a>}