hpricot 0.8.4 → 0.8.5

data/CHANGELOG

@@ -1,3 +1,9 @@
+= 0.8.5
+=== 29 November 2011
+* Remove escaped quote (\') from matching (#55)
+* Fix 'undefined method downcase for nil:NilClass' on JRuby (#58)
+* Unescape hex numeric character references
+
 = 0.8.4
 === 28 February, 2011
 * GH #21, #32, #33, #36: Fix for reported segfaults
@@ -49,12 +55,12 @@
 * Hpricot for JRuby -- nice work Ola Bini!
 * Inline Markaby for Hpricot documents.
 * XML tags and attributes are no longer downcased like HTML is.
-* new syntax for grabbing everything between two elements using a Range in the search method: (doc/("font".."font/br")) or in nodes_at like so: (doc/"font").nodes_at("*".."br"). Only works with either a pair of siblings or a set of a parent and a sibling. 
+* new syntax for grabbing everything between two elements using a Range in the search method: (doc/("font".."font/br")) or in nodes_at like so: (doc/"font").nodes_at("*".."br"). Only works with either a pair of siblings or a set of a parent and a sibling.
 * Ignore self-closing endings on tags (such as form) which are containers. Treat them like open parent tags. Reported by Jonathan Nichols on the hpricot list.
 * Escaping of attributes, yanked from Jim Weirich and Sam Ruby's work in Builder.
 * Element#raw_attributes gives unescaped data.  Element#attributes gives escaped.
 * Added: Elements#attr, Elements#remove_attr, Elements#remove_class.
-* Added: Traverse#preceding, Traverse#following, Traverse#previous, Traverse#next. 
+* Added: Traverse#preceding, Traverse#following, Traverse#previous, Traverse#next.
 
 = 0.5
 === 31rd January, 2007
@@ -88,11 +94,11 @@
 
 * Fixed negative string size error on empty tokens. (news.bbc.co.uk)
 * Allow the parser to accept just text nodes. (such as: <tt>Hpricot.parse('TEXT')</tt>)
-* from JQuery to Hpricot::Elements: remove, empty, append, prepend, before, after, wrap, set, 
-  html(...), to_html, to_s. 
+* from JQuery to Hpricot::Elements: remove, empty, append, prepend, before, after, wrap, set,
+  html(...), to_html, to_s.
 * on containers: to_html, replace_child, insert_before, insert_after, innerHTML=.
 * Hpricot(...) is an alias for parse.
-* open up all properties to setters, let people do as they may. 
+* open up all properties to setters, let people do as they may.
 * use to_html for the full html of a node or set of elements.
 * doctypes were messed.
 

data/COPYING

@@ -6,13 +6,13 @@ deal in the Software without restriction, including without limitation the
 rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
 sell copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:
-  
+
 The above copyright notice and this permission notice shall be included in
 all copies or substantial portions of the Software.
-   
+
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER 
+THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -1,6 +1,8 @@
+require 'bundler/setup'
+ENV.delete('RUBYOPT')           # Don't propagate RUBYOPT/Bundler to subprocesses
 require 'rake/clean'
-require 'rake/gempackagetask'
-require 'rake/rdoctask'
+require 'rubygems/package_task'
+require 'rdoc/task'
 require 'rake/testtask'
 begin
   require 'rake/extensiontask'
@@ -54,6 +56,9 @@ SPEC =
     s.extensions = FileList["ext/**/extconf.rb"].to_a
     s.bindir = "bin"
   end
+# Dup the spec before any of its calculated ivars are set (e.g., #cache_file)
+Win32Spec = SPEC.dup
+JRubySpec = SPEC.dup
 
 # FAT cross-compile
 # Pass RUBY_CC_VERSION=1.8.7:1.9.2 when packaging for 1.8+1.9 mswin32 binaries
@@ -118,13 +123,12 @@ Rake::RDocTask.new do |rdoc|
     rdoc.rdoc_files.add ['README.md', 'CHANGELOG', 'COPYING', 'lib/**/*.rb']
 end
 
-Rake::GemPackageTask.new(SPEC) do |p|
+Gem::PackageTask.new(SPEC) do |p|
     p.need_tar = true
     p.gem_spec = SPEC
 end
 
 ### Win32 Packages ###
-Win32Spec = SPEC.dup
 Win32Spec.platform = 'i386-mswin32'
 Win32Spec.files = PKG_FILES + %w(hpricot_scan fast_xs).map do |t|
   unless ENV['RUBY_CC_VERSION']
@@ -136,17 +140,16 @@ Win32Spec.files = PKG_FILES + %w(hpricot_scan fast_xs).map do |t|
 end.flatten
 Win32Spec.extensions = []
 
-Rake::GemPackageTask.new(Win32Spec) do |p|
+Gem::PackageTask.new(Win32Spec) do |p|
   p.need_tar = false
   p.gem_spec = Win32Spec
 end
 
-JRubySpec = SPEC.dup
 JRubySpec.platform = 'java'
 JRubySpec.files = PKG_FILES + ["lib/hpricot_scan.jar", "lib/fast_xs.jar"]
 JRubySpec.extensions = []
 
-Rake::GemPackageTask.new(JRubySpec) do |p|
+Gem::PackageTask.new(JRubySpec) do |p|
   p.need_tar = false
   p.gem_spec = JRubySpec
 end

data/ext/fast_xs/FastXsService.java

@@ -41,9 +41,9 @@ public class FastXsService implements BasicLibraryService {
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -55,13 +55,13 @@ public class FastXsService implements BasicLibraryService {
  * <p>
  * Provides HTML and XML entity utilities.
  * </p>
- * 
+ *
  * @see <a href="http://hotwired.lycos.com/webmonkey/reference/special_characters/">ISO Entities</a>
  * @see <a href="http://www.w3.org/TR/REC-html32#latin1">HTML 3.2 Character Entities for ISO Latin-1</a>
  * @see <a href="http://www.w3.org/TR/REC-html40/sgml/entities.html">HTML 4.0 Character entity references</a>
  * @see <a href="http://www.w3.org/TR/html401/charset.html#h-5.3">HTML 4.01 Character References</a>
  * @see <a href="http://www.w3.org/TR/html401/charset.html#code-position">HTML 4.01 Code positions</a>
- * 
+ *
  * @author <a href="mailto:alex@purpletech.com">Alexander Day Chaffee</a>
  * @author <a href="mailto:ggregory@seagullsw.com">Gary Gregory</a>
  * @since 2.0
@@ -430,7 +430,7 @@ class Entities {
      * <p>
      * Fills the specified entities instance with HTML 40 entities.
      * </p>
-     * 
+     *
      * @param entities
      *            the instance to be filled.
      */
@@ -445,7 +445,7 @@ class Entities {
          * <p>
          * Add an entry to this entity map.
          * </p>
-         * 
+         *
          * @param name
          *            the entity name
          * @param value
@@ -457,7 +457,7 @@ class Entities {
          * <p>
          * Returns the name of the entity identified by the specified value.
          * </p>
-         * 
+         *
          * @param value
          *            the value to locate
          * @return entity name associated with the specified value
@@ -468,7 +468,7 @@ class Entities {
          * <p>
          * Returns the value of the entity identified by the specified name.
          * </p>
-         * 
+         *
          * @param name
          *            the name to locate
          * @return entity value associated with the specified name
@@ -484,15 +484,15 @@ class Entities {
 
 
         private int threshold;
- 
+
         private final float loadFactor;
- 
+
         private static class Entry {
             final int hash;
             final int key;
             Object value;
             Entry next;
- 
+
             protected Entry(int hash, int key, Object value, Entry next) {
                 this.hash = hash;
                 this.key = key;
@@ -500,7 +500,7 @@ class Entities {
                 this.next = next;
             }
         }
- 
+
         public IntHashMap() {
             this.loadFactor = 0.75f;
             table = new Entry[20];
@@ -518,22 +518,22 @@ class Entities {
             }
             return null;
         }
- 
+
         protected void rehash() {
             int oldCapacity = table.length;
             Entry oldMap[] = table;
- 
+
             int newCapacity = oldCapacity * 2 + 1;
             Entry newMap[] = new Entry[newCapacity];
- 
+
             threshold = (int) (newCapacity * loadFactor);
             table = newMap;
- 
+
             for (int i = oldCapacity; i-- > 0;) {
                 for (Entry old = oldMap[i]; old != null;) {
                     Entry e = old;
                     old = old.next;
- 
+
                     int index = (e.hash & 0x7FFFFFFF) % newCapacity;
                     e.next = newMap[index];
                     newMap[index] = e;
@@ -553,15 +553,15 @@ class Entities {
                     return old;
                 }
             }
- 
+
             if (count >= threshold) {
                 // Rehash the table if the threshold is exceeded
                 rehash();
- 
+
                 tab = table;
                 index = (hash & 0x7FFFFFFF) % tab.length;
             }
- 
+
             // Creates the new entry.
             Entry e = new Entry(hash, key, value, tab[index]);
             tab[index] = e;
@@ -673,7 +673,7 @@ class Entities {
          * <p>
          * Returns the lookup table for this entity map. The lookup table is created if it has not been previously.
          * </p>
-         * 
+         *
          * @return the lookup table
          */
         private String[] lookupTable() {
@@ -716,7 +716,7 @@ class Entities {
         /**
          * Constructs a new instance of <code>ArrayEntityMap</code> specifying the size by which the array should
          * grow.
-         * 
+         *
          * @param growBy
          *            array will be initialized to and will grow by this amount
          */
@@ -738,7 +738,7 @@ class Entities {
 
         /**
          * Verifies the capacity of the entity array, adjusting the size if necessary.
-         * 
+         *
          * @param capacity
          *            size the array should be
          */
@@ -791,7 +791,7 @@ class Entities {
         /**
          * Constructs a new instance of <code>ArrayEntityMap</code> specifying the size by which the underlying array
          * should grow.
-         * 
+         *
          * @param growBy
          *            array will be initialized to and will grow by this amount
          */
@@ -802,7 +802,7 @@ class Entities {
         /**
          * Performs a binary search of the entity array for the specified key. This method is based on code in
          * {@link java.util.Arrays}.
-         * 
+         *
          * @param key
          *            the key to be found
          * @return the index of the entity array matching the specified key
@@ -862,7 +862,7 @@ class Entities {
      * <p>
      * Adds entities to this entity.
      * </p>
-     * 
+     *
      * @param entityArray
      *            array of entities to be added
      */
@@ -876,7 +876,7 @@ class Entities {
      * <p>
      * Add an entity to this entity.
      * </p>
-     * 
+     *
      * @param name
      *            name of the entity
      * @param value
@@ -890,7 +890,7 @@ class Entities {
      * <p>
      * Returns the name of the entity identified by the specified value.
      * </p>
-     * 
+     *
      * @param value
      *            the value to locate
      * @return entity name associated with the specified value
@@ -903,7 +903,7 @@ class Entities {
      * <p>
      * Returns the value of the entity identified by the specified name.
      * </p>
-     * 
+     *
      * @param name
      *            the name to locate
      * @return entity value associated with the specified name
@@ -916,12 +916,12 @@ class Entities {
      * <p>
      * Escapes the characters in a <code>String</code>.
      * </p>
-     * 
+     *
      * <p>
      * For example, if you have called addEntity(&quot;foo&quot;, 0xA1), escape(&quot;\u00A1&quot;) will return
      * &quot;&amp;foo;&quot;
      * </p>
-     * 
+     *
      * @param str
      *            The <code>String</code> to escape.
      * @return A new escaped <code>String</code>.
@@ -943,7 +943,7 @@ class Entities {
      * Escapes the characters in the <code>String</code> passed and writes the result to the <code>Writer</code>
      * passed.
      * </p>
-     * 
+     *
      * @param writer
      *            The <code>Writer</code> to write the results of the escaping to. Assumed to be a non-null value.
      * @param str
@@ -951,7 +951,7 @@ class Entities {
      * @throws IOException
      *             when <code>Writer</code> passed throws the exception from calls to the {@link Writer#write(int)}
      *             methods.
-     * 
+     *
      * @see #escape(String)
      * @see Writer
      */
@@ -980,12 +980,12 @@ class Entities {
      * <p>
      * Unescapes the entities in a <code>String</code>.
      * </p>
-     * 
+     *
      * <p>
      * For example, if you have called addEntity(&quot;foo&quot;, 0xA1), unescape(&quot;&amp;foo;&quot;) will return
      * &quot;\u00A1&quot;
      * </p>
-     * 
+     *
      * @param str
      *            The <code>String</code> to escape.
      * @return A new escaped <code>String</code>.
@@ -999,7 +999,7 @@ class Entities {
             try {
                 this.doUnescape(stringWriter, str, firstAmp);
             } catch (IOException e) {
-                // This should never happen because ALL the StringWriter methods called by #escape(Writer, String) 
+                // This should never happen because ALL the StringWriter methods called by #escape(Writer, String)
                 // do not throw IOExceptions.
                 throw new RuntimeException(e);
             }
@@ -1022,7 +1022,7 @@ class Entities {
      * Unescapes the escaped entities in the <code>String</code> passed and writes the result to the
      * <code>Writer</code> passed.
      * </p>
-     * 
+     *
      * @param writer
      *            The <code>Writer</code> to write the results to; assumed to be non-null.
      * @param str
@@ -1030,7 +1030,7 @@ class Entities {
      * @throws IOException
      *             when <code>Writer</code> passed throws the exception from calls to the {@link Writer#write(int)}
      *             methods.
-     * 
+     *
      * @see #escape(String)
      * @see Writer
      */

data/ext/hpricot_scan/HpricotCss.java

@@ -80,7 +80,7 @@ public class HpricotCss {
         pe = p + bl.realSize;
         eof = pe;
     }
-    
+
 
 // line 86 "HpricotCss.java"
 private static byte[] init__hpricot_css_actions_0()
@@ -641,7 +641,7 @@ case 3:
 // line 89 "hpricot_css.java.rl"
 	{
     ape = p;
-    PUSH(aps, ape); 
+    PUSH(aps, ape);
   }
 	break;
 	case 2:

data/ext/hpricot_scan/HpricotScanService.java

@@ -254,11 +254,11 @@ public class HpricotScanService implements BasicLibraryService {
             if(te > ts || text) {
                 int raw = -1;
                 int rawlen = 0;
-                ele_open = false; 
+                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; 
+                    raw = ts;
                     rawlen = te - ts;
                 }
 
@@ -273,7 +273,7 @@ public class HpricotScanService implements BasicLibraryService {
                 }
             }
         }
-        
+
 
         public void EBLK(IRubyObject N, int T) {
             tag = CAT(tag, mark_tag, p - T + 1);
@@ -349,8 +349,8 @@ public class HpricotScanService implements BasicLibraryService {
                         }
                     }
 
-                    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) && 
+                    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);
@@ -394,7 +394,7 @@ public class HpricotScanService implements BasicLibraryService {
                             }
                             e = H_ELE_GET(e, H_ELE_PARENT);
                         }
-                    
+
                         if(match.isNil()) {
                             match = S.focus;
                         }
@@ -555,19 +555,18 @@ private static short[] init__hpricot_scan_key_offsets_0()
 	  203,  210,  212,  214,  220,  222,  227,  232,  238,  240,  245,  251,
 	  265,  266,  267,  268,  269,  270,  271,  272,  273,  274,  275,  276,
 	  282,  296,  300,  313,  326,  340,  354,  355,  366,  375,  388,  405,
-	  423,  441,  450,  461,  480,  499,  510,  521,  536,  538,  540,  556,
-	  572,  575,  587,  599,  619,  639,  658,  677,  697,  717,  728,  739,
-	  751,  763,  775,  791,  794,  809,  811,  813,  829,  845,  848,  860,
-	  871,  890,  910,  930,  941,  952,  964,  984, 1004, 1016, 1036, 1057,
-	 1074, 1091, 1095, 1098, 1110, 1122, 1142, 1162, 1182, 1194, 1206, 1226,
-	 1242, 1258, 1270, 1291, 1310, 1313, 1328, 1340, 1355, 1358, 1369, 1371,
-	 1373, 1384, 1391, 1404, 1418, 1432, 1445, 1446, 1447, 1448, 1449, 1450,
-	 1451, 1455, 1460, 1469, 1479, 1484, 1491, 1492, 1493, 1494, 1495, 1496,
-	 1497, 1498, 1499, 1503, 1508, 1512, 1522, 1527, 1533, 1534, 1535, 1536,
-	 1537, 1538, 1539, 1540, 1541, 1542, 1546, 1551, 1553, 1554, 1555, 1560,
-	 1561, 1562, 1564, 1565, 1566, 1567, 1568, 1572, 1582, 1591, 1601, 1602,
-	 1603, 1605, 1614, 1615, 1616, 1617, 1619, 1621, 1624, 1627, 1631, 1633,
-	 1634, 1636, 1637, 1640
+	  423,  441,  450,  461,  480,  499,  509,  519,  533,  534,  549,  564,
+	  566,  577,  588,  607,  626,  644,  662,  681,  700,  710,  721,  732,
+	  743,  758,  760,  774,  775,  790,  805,  807,  818,  828,  846,  865,
+	  884,  894,  905,  924,  943,  954,  973,  993, 1009, 1025, 1028, 1039,
+	 1050, 1069, 1088, 1107, 1118, 1137, 1152, 1167, 1178, 1198, 1216, 1218,
+	 1232, 1243, 1257, 1259, 1269, 1270, 1271, 1282, 1289, 1302, 1316, 1330,
+	 1343, 1344, 1345, 1346, 1347, 1348, 1349, 1353, 1358, 1367, 1377, 1382,
+	 1389, 1390, 1391, 1392, 1393, 1394, 1395, 1396, 1397, 1401, 1406, 1410,
+	 1420, 1425, 1431, 1432, 1433, 1434, 1435, 1436, 1437, 1438, 1439, 1440,
+	 1444, 1449, 1451, 1452, 1453, 1458, 1459, 1460, 1462, 1463, 1464, 1465,
+	 1466, 1470, 1480, 1489, 1499, 1500, 1501, 1503, 1512, 1513, 1514, 1515,
+	 1516, 1517, 1519, 1522, 1526, 1528, 1529, 1531, 1532, 1535
 	};
 }
 
@@ -619,101 +618,93 @@ private static char[] init__hpricot_scan_trans_keys_0()
 	   63,   95,    9,   10,   11,   12,   45,   58,   65,   90,   97,  122,
 	   13,   32,   34,   39,   47,   60,   62,   63,   95,    9,   10,   11,
 	   12,   45,   58,   65,   90,   97,  122,   13,   32,   34,   47,   60,
-	   62,   92,    9,   10,   11,   12,   13,   32,   34,   47,   60,   62,
-	   92,    9,   10,   11,   12,   32,   34,   47,   62,   63,   92,   95,
-	    9,   13,   45,   58,   65,   90,   97,  122,   34,   92,   34,   92,
-	   32,   34,   47,   61,   62,   63,   92,   95,    9,   13,   45,   58,
-	   65,   90,   97,  122,   32,   34,   47,   61,   62,   63,   92,   95,
-	    9,   13,   45,   58,   65,   90,   97,  122,   34,   62,   92,   13,
-	   32,   34,   39,   47,   60,   62,   92,    9,   10,   11,   12,   13,
-	   32,   34,   39,   47,   60,   62,   92,    9,   10,   11,   12,   13,
-	   32,   34,   39,   47,   60,   62,   63,   92,   95,    9,   10,   11,
+	   62,    9,   10,   11,   12,   13,   32,   34,   47,   60,   62,    9,
+	   10,   11,   12,   32,   34,   47,   62,   63,   95,    9,   13,   45,
+	   58,   65,   90,   97,  122,   34,   32,   34,   47,   61,   62,   63,
+	   95,    9,   13,   45,   58,   65,   90,   97,  122,   32,   34,   47,
+	   61,   62,   63,   95,    9,   13,   45,   58,   65,   90,   97,  122,
+	   34,   62,   13,   32,   34,   39,   47,   60,   62,    9,   10,   11,
+	   12,   13,   32,   34,   39,   47,   60,   62,    9,   10,   11,   12,
+	   13,   32,   34,   39,   47,   60,   62,   63,   95,    9,   10,   11,
 	   12,   45,   58,   65,   90,   97,  122,   13,   32,   34,   39,   47,
-	   60,   62,   63,   92,   95,    9,   10,   11,   12,   45,   58,   65,
-	   90,   97,  122,   13,   32,   34,   47,   60,   62,   63,   92,   95,
-	    9,   10,   11,   12,   45,   58,   65,   90,   97,  122,   13,   32,
-	   34,   47,   60,   62,   63,   92,   95,    9,   10,   11,   12,   45,
-	   58,   65,   90,   97,  122,   13,   32,   34,   47,   60,   61,   62,
-	   63,   92,   95,    9,   10,   11,   12,   45,   58,   65,   90,   97,
-	  122,   13,   32,   34,   47,   60,   61,   62,   63,   92,   95,    9,
+	   60,   62,   63,   95,    9,   10,   11,   12,   45,   58,   65,   90,
+	   97,  122,   13,   32,   34,   47,   60,   62,   63,   95,    9,   10,
+	   11,   12,   45,   58,   65,   90,   97,  122,   13,   32,   34,   47,
+	   60,   62,   63,   95,    9,   10,   11,   12,   45,   58,   65,   90,
+	   97,  122,   13,   32,   34,   47,   60,   61,   62,   63,   95,    9,
 	   10,   11,   12,   45,   58,   65,   90,   97,  122,   13,   32,   34,
-	   47,   60,   62,   92,    9,   10,   11,   12,   13,   32,   34,   47,
-	   60,   62,   92,    9,   10,   11,   12,   13,   32,   34,   39,   47,
-	   60,   62,   92,    9,   10,   11,   12,   13,   32,   34,   39,   47,
-	   60,   62,   92,    9,   10,   11,   12,   13,   32,   34,   39,   47,
-	   60,   62,   92,    9,   10,   11,   12,   32,   34,   39,   47,   62,
-	   63,   92,   95,    9,   13,   45,   58,   65,   90,   97,  122,   34,
-	   39,   92,   32,   39,   47,   62,   63,   92,   95,    9,   13,   45,
-	   58,   65,   90,   97,  122,   39,   92,   39,   92,   32,   39,   47,
-	   61,   62,   63,   92,   95,    9,   13,   45,   58,   65,   90,   97,
-	  122,   32,   39,   47,   61,   62,   63,   92,   95,    9,   13,   45,
-	   58,   65,   90,   97,  122,   39,   62,   92,   13,   32,   34,   39,
-	   47,   60,   62,   92,    9,   10,   11,   12,   13,   32,   39,   47,
-	   60,   62,   92,    9,   10,   11,   12,   13,   32,   39,   47,   60,
-	   62,   63,   92,   95,    9,   10,   11,   12,   45,   58,   65,   90,
-	   97,  122,   13,   32,   39,   47,   60,   61,   62,   63,   92,   95,
-	    9,   10,   11,   12,   45,   58,   65,   90,   97,  122,   13,   32,
-	   39,   47,   60,   61,   62,   63,   92,   95,    9,   10,   11,   12,
-	   45,   58,   65,   90,   97,  122,   13,   32,   39,   47,   60,   62,
-	   92,    9,   10,   11,   12,   13,   32,   39,   47,   60,   62,   92,
-	    9,   10,   11,   12,   13,   32,   34,   39,   47,   60,   62,   92,
-	    9,   10,   11,   12,   13,   32,   34,   39,   47,   60,   62,   63,
-	   92,   95,    9,   10,   11,   12,   45,   58,   65,   90,   97,  122,
-	   13,   32,   34,   39,   47,   60,   62,   63,   92,   95,    9,   10,
+	   47,   60,   61,   62,   63,   95,    9,   10,   11,   12,   45,   58,
+	   65,   90,   97,  122,   13,   32,   34,   47,   60,   62,    9,   10,
+	   11,   12,   13,   32,   34,   39,   47,   60,   62,    9,   10,   11,
+	   12,   13,   32,   34,   39,   47,   60,   62,    9,   10,   11,   12,
+	   13,   32,   34,   39,   47,   60,   62,    9,   10,   11,   12,   32,
+	   34,   39,   47,   62,   63,   95,    9,   13,   45,   58,   65,   90,
+	   97,  122,   34,   39,   32,   39,   47,   62,   63,   95,    9,   13,
+	   45,   58,   65,   90,   97,  122,   39,   32,   39,   47,   61,   62,
+	   63,   95,    9,   13,   45,   58,   65,   90,   97,  122,   32,   39,
+	   47,   61,   62,   63,   95,    9,   13,   45,   58,   65,   90,   97,
+	  122,   39,   62,   13,   32,   34,   39,   47,   60,   62,    9,   10,
+	   11,   12,   13,   32,   39,   47,   60,   62,    9,   10,   11,   12,
+	   13,   32,   39,   47,   60,   62,   63,   95,    9,   10,   11,   12,
+	   45,   58,   65,   90,   97,  122,   13,   32,   39,   47,   60,   61,
+	   62,   63,   95,    9,   10,   11,   12,   45,   58,   65,   90,   97,
+	  122,   13,   32,   39,   47,   60,   61,   62,   63,   95,    9,   10,
+	   11,   12,   45,   58,   65,   90,   97,  122,   13,   32,   39,   47,
+	   60,   62,    9,   10,   11,   12,   13,   32,   34,   39,   47,   60,
+	   62,    9,   10,   11,   12,   13,   32,   34,   39,   47,   60,   62,
+	   63,   95,    9,   10,   11,   12,   45,   58,   65,   90,   97,  122,
+	   13,   32,   34,   39,   47,   60,   62,   63,   95,    9,   10,   11,
+	   12,   45,   58,   65,   90,   97,  122,   13,   32,   34,   39,   47,
+	   60,   62,    9,   10,   11,   12,   13,   32,   34,   39,   47,   60,
+	   62,   63,   95,    9,   10,   11,   12,   45,   58,   65,   90,   97,
+	  122,   13,   32,   34,   39,   47,   60,   61,   62,   63,   95,    9,
+	   10,   11,   12,   45,   58,   65,   90,   97,  122,   32,   34,   39,
+	   47,   61,   62,   63,   95,    9,   13,   45,   58,   65,   90,   97,
+	  122,   32,   34,   39,   47,   61,   62,   63,   95,    9,   13,   45,
+	   58,   65,   90,   97,  122,   34,   39,   62,   13,   32,   34,   39,
+	   47,   60,   62,    9,   10,   11,   12,   13,   32,   34,   39,   47,
+	   60,   62,    9,   10,   11,   12,   13,   32,   34,   39,   47,   60,
+	   62,   63,   95,    9,   10,   11,   12,   45,   58,   65,   90,   97,
+	  122,   13,   32,   34,   39,   47,   60,   62,   63,   95,    9,   10,
 	   11,   12,   45,   58,   65,   90,   97,  122,   13,   32,   34,   39,
-	   47,   60,   62,   92,    9,   10,   11,   12,   13,   32,   34,   39,
-	   47,   60,   62,   63,   92,   95,    9,   10,   11,   12,   45,   58,
-	   65,   90,   97,  122,   13,   32,   34,   39,   47,   60,   61,   62,
-	   63,   92,   95,    9,   10,   11,   12,   45,   58,   65,   90,   97,
-	  122,   32,   34,   39,   47,   61,   62,   63,   92,   95,    9,   13,
-	   45,   58,   65,   90,   97,  122,   32,   34,   39,   47,   61,   62,
-	   63,   92,   95,    9,   13,   45,   58,   65,   90,   97,  122,   34,
-	   39,   62,   92,   34,   39,   92,   13,   32,   34,   39,   47,   60,
-	   62,   92,    9,   10,   11,   12,   13,   32,   34,   39,   47,   60,
-	   62,   92,    9,   10,   11,   12,   13,   32,   34,   39,   47,   60,
-	   62,   63,   92,   95,    9,   10,   11,   12,   45,   58,   65,   90,
-	   97,  122,   13,   32,   34,   39,   47,   60,   62,   63,   92,   95,
+	   47,   60,   62,   63,   95,    9,   10,   11,   12,   45,   58,   65,
+	   90,   97,  122,   13,   32,   34,   39,   47,   60,   62,    9,   10,
+	   11,   12,   13,   32,   34,   39,   47,   60,   62,   63,   95,    9,
+	   10,   11,   12,   45,   58,   65,   90,   97,  122,   32,   34,   39,
+	   47,   62,   63,   95,    9,   13,   45,   58,   65,   90,   97,  122,
+	   32,   34,   39,   47,   62,   63,   95,    9,   13,   45,   58,   65,
+	   90,   97,  122,   13,   32,   34,   39,   47,   60,   62,    9,   10,
+	   11,   12,   13,   32,   34,   39,   47,   60,   61,   62,   63,   95,
 	    9,   10,   11,   12,   45,   58,   65,   90,   97,  122,   13,   32,
-	   34,   39,   47,   60,   62,   63,   92,   95,    9,   10,   11,   12,
-	   45,   58,   65,   90,   97,  122,   13,   32,   34,   39,   47,   60,
-	   62,   92,    9,   10,   11,   12,   13,   32,   34,   39,   47,   60,
-	   62,   92,    9,   10,   11,   12,   13,   32,   34,   39,   47,   60,
-	   62,   63,   92,   95,    9,   10,   11,   12,   45,   58,   65,   90,
-	   97,  122,   32,   34,   39,   47,   62,   63,   92,   95,    9,   13,
-	   45,   58,   65,   90,   97,  122,   32,   34,   39,   47,   62,   63,
-	   92,   95,    9,   13,   45,   58,   65,   90,   97,  122,   13,   32,
-	   34,   39,   47,   60,   62,   92,    9,   10,   11,   12,   13,   32,
-	   34,   39,   47,   60,   61,   62,   63,   92,   95,    9,   10,   11,
-	   12,   45,   58,   65,   90,   97,  122,   13,   32,   39,   47,   60,
-	   62,   63,   92,   95,    9,   10,   11,   12,   45,   58,   65,   90,
-	   97,  122,   34,   39,   92,   32,   39,   47,   62,   63,   92,   95,
+	   39,   47,   60,   62,   63,   95,    9,   10,   11,   12,   45,   58,
+	   65,   90,   97,  122,   34,   39,   32,   39,   47,   62,   63,   95,
 	    9,   13,   45,   58,   65,   90,   97,  122,   13,   32,   34,   39,
-	   47,   60,   62,   92,    9,   10,   11,   12,   32,   34,   47,   62,
-	   63,   92,   95,    9,   13,   45,   58,   65,   90,   97,  122,   34,
-	   39,   92,   13,   32,   39,   47,   60,   62,   92,    9,   10,   11,
-	   12,   34,   92,   39,   92,   13,   32,   34,   39,   47,   60,   62,
-	    9,   10,   11,   12,   58,   95,  120,   65,   90,   97,  122,   32,
-	   63,   95,    9,   13,   45,   46,   48,   58,   65,   90,   97,  122,
-	   32,   63,   95,  109,    9,   13,   45,   46,   48,   58,   65,   90,
-	   97,  122,   32,   63,   95,  108,    9,   13,   45,   46,   48,   58,
-	   65,   90,   97,  122,   32,   63,   95,    9,   13,   45,   46,   48,
-	   58,   65,   90,   97,  122,  101,  114,  115,  105,  111,  110,   32,
-	   61,    9,   13,   32,   34,   39,    9,   13,   95,   45,   46,   48,
-	   58,   65,   90,   97,  122,   34,   95,   45,   46,   48,   58,   65,
-	   90,   97,  122,   32,   62,   63,    9,   13,   32,   62,   63,  101,
-	  115,    9,   13,   62,  110,   99,  111,  100,  105,  110,  103,   32,
-	   61,    9,   13,   32,   34,   39,    9,   13,   65,   90,   97,  122,
-	   34,   95,   45,   46,   48,   57,   65,   90,   97,  122,   32,   62,
-	   63,    9,   13,   32,   62,   63,  115,    9,   13,  116,   97,  110,
-	  100,   97,  108,  111,  110,  101,   32,   61,    9,   13,   32,   34,
-	   39,    9,   13,  110,  121,  111,   34,   32,   62,   63,    9,   13,
-	  101,  115,  110,  121,  111,   39,  101,  115,   65,   90,   97,  122,
-	   39,   95,   45,   46,   48,   57,   65,   90,   97,  122,   95,   45,
-	   46,   48,   58,   65,   90,   97,  122,   39,   95,   45,   46,   48,
-	   58,   65,   90,   97,  122,   62,   62,   10,   60,   33,   47,   58,
-	   63,   95,   65,   90,   97,  122,   39,   93,   34,   34,   92,   39,
-	   92,   34,   39,   92,   32,    9,   13,   32,  118,    9,   13,   10,
-	   45,   45,   10,   93,   93,   10,   62,   63,   62,    0
+	   47,   60,   62,    9,   10,   11,   12,   32,   34,   47,   62,   63,
+	   95,    9,   13,   45,   58,   65,   90,   97,  122,   34,   39,   13,
+	   32,   39,   47,   60,   62,    9,   10,   11,   12,   34,   39,   13,
+	   32,   34,   39,   47,   60,   62,    9,   10,   11,   12,   58,   95,
+	  120,   65,   90,   97,  122,   32,   63,   95,    9,   13,   45,   46,
+	   48,   58,   65,   90,   97,  122,   32,   63,   95,  109,    9,   13,
+	   45,   46,   48,   58,   65,   90,   97,  122,   32,   63,   95,  108,
+	    9,   13,   45,   46,   48,   58,   65,   90,   97,  122,   32,   63,
+	   95,    9,   13,   45,   46,   48,   58,   65,   90,   97,  122,  101,
+	  114,  115,  105,  111,  110,   32,   61,    9,   13,   32,   34,   39,
+	    9,   13,   95,   45,   46,   48,   58,   65,   90,   97,  122,   34,
+	   95,   45,   46,   48,   58,   65,   90,   97,  122,   32,   62,   63,
+	    9,   13,   32,   62,   63,  101,  115,    9,   13,   62,  110,   99,
+	  111,  100,  105,  110,  103,   32,   61,    9,   13,   32,   34,   39,
+	    9,   13,   65,   90,   97,  122,   34,   95,   45,   46,   48,   57,
+	   65,   90,   97,  122,   32,   62,   63,    9,   13,   32,   62,   63,
+	  115,    9,   13,  116,   97,  110,  100,   97,  108,  111,  110,  101,
+	   32,   61,    9,   13,   32,   34,   39,    9,   13,  110,  121,  111,
+	   34,   32,   62,   63,    9,   13,  101,  115,  110,  121,  111,   39,
+	  101,  115,   65,   90,   97,  122,   39,   95,   45,   46,   48,   57,
+	   65,   90,   97,  122,   95,   45,   46,   48,   58,   65,   90,   97,
+	  122,   39,   95,   45,   46,   48,   58,   65,   90,   97,  122,   62,
+	   62,   10,   60,   33,   47,   58,   63,   95,   65,   90,   97,  122,
+	   39,   93,   34,   34,   39,   34,   39,   32,    9,   13,   32,  118,
+	    9,   13,   10,   45,   45,   10,   93,   93,   10,   62,   63,   62,
+	    0
 	};
 }
 
@@ -729,19 +720,18 @@ private static byte[] init__hpricot_scan_single_lengths_0()
 	    5,    2,    2,    4,    2,    3,    3,    4,    2,    3,    4,    4,
 	    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,    2,
 	    4,    2,    5,    5,    6,    6,    1,    7,    5,    5,    7,    8,
-	    8,    5,    7,    9,    9,    7,    7,    7,    2,    2,    8,    8,
-	    3,    8,    8,   10,   10,    9,    9,   10,   10,    7,    7,    8,
-	    8,    8,    8,    3,    7,    2,    2,    8,    8,    3,    8,    7,
-	    9,   10,   10,    7,    7,    8,   10,   10,    8,   10,   11,    9,
-	    9,    4,    3,    8,    8,   10,   10,   10,    8,    8,   10,    8,
-	    8,    8,   11,    9,    3,    7,    8,    7,    3,    7,    2,    2,
-	    7,    3,    3,    4,    4,    3,    1,    1,    1,    1,    1,    1,
-	    2,    3,    1,    2,    3,    5,    1,    1,    1,    1,    1,    1,
-	    1,    1,    2,    3,    0,    2,    3,    4,    1,    1,    1,    1,
-	    1,    1,    1,    1,    1,    2,    3,    2,    1,    1,    3,    1,
-	    1,    2,    1,    1,    1,    1,    0,    2,    1,    2,    1,    1,
-	    2,    5,    1,    1,    1,    2,    2,    3,    1,    2,    2,    1,
-	    2,    1,    3,    1
+	    8,    5,    7,    9,    9,    6,    6,    6,    1,    7,    7,    2,
+	    7,    7,    9,    9,    8,    8,    9,    9,    6,    7,    7,    7,
+	    7,    2,    6,    1,    7,    7,    2,    7,    6,    8,    9,    9,
+	    6,    7,    9,    9,    7,    9,   10,    8,    8,    3,    7,    7,
+	    9,    9,    9,    7,    9,    7,    7,    7,   10,    8,    2,    6,
+	    7,    6,    2,    6,    1,    1,    7,    3,    3,    4,    4,    3,
+	    1,    1,    1,    1,    1,    1,    2,    3,    1,    2,    3,    5,
+	    1,    1,    1,    1,    1,    1,    1,    1,    2,    3,    0,    2,
+	    3,    4,    1,    1,    1,    1,    1,    1,    1,    1,    1,    2,
+	    3,    2,    1,    1,    3,    1,    1,    2,    1,    1,    1,    1,
+	    0,    2,    1,    2,    1,    1,    2,    5,    1,    1,    1,    1,
+	    1,    2,    1,    2,    2,    1,    2,    1,    3,    1
 	};
 }
 
@@ -757,19 +747,18 @@ private static byte[] init__hpricot_scan_range_lengths_0()
 	    1,    0,    0,    1,    0,    1,    1,    1,    0,    1,    1,    5,
 	    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    2,
 	    5,    1,    4,    4,    4,    4,    0,    2,    2,    4,    5,    5,
-	    5,    2,    2,    5,    5,    2,    2,    4,    0,    0,    4,    4,
-	    0,    2,    2,    5,    5,    5,    5,    5,    5,    2,    2,    2,
-	    2,    2,    4,    0,    4,    0,    0,    4,    4,    0,    2,    2,
-	    5,    5,    5,    2,    2,    2,    5,    5,    2,    5,    5,    4,
-	    4,    0,    0,    2,    2,    5,    5,    5,    2,    2,    5,    4,
-	    4,    2,    5,    5,    0,    4,    2,    4,    0,    2,    0,    0,
-	    2,    2,    5,    5,    5,    5,    0,    0,    0,    0,    0,    0,
-	    1,    1,    4,    4,    1,    1,    0,    0,    0,    0,    0,    0,
-	    0,    0,    1,    1,    2,    4,    1,    1,    0,    0,    0,    0,
-	    0,    0,    0,    0,    0,    1,    1,    0,    0,    0,    1,    0,
-	    0,    0,    0,    0,    0,    0,    2,    4,    4,    4,    0,    0,
-	    0,    2,    0,    0,    0,    0,    0,    0,    1,    1,    0,    0,
-	    0,    0,    0,    0
+	    5,    2,    2,    5,    5,    2,    2,    4,    0,    4,    4,    0,
+	    2,    2,    5,    5,    5,    5,    5,    5,    2,    2,    2,    2,
+	    4,    0,    4,    0,    4,    4,    0,    2,    2,    5,    5,    5,
+	    2,    2,    5,    5,    2,    5,    5,    4,    4,    0,    2,    2,
+	    5,    5,    5,    2,    5,    4,    4,    2,    5,    5,    0,    4,
+	    2,    4,    0,    2,    0,    0,    2,    2,    5,    5,    5,    5,
+	    0,    0,    0,    0,    0,    0,    1,    1,    4,    4,    1,    1,
+	    0,    0,    0,    0,    0,    0,    0,    0,    1,    1,    2,    4,
+	    1,    1,    0,    0,    0,    0,    0,    0,    0,    0,    0,    1,
+	    1,    0,    0,    0,    1,    0,    0,    0,    0,    0,    0,    0,
+	    2,    4,    4,    4,    0,    0,    0,    2,    0,    0,    0,    0,
+	    0,    0,    1,    1,    0,    0,    0,    0,    0,    0
 	};
 }
 
@@ -785,19 +774,18 @@ private static short[] init__hpricot_scan_index_offsets_0()
 	  185,  192,  195,  198,  204,  207,  212,  217,  223,  226,  231,  237,
 	  247,  249,  251,  253,  255,  257,  259,  261,  263,  265,  267,  269,
 	  274,  284,  288,  298,  308,  319,  330,  332,  342,  350,  360,  373,
-	  387,  401,  409,  419,  434,  449,  459,  469,  481,  484,  487,  500,
-	  513,  517,  528,  539,  555,  571,  586,  601,  617,  633,  643,  653,
-	  664,  675,  686,  699,  703,  715,  718,  721,  734,  747,  751,  762,
-	  772,  787,  803,  819,  829,  839,  850,  866,  882,  893,  909,  926,
-	  940,  954,  959,  963,  974,  985, 1001, 1017, 1033, 1044, 1055, 1071,
-	 1084, 1097, 1108, 1125, 1140, 1144, 1156, 1167, 1179, 1183, 1193, 1196,
-	 1199, 1209, 1215, 1224, 1234, 1244, 1253, 1255, 1257, 1259, 1261, 1263,
-	 1265, 1269, 1274, 1280, 1287, 1292, 1299, 1301, 1303, 1305, 1307, 1309,
-	 1311, 1313, 1315, 1319, 1324, 1327, 1334, 1339, 1345, 1347, 1349, 1351,
-	 1353, 1355, 1357, 1359, 1361, 1363, 1367, 1372, 1375, 1377, 1379, 1384,
-	 1386, 1388, 1391, 1393, 1395, 1397, 1399, 1402, 1409, 1415, 1422, 1424,
-	 1426, 1429, 1437, 1439, 1441, 1443, 1446, 1449, 1453, 1456, 1460, 1463,
-	 1465, 1468, 1470, 1474
+	  387,  401,  409,  419,  434,  449,  458,  467,  478,  480,  492,  504,
+	  507,  517,  527,  542,  557,  571,  585,  600,  615,  624,  634,  644,
+	  654,  666,  669,  680,  682,  694,  706,  709,  719,  728,  742,  757,
+	  772,  781,  791,  806,  821,  831,  846,  862,  875,  888,  892,  902,
+	  912,  927,  942,  957,  967,  982,  994, 1006, 1016, 1032, 1046, 1049,
+	 1060, 1070, 1081, 1084, 1093, 1095, 1097, 1107, 1113, 1122, 1132, 1142,
+	 1151, 1153, 1155, 1157, 1159, 1161, 1163, 1167, 1172, 1178, 1185, 1190,
+	 1197, 1199, 1201, 1203, 1205, 1207, 1209, 1211, 1213, 1217, 1222, 1225,
+	 1232, 1237, 1243, 1245, 1247, 1249, 1251, 1253, 1255, 1257, 1259, 1261,
+	 1265, 1270, 1273, 1275, 1277, 1282, 1284, 1286, 1289, 1291, 1293, 1295,
+	 1297, 1300, 1307, 1313, 1320, 1322, 1324, 1327, 1335, 1337, 1339, 1341,
+	 1343, 1345, 1348, 1351, 1355, 1358, 1360, 1363, 1365, 1369
 	};
 }
 
@@ -844,93 +832,84 @@ private static short[] init__hpricot_scan_indicies_0()
 	  125,  143,  143,  145,  146,  147,   39,  129,  143,  144,  119,  148,
 	  148,  122,  123,  124,   39,  117,  150,  150,  148,  149,  150,  150,
 	  150,  119,  143,  143,  145,  146,  151,   39,  133,  150,  150,  143,
-	  144,  150,  150,  150,  119,  153,  153,  155,  156,  157,  158,  159,
-	  153,  154,  152,  161,  161,  163,  164,  165,  166,  167,  161,  162,
-	  160,  168,  169,  171,  172,  170,  173,  170,  168,  170,  170,  170,
-	  165,  169,  173,  165,  174,  173,  165,  175,  169,  177,  178,  179,
-	  176,  173,  176,  175,  176,  176,  176,  165,  180,  169,  171,  181,
-	  172,  170,  173,  170,  180,  170,  170,  170,  165,  169,  182,  173,
-	  165,  183,  183,  185,  186,  187,  165,  172,  159,  183,  184,  152,
-	  188,  188,  185,  186,  187,  165,  172,  159,  188,  189,  152,  188,
-	  188,  185,  186,  187,  165,  172,  190,  159,  190,  188,  189,  190,
-	  190,  190,  152,  191,  191,  193,  194,  195,  165,  196,  190,  159,
-	  190,  191,  192,  190,  190,  190,  152,  153,  153,  155,  195,  157,
-	  197,  190,  159,  190,  153,  154,  190,  190,  190,  152,  161,  161,
-	  163,  199,  165,  196,  198,  167,  198,  161,  162,  198,  198,  198,
-	  160,  200,  200,  163,  203,  165,  204,  205,  202,  167,  202,  200,
-	  201,  202,  202,  202,  160,  206,  206,  163,  199,  165,  208,  196,
-	  198,  167,  198,  206,  207,  198,  198,  198,  160,  161,  161,  163,
-	  164,  165,  166,  167,  161,  162,  160,  161,  161,  209,  164,  165,
-	  166,  167,  161,  162,  160,  191,  191,  193,  194,  156,  165,  166,
-	  159,  191,  192,  152,  211,  211,  213,  214,  215,  216,  217,  218,
-	  211,  212,  210,  220,  220,  222,  209,  223,  224,  225,  226,  220,
-	  221,  219,  227,  228,  174,  230,  231,  229,  232,  229,  227,  229,
-	  229,  229,  224,  228,  174,  232,  224,  234,  169,  236,  237,  235,
-	  238,  235,  234,  235,  235,  235,  233,  169,  238,  233,  228,  238,
-	  233,  239,  169,  241,  242,  243,  240,  238,  240,  239,  240,  240,
-	  240,  233,  244,  169,  236,  245,  237,  235,  238,  235,  244,  235,
-	  235,  235,  233,  169,  246,  238,  233,  248,  248,  250,  251,  252,
-	  233,  237,  253,  248,  249,  247,  255,  255,  163,  257,  233,  258,
-	  259,  255,  256,  254,  255,  255,  163,  261,  233,  262,  260,  259,
-	  260,  255,  256,  260,  260,  260,  254,  263,  263,  163,  266,  233,
-	  267,  268,  265,  259,  265,  263,  264,  265,  265,  265,  254,  269,
-	  269,  163,  261,  233,  271,  262,  260,  259,  260,  269,  270,  260,
-	  260,  260,  254,  255,  255,  163,  257,  233,  258,  259,  255,  256,
-	  254,  255,  255,  222,  257,  233,  258,  259,  255,  256,  254,  272,
-	  272,  274,  275,  276,  233,  258,  253,  272,  273,  247,  277,  277,
-	  250,  251,  252,  233,  237,  279,  253,  279,  277,  278,  279,  279,
-	  279,  247,  272,  272,  274,  275,  280,  233,  262,  279,  253,  279,
-	  272,  273,  279,  279,  279,  247,  211,  211,  281,  214,  215,  216,
-	  217,  218,  211,  212,  210,  220,  220,  222,  209,  283,  224,  284,
-	  282,  226,  282,  220,  221,  282,  282,  282,  219,  285,  285,  222,
-	  209,  288,  224,  289,  290,  287,  226,  287,  285,  286,  287,  287,
-	  287,  219,  291,  228,  174,  230,  292,  231,  229,  232,  229,  291,
-	  229,  229,  229,  224,  293,  228,  174,  295,  296,  297,  294,  232,
-	  294,  293,  294,  294,  294,  224,  228,  174,  298,  232,  224,  299,
-	  299,  232,  224,  300,  300,  302,  303,  304,  224,  231,  218,  300,
-	  301,  210,  305,  305,  302,  303,  304,  224,  231,  218,  305,  306,
-	  210,  305,  305,  302,  303,  304,  224,  231,  307,  218,  307,  305,
-	  306,  307,  307,  307,  210,  308,  308,  310,  311,  312,  224,  284,
-	  307,  218,  307,  308,  309,  307,  307,  307,  210,  211,  211,  281,
-	  214,  312,  216,  313,  307,  218,  307,  211,  212,  307,  307,  307,
-	  210,  220,  220,  222,  209,  223,  224,  225,  226,  220,  221,  219,
-	  220,  220,  314,  314,  223,  224,  225,  226,  220,  221,  219,  211,
-	  211,  213,  214,  312,  216,  313,  307,  218,  307,  211,  212,  307,
-	  307,  307,  210,  315,  316,  317,  319,  320,  318,  321,  318,  315,
-	  318,  318,  318,  216,  315,  322,  317,  319,  320,  318,  321,  318,
-	  315,  318,  318,  318,  216,  308,  308,  310,  311,  215,  224,  225,
-	  218,  308,  309,  210,  323,  323,  222,  209,  283,  224,  325,  284,
-	  282,  226,  282,  323,  324,  282,  282,  282,  219,  326,  326,  155,
-	  280,  328,  329,  279,  253,  279,  326,  327,  279,  279,  279,  247,
-	  316,  317,  321,  216,  330,  331,  333,  334,  332,  335,  332,  330,
-	  332,  332,  332,  328,  277,  277,  250,  251,  252,  233,  237,  253,
-	  277,  278,  247,  336,  331,  338,  339,  337,  340,  337,  336,  337,
-	  337,  337,  157,  322,  317,  321,  216,  326,  326,  155,  276,  328,
-	  341,  253,  326,  327,  247,  331,  340,  157,  331,  335,  328,  148,
-	  148,  122,  123,  124,   39,  117,  148,  149,  119,  342,  342,  343,
-	  342,  342,    0,  344,  345,  345,  344,  345,  345,  345,  345,    0,
-	  344,  345,  345,  346,  344,  345,  345,  345,  345,    0,  344,  345,
-	  345,  347,  344,  345,  345,  345,  345,    0,  348,  345,  345,  348,
-	  345,  345,  345,  345,    0,  350,  349,  351,  349,  352,  349,  353,
-	  349,  354,  349,  355,  349,  355,  356,  355,  349,  356,  357,  358,
-	  356,  349,  359,  359,  359,  359,  359,  349,  360,  361,  361,  361,
-	  361,  361,  349,  362,  363,  364,  362,  349,  362,  363,  364,  365,
-	  366,  362,  349,  363,  349,  367,  349,  368,  349,  369,  349,  370,
-	  349,  371,  349,  372,  349,  373,  349,  373,  374,  373,  349,  374,
-	  375,  376,  374,  349,  377,  377,  349,  378,  379,  379,  379,  379,
-	  379,  349,  380,  363,  364,  380,  349,  380,  363,  364,  366,  380,
-	  349,  381,  349,  382,  349,  383,  349,  384,  349,  385,  349,  386,
-	  349,  387,  349,  388,  349,  389,  349,  389,  390,  389,  349,  390,
-	  391,  392,  390,  349,  393,  394,  349,  395,  349,  396,  349,  397,
-	  363,  364,  397,  349,  398,  349,  395,  349,  399,  400,  349,  401,
-	  349,  396,  349,  402,  349,  401,  349,  403,  403,  349,  378,  404,
-	  404,  404,  404,  404,  349,  405,  405,  405,  405,  405,  349,  360,
-	  406,  406,  406,  406,  406,  349,  408,  407,  410,  409,  412,  413,
-	  411,  415,  416,  417,  418,  417,  417,  417,  414,   41,   45,   43,
-	   21,   41,   40,  169,  173,  165,  169,  238,  233,  228,  174,  232,
-	  224,  344,  344,  420,  348,  421,  348,  420,  423,  424,  422,  426,
-	  425,  428,  429,  427,  431,  430,  433,  434,  435,  432,  434,  436,
-	    0
+	  144,  150,  150,  150,  119,  153,  153,  155,  156,  157,  158,  153,
+	  154,  152,  160,  160,  162,  163,  164,  165,  160,  161,  159,  166,
+	  167,  169,  170,  168,  168,  166,  168,  168,  168,  164,  167,  164,
+	  171,  167,  173,  174,  175,  172,  172,  171,  172,  172,  172,  164,
+	  176,  167,  169,  177,  170,  168,  168,  176,  168,  168,  168,  164,
+	  167,  178,  164,  179,  179,  181,  182,  183,  164,  170,  179,  180,
+	  152,  184,  184,  181,  182,  183,  164,  170,  184,  185,  152,  184,
+	  184,  181,  182,  183,  164,  170,  186,  186,  184,  185,  186,  186,
+	  186,  152,  187,  187,  189,  190,  191,  164,  192,  186,  186,  187,
+	  188,  186,  186,  186,  152,  153,  153,  155,  191,  157,  193,  186,
+	  186,  153,  154,  186,  186,  186,  152,  160,  160,  162,  195,  164,
+	  192,  194,  194,  160,  161,  194,  194,  194,  159,  196,  196,  162,
+	  199,  164,  200,  201,  198,  198,  196,  197,  198,  198,  198,  159,
+	  202,  202,  162,  195,  164,  204,  192,  194,  194,  202,  203,  194,
+	  194,  194,  159,  160,  160,  162,  163,  164,  165,  160,  161,  159,
+	  187,  187,  189,  190,  156,  164,  165,  187,  188,  152,  206,  206,
+	  208,  209,  210,  211,  212,  206,  207,  205,  214,  214,  216,  217,
+	  218,  219,  220,  214,  215,  213,  221,  222,  223,  225,  226,  224,
+	  224,  221,  224,  224,  224,  219,  222,  223,  219,  228,  167,  230,
+	  231,  229,  229,  228,  229,  229,  229,  227,  167,  227,  232,  167,
+	  234,  235,  236,  233,  233,  232,  233,  233,  233,  227,  237,  167,
+	  230,  238,  231,  229,  229,  237,  229,  229,  229,  227,  167,  239,
+	  227,  241,  241,  243,  244,  245,  227,  231,  241,  242,  240,  247,
+	  247,  162,  249,  227,  250,  247,  248,  246,  247,  247,  162,  252,
+	  227,  253,  251,  251,  247,  248,  251,  251,  251,  246,  254,  254,
+	  162,  257,  227,  258,  259,  256,  256,  254,  255,  256,  256,  256,
+	  246,  260,  260,  162,  252,  227,  262,  253,  251,  251,  260,  261,
+	  251,  251,  251,  246,  247,  247,  162,  249,  227,  250,  247,  248,
+	  246,  263,  263,  265,  266,  267,  227,  250,  263,  264,  240,  268,
+	  268,  243,  244,  245,  227,  231,  270,  270,  268,  269,  270,  270,
+	  270,  240,  263,  263,  265,  266,  271,  227,  253,  270,  270,  263,
+	  264,  270,  270,  270,  240,  206,  206,  272,  209,  210,  211,  212,
+	  206,  207,  205,  214,  214,  216,  217,  274,  219,  275,  273,  273,
+	  214,  215,  273,  273,  273,  213,  276,  276,  216,  217,  279,  219,
+	  280,  281,  278,  278,  276,  277,  278,  278,  278,  213,  282,  222,
+	  223,  225,  283,  226,  224,  224,  282,  224,  224,  224,  219,  284,
+	  222,  223,  286,  287,  288,  285,  285,  284,  285,  285,  285,  219,
+	  222,  223,  289,  219,  290,  290,  292,  293,  294,  219,  226,  290,
+	  291,  205,  295,  295,  292,  293,  294,  219,  226,  295,  296,  205,
+	  295,  295,  292,  293,  294,  219,  226,  297,  297,  295,  296,  297,
+	  297,  297,  205,  298,  298,  300,  301,  302,  219,  275,  297,  297,
+	  298,  299,  297,  297,  297,  205,  206,  206,  272,  209,  302,  211,
+	  303,  297,  297,  206,  207,  297,  297,  297,  205,  214,  214,  216,
+	  217,  218,  219,  220,  214,  215,  213,  206,  206,  208,  209,  302,
+	  211,  303,  297,  297,  206,  207,  297,  297,  297,  205,  304,  305,
+	  306,  308,  309,  307,  307,  304,  307,  307,  307,  211,  304,  310,
+	  306,  308,  309,  307,  307,  304,  307,  307,  307,  211,  298,  298,
+	  300,  301,  210,  219,  220,  298,  299,  205,  311,  311,  216,  217,
+	  274,  219,  313,  275,  273,  273,  311,  312,  273,  273,  273,  213,
+	  314,  314,  155,  271,  316,  317,  270,  270,  314,  315,  270,  270,
+	  270,  240,  305,  306,  211,  318,  319,  321,  322,  320,  320,  318,
+	  320,  320,  320,  316,  268,  268,  243,  244,  245,  227,  231,  268,
+	  269,  240,  323,  319,  325,  326,  324,  324,  323,  324,  324,  324,
+	  157,  310,  306,  211,  314,  314,  155,  267,  316,  327,  314,  315,
+	  240,  319,  157,  319,  316,  148,  148,  122,  123,  124,   39,  117,
+	  148,  149,  119,  328,  328,  329,  328,  328,    0,  330,  331,  331,
+	  330,  331,  331,  331,  331,    0,  330,  331,  331,  332,  330,  331,
+	  331,  331,  331,    0,  330,  331,  331,  333,  330,  331,  331,  331,
+	  331,    0,  334,  331,  331,  334,  331,  331,  331,  331,    0,  336,
+	  335,  337,  335,  338,  335,  339,  335,  340,  335,  341,  335,  341,
+	  342,  341,  335,  342,  343,  344,  342,  335,  345,  345,  345,  345,
+	  345,  335,  346,  347,  347,  347,  347,  347,  335,  348,  349,  350,
+	  348,  335,  348,  349,  350,  351,  352,  348,  335,  349,  335,  353,
+	  335,  354,  335,  355,  335,  356,  335,  357,  335,  358,  335,  359,
+	  335,  359,  360,  359,  335,  360,  361,  362,  360,  335,  363,  363,
+	  335,  364,  365,  365,  365,  365,  365,  335,  366,  349,  350,  366,
+	  335,  366,  349,  350,  352,  366,  335,  367,  335,  368,  335,  369,
+	  335,  370,  335,  371,  335,  372,  335,  373,  335,  374,  335,  375,
+	  335,  375,  376,  375,  335,  376,  377,  378,  376,  335,  379,  380,
+	  335,  381,  335,  382,  335,  383,  349,  350,  383,  335,  384,  335,
+	  381,  335,  385,  386,  335,  387,  335,  382,  335,  388,  335,  387,
+	  335,  389,  389,  335,  364,  390,  390,  390,  390,  390,  335,  391,
+	  391,  391,  391,  391,  335,  346,  392,  392,  392,  392,  392,  335,
+	  394,  393,  396,  395,  398,  399,  397,  401,  402,  403,  404,  403,
+	  403,  403,  400,   41,   45,   43,   21,   41,   40,  167,  164,  167,
+	  227,  222,  223,  219,  330,  330,  406,  334,  407,  334,  406,  409,
+	  410,  408,  412,  411,  414,  415,  413,  417,  416,  419,  420,  421,
+	  418,  420,  422,    0
 	};
 }
 
@@ -940,43 +919,42 @@ private static final short _hpricot_scan_indicies[] = init__hpricot_scan_indicie
 private static short[] init__hpricot_scan_trans_targs_0()
 {
 	return new short [] {
-	  204,    1,    2,   53,  204,    3,    4,    5,    6,    7,    8,    9,
-	   10,   11,   10,  204,   26,   11,  204,   12,   48,   26,   13,   14,
+	  198,    1,    2,   53,  198,    3,    4,    5,    6,    7,    8,    9,
+	   10,   11,   10,  198,   26,   11,  198,   12,   48,   26,   13,   14,
 	   15,   16,   17,   18,   19,   30,   20,   21,   20,   21,   22,   23,
-	   28,   24,   25,  204,   24,   25,   25,   27,   29,   29,   31,   32,
-	   31,   32,   33,   34,   35,   36,   47,   32,  206,   40,   35,   36,
-	   47,   37,   34,  206,   40,   46,   38,   39,   43,   38,   39,   43,
-	   39,   41,   42,   41,  207,   43,  208,   44,   45,   39,   32,   49,
-	   50,   51,   52,   21,   54,   55,   56,   57,   58,  204,   60,   61,
-	   60,  204,   61,  204,   63,   62,   66,  204,   63,   64,   66,  204,
-	   65,   64,   66,   67,  204,   65,   64,   66,   67,  204,  204,   68,
-	  144,   74,  142,  143,   73,   68,   69,   70,   73,  204,   69,   71,
-	   73,  204,   65,   72,   71,   73,   74,  204,   65,   72,   74,   75,
-	   76,   77,  141,   73,   75,   76,   71,   73,   78,   79,   90,   70,
-	   93,   80,  209,   94,   78,   79,   90,   70,   93,   80,  209,   94,
-	   79,   69,   82,   84,  209,   81,   79,   83,   82,   84,   85,  209,
-	   83,   85,  209,   86,   95,  139,  140,   93,   87,   88,   91,   87,
-	   88,   89,   96,   93,  209,  209,   91,   93,   83,   92,   91,   93,
-	   95,  209,   83,   92,   95,   90,   97,   98,  117,  108,   90,  128,
-	   99,  211,  129,   97,   98,  117,  108,  128,   99,  211,  129,   98,
-	  100,  120,  121,  211,  122,  101,  100,  103,  105,  210,  102,  104,
-	  103,  105,  106,  210,  104,  106,  210,  107,  138,  113,  136,  137,
-	  111,  112,  107,  100,  108,  111,  210,  112,  109,  111,  210,  104,
-	  110,  109,  111,  113,  210,  104,  110,  113,  114,  115,  116,  135,
-	  111,  114,  115,  109,  111,  108,  118,  128,  211,  119,  134,  118,
-	  128,  133,  211,  119,  123,  119,  120,  121,  123,  211,  211,   98,
-	  124,  133,  131,  132,  128,  125,  126,  118,  125,  126,  127,  130,
-	  128,  211,  117,   98,  100,   79,  120,  121,  211,  122,  100,  119,
-	  134,  133,  100,  108,  101,  210,  100,   69,  103,  105,  210,  102,
-	   79,   82,   84,  209,   81,  210,  146,  147,  212,  146,  148,  149,
-	  213,  204,  151,  152,  153,  154,  155,  156,  157,  158,  200,  159,
-	  160,  159,  161,  204,  162,  163,  176,  164,  165,  166,  167,  168,
-	  169,  170,  171,  172,  198,  173,  174,  173,  175,  177,  178,  179,
-	  180,  181,  182,  183,  184,  185,  186,  187,  193,  188,  191,  189,
-	  190,  190,  192,  194,  196,  195,  197,  199,  199,  201,  201,  214,
-	  214,  216,  216,  204,  204,  205,  204,    0,   59,   62,  145,  204,
-	  204,  150,  214,  214,  215,  214,  202,  216,  216,  217,  216,  203,
-	  218,  218,  218,  219,  218
+	   28,   24,   25,  198,   24,   25,   25,   27,   29,   29,   31,   32,
+	   31,   32,   33,   34,   35,   36,   47,   32,  200,   40,   35,   36,
+	   47,   37,   34,  200,   40,   46,   38,   39,   43,   38,   39,   43,
+	   39,   41,   42,   41,  201,   43,  202,   44,   45,   39,   32,   49,
+	   50,   51,   52,   21,   54,   55,   56,   57,   58,  198,   60,   61,
+	   60,  198,   61,  198,   63,   62,   66,  198,   63,   64,   66,  198,
+	   65,   64,   66,   67,  198,   65,   64,   66,   67,  198,  198,   68,
+	  138,   74,  136,  137,   73,   68,   69,   70,   73,  198,   69,   71,
+	   73,  198,   65,   72,   71,   73,   74,  198,   65,   72,   74,   75,
+	   76,   77,  135,   73,   75,   76,   71,   73,   78,   79,   89,   70,
+	   92,   80,  203,   78,   79,   89,   70,   92,   80,  203,   79,   69,
+	   81,   83,  203,   82,   81,   83,   84,  203,   82,   84,  203,   85,
+	   93,  133,  134,   92,   86,   87,   90,   86,   87,   88,   94,   92,
+	  203,  203,   90,   92,   82,   91,   90,   92,   93,  203,   82,   91,
+	   93,   95,   96,  113,  105,   89,  123,   97,  205,   95,   96,  113,
+	  105,   89,  123,   97,  205,   96,   98,   79,  116,  117,  205,   99,
+	   98,  100,  102,  204,  101,  100,  102,  103,  204,  101,  103,  204,
+	  104,  132,  109,  130,  131,  108,  104,   98,  105,  108,  204,  106,
+	  108,  204,  101,  107,  106,  108,  109,  204,  101,  107,  109,  110,
+	  111,  112,  129,  108,  110,  111,  106,  108,  105,  114,  123,  205,
+	  115,  128,  114,  123,  127,  205,  115,  118,  115,  116,  117,  118,
+	  205,  205,  119,  127,  125,  126,  123,  120,  121,  114,  120,  121,
+	  122,  124,  123,  205,   96,   98,   79,  116,  117,  205,   98,  115,
+	  128,  127,   98,  105,   99,  204,   98,   69,  100,  102,  204,   79,
+	   81,   83,  203,  204,  140,  141,  206,  140,  142,  143,  207,  198,
+	  145,  146,  147,  148,  149,  150,  151,  152,  194,  153,  154,  153,
+	  155,  198,  156,  157,  170,  158,  159,  160,  161,  162,  163,  164,
+	  165,  166,  192,  167,  168,  167,  169,  171,  172,  173,  174,  175,
+	  176,  177,  178,  179,  180,  181,  187,  182,  185,  183,  184,  184,
+	  186,  188,  190,  189,  191,  193,  193,  195,  195,  208,  208,  210,
+	  210,  198,  198,  199,  198,    0,   59,   62,  139,  198,  198,  144,
+	  208,  208,  209,  208,  196,  210,  210,  211,  210,  197,  212,  212,
+	  212,  213,  212
 	};
 }
 
@@ -999,30 +977,29 @@ private static short[] init__hpricot_scan_trans_actions_0()
 	    3,    3,    0,    0,   89,    0,    9,    9,  104,  164,    0,  180,
 	  119,  176,  107,  107,    0,  160,   11,  201,    9,    9,    0,   80,
 	   80,    0,    0,  152,    3,    3,  196,  156,    3,   80,   80,   77,
-	  152,    3,  226,    3,    0,    9,    9,    7,  104,    0,  211,    0,
-	    0,    7,  180,   23,  192,    0,    7,   11,    0,  110,   11,  216,
-	    0,    0,  149,    3,    3,    7,    0,   89,    3,    3,  196,   80,
-	   80,    7,    0,  156,  221,  232,  180,  119,  107,  107,    0,  160,
-	   11,  238,    9,    9,    0,    7,    3,   80,   80,  101,   77,  152,
-	    3,  226,    3,    0,    9,    9,    7,  104,    0,  211,    0,    0,
-	    7,  180,   23,  192,    0,    0,    0,  180,   23,  192,    0,   11,
-	    0,  110,   11,  216,    0,    0,  149,    3,    3,    3,    0,    7,
-	   89,    3,    0,    9,    9,  104,  211,    0,  180,  119,  221,  107,
-	  107,    0,  160,   11,  238,    9,    9,    0,   80,   80,    0,    7,
-	  152,    3,    3,  196,  156,   77,  180,  119,  221,  107,  107,    0,
-	  160,   11,  238,    0,    0,   11,    0,  110,   11,  216,  149,    7,
-	    3,    3,    7,    7,   89,    3,    3,  196,   80,   80,    7,    7,
-	  156,  232,    7,    3,   77,   77,  196,   89,  206,    3,  101,    9,
+	  152,    3,  226,    0,    9,    9,    7,  104,    0,  211,    0,    7,
+	  180,   23,  192,   11,    0,  110,   11,  216,    0,    0,  149,    3,
+	    3,    7,    0,   89,    3,    3,  196,   80,   80,    7,    0,  156,
+	  221,  232,  180,  119,  107,  107,    0,  160,   11,  238,    9,    9,
+	    0,    3,   80,   80,  101,   77,  152,    3,  226,    0,    9,    9,
+	    7,    7,  104,    0,  211,    0,    7,    7,  180,   23,  192,    0,
+	    0,  180,   23,  192,   11,    0,  110,   11,  216,    0,    0,  149,
+	    3,    3,    3,    0,    7,   89,    0,    9,    9,  104,  211,  180,
+	  119,  221,  107,  107,    0,  160,   11,  238,    9,    9,    0,   80,
+	   80,    0,    7,  152,    3,    3,  196,  156,   77,  180,  119,  221,
+	  107,  107,    0,  160,   11,  238,    0,    0,   11,    0,  110,   11,
+	  216,  149,    3,    3,    7,    7,   89,    3,    3,  196,   80,   80,
+	    7,    7,  156,  232,    3,   77,   77,  196,   89,  206,  101,    9,
 	    9,    0,   80,   80,    3,  232,    3,   77,  196,   89,  206,    3,
-	    3,  196,   89,  206,    3,  226,   25,   25,    0,    0,    0,    0,
-	   31,   71,    0,    0,    0,    0,    0,    0,    0,    0,    0,    3,
-	   13,    0,    0,   49,    0,    0,    0,    0,    0,    0,    0,    0,
-	    0,    0,    0,    0,    0,    3,   15,    0,    0,    0,    0,    0,
-	    0,    0,    0,    0,    0,    0,    0,    0,    0,    3,    3,    0,
-	   17,    0,    0,    3,    3,    0,    0,    3,    0,    3,    0,   37,
-	  137,   43,  140,   63,  134,  184,   69,    0,    0,    1,    0,   65,
-	   67,    0,   33,  125,   31,   35,    0,   39,  128,   31,   41,    0,
-	   45,  131,  143,    0,   47
+	  196,   89,  206,  226,   25,   25,    0,    0,    0,    0,   31,   71,
+	    0,    0,    0,    0,    0,    0,    0,    0,    0,    3,   13,    0,
+	    0,   49,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+	    0,    0,    0,    3,   15,    0,    0,    0,    0,    0,    0,    0,
+	    0,    0,    0,    0,    0,    0,    0,    3,    3,    0,   17,    0,
+	    0,    3,    3,    0,    0,    3,    0,    3,    0,   37,  137,   43,
+	  140,   63,  134,  184,   69,    0,    0,    1,    0,   65,   67,    0,
+	   33,  125,   31,   35,    0,   39,  128,   31,   41,    0,   45,  131,
+	  143,    0,   47
 	};
 }
 
@@ -1048,9 +1025,8 @@ private static short[] init__hpricot_scan_to_state_actions_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,
-	   27,    0,    0,    0,    0,    0,    0,    0,    0,    0,   27,    0,
-	   27,    0,   27,    0
+	    0,    0,    0,    0,    0,    0,   27,    0,    0,    0,    0,    0,
+	    0,    0,    0,    0,   27,    0,   27,    0,   27,    0
 	};
 }
 
@@ -1076,9 +1052,8 @@ private static short[] init__hpricot_scan_from_state_actions_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,
-	   29,    0,    0,    0,    0,    0,    0,    0,    0,    0,   29,    0,
-	   29,    0,   29,    0
+	    0,    0,    0,    0,    0,    0,   29,    0,    0,    0,    0,    0,
+	    0,    0,    0,    0,   29,    0,   29,    0,   29,    0
 	};
 }
 
@@ -1099,27 +1074,26 @@ private static short[] init__hpricot_scan_eof_trans_0()
 	   40,   40,   40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
 	   40,   40,   40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
 	   40,   40,   40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
-	   40,   40,   40,   40,   40,   40,   40,   40,   40,   40,   40,   40,
-	   40,    1,    1,    1,    1,    1,  350,  350,  350,  350,  350,  350,
-	  350,  350,  350,  350,  350,  350,  350,  350,  350,  350,  350,  350,
-	  350,  350,  350,  350,  350,  350,  350,  350,  350,  350,  350,  350,
-	  350,  350,  350,  350,  350,  350,  350,  350,  350,  350,  350,  350,
-	  350,  350,  350,  350,  350,  350,  350,  350,  350,  350,  408,  410,
-	    0,  415,  420,  420,  420,   40,   40,   40,  421,  421,    0,  426,
-	    0,  431,    0,  437
+	   40,   40,   40,   40,   40,   40,   40,    1,    1,    1,    1,    1,
+	  336,  336,  336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+	  336,  336,  336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+	  336,  336,  336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+	  336,  336,  336,  336,  336,  336,  336,  336,  336,  336,  336,  336,
+	  336,  336,  336,  336,  394,  396,    0,  401,  406,  406,  406,   40,
+	   40,   40,  407,  407,    0,  412,    0,  417,    0,  423
 	};
 }
 
 private static final short _hpricot_scan_eof_trans[] = init__hpricot_scan_eof_trans_0();
 
 
-static final int hpricot_scan_start = 204;
+static final int hpricot_scan_start = 198;
 static final int hpricot_scan_error = -1;
 
-static final int hpricot_scan_en_html_comment = 214;
-static final int hpricot_scan_en_html_cdata = 216;
-static final int hpricot_scan_en_html_procins = 218;
-static final int hpricot_scan_en_main = 204;
+static final int hpricot_scan_en_html_comment = 208;
+static final int hpricot_scan_en_html_cdata = 210;
+static final int hpricot_scan_en_html_procins = 212;
+static final int hpricot_scan_en_main = 198;
 
 
 // line 564 "hpricot_scan.java.rl"
@@ -1221,12 +1195,12 @@ static final int hpricot_scan_en_main = 204;
                 data = new byte[buffer_size];
             }
         }
-        
+
         private int len, space;
         // hpricot_scan
         public IRubyObject scan() {
 
-// line 1230 "HpricotScanService.java"
+// line 1204 "HpricotScanService.java"
 	{
 	cs = hpricot_scan_start;
 	ts = -1;
@@ -1238,7 +1212,7 @@ static final int hpricot_scan_en_main = 204;
             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
@@ -1282,7 +1256,7 @@ static final int hpricot_scan_en_main = 204;
                 pe = p + len;
 
                 
-// line 1286 "HpricotScanService.java"
+// line 1260 "HpricotScanService.java"
 	{
 	int _klen;
 	int _trans = 0;
@@ -1307,7 +1281,7 @@ case 1:
 // line 1 "NONE"
 	{ts = p;}
 	break;
-// line 1311 "HpricotScanService.java"
+// line 1285 "HpricotScanService.java"
 		}
 	}
 
@@ -1451,7 +1425,7 @@ case 3:
 	case 14:
 // line 553 "hpricot_scan.java.rl"
 	{
-      if(!S.xml) {
+      if(!S.xml && !akey.isNil()) {
           akey = akey.callMethod(runtime.getCurrentContext(), "downcase");
       }
       ATTR(akey, aval);
@@ -1467,15 +1441,15 @@ case 3:
 	break;
 	case 17:
 // line 50 "hpricot_common.rl"
-	{ EBLK(comment, 3); {cs = 204; _goto_targ = 2; if (true) continue _goto;} }
+	{ EBLK(comment, 3); {cs = 198; _goto_targ = 2; if (true) continue _goto;} }
 	break;
 	case 18:
 // line 55 "hpricot_common.rl"
-	{ EBLK(cdata, 3); {cs = 204; _goto_targ = 2; if (true) continue _goto;} }
+	{ EBLK(cdata, 3); {cs = 198; _goto_targ = 2; if (true) continue _goto;} }
 	break;
 	case 19:
 // line 60 "hpricot_common.rl"
-	{ EBLK(procins, 2); {cs = 204; _goto_targ = 2; if (true) continue _goto;} }
+	{ EBLK(procins, 2); {cs = 198; _goto_targ = 2; if (true) continue _goto;} }
 	break;
 	case 22:
 // line 1 "NONE"
@@ -1563,11 +1537,11 @@ case 3:
 	break;
 	case 43:
 // line 71 "hpricot_common.rl"
-	{te = p+1;{ {cs = 214; _goto_targ = 2; if (true) continue _goto;} }}
+	{te = p+1;{ {cs = 208; _goto_targ = 2; if (true) continue _goto;} }}
 	break;
 	case 44:
 // line 72 "hpricot_common.rl"
-	{te = p+1;{ {cs = 216; _goto_targ = 2; if (true) continue _goto;} }}
+	{te = p+1;{ {cs = 210; _goto_targ = 2; if (true) continue _goto;} }}
 	break;
 	case 45:
 // line 73 "hpricot_common.rl"
@@ -1579,7 +1553,7 @@ case 3:
 	break;
 	case 47:
 // line 67 "hpricot_common.rl"
-	{te = p;p--;{ {cs = 218; _goto_targ = 2; if (true) continue _goto;} }}
+	{te = p;p--;{ {cs = 212; _goto_targ = 2; if (true) continue _goto;} }}
 	break;
 	case 48:
 // line 73 "hpricot_common.rl"
@@ -1587,7 +1561,7 @@ case 3:
 	break;
 	case 49:
 // line 67 "hpricot_common.rl"
-	{{p = ((te))-1;}{ {cs = 218; _goto_targ = 2; if (true) continue _goto;} }}
+	{{p = ((te))-1;}{ {cs = 212; _goto_targ = 2; if (true) continue _goto;} }}
 	break;
 	case 50:
 // line 73 "hpricot_common.rl"
@@ -1611,7 +1585,7 @@ case 3:
 	}
 	}
 	break;
-// line 1615 "HpricotScanService.java"
+// line 1589 "HpricotScanService.java"
 			}
 		}
 	}
@@ -1625,7 +1599,7 @@ case 2:
 // line 1 "NONE"
 	{ts = -1;}
 	break;
-// line 1629 "HpricotScanService.java"
+// line 1603 "HpricotScanService.java"
 		}
 	}
 
@@ -1995,7 +1969,7 @@ case 5:
             klass.defineMethod(id, ref_func[i]);
             klass.defineMethod(id + "=", set_func[i]);
         }
-    
+
         return klass;
     }
 
@@ -2005,11 +1979,11 @@ case 5:
     }
 
     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, 
+        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;