oga 1.3.1-java → 2.0.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3608b688e55076f115741bdb807801c071e30e60
-  data.tar.gz: 11f53bdfb9476c8f4fc1bb34d87492a735558924
+  metadata.gz: f50448db9660d09ac69db525bf1077a43cd9d88d
+  data.tar.gz: 3f7c2ddbba06c6f7f074b74cd7ecb4772a04a45f
 SHA512:
-  metadata.gz: ce3a13a06251539d4d9d16ea8095529606fb6d7a727c49ff8487c15bd62ee4233343e4ef8da5fd11323057607ad18421f8327830d36703b7575311217156625e
-  data.tar.gz: 6156e9bd4ec21b89974cf1e40406938164028c95aeac63207dffe48edbd3689bf3411cd3877e385fb7b38c790676b105c838db6e9eac8b614ae7cc1837b77561
+  metadata.gz: 03b62f7c24779191b677711a5b44d8e8d5a5a0c34a74d2c69614750713393f93abf64e659c94d0d42e4bf72856d91256ba7372947c2d09da7c107ad5f8f2b85c
+  data.tar.gz: ed27ca46e9e9be8a4b264fa62d49597fd04bce912a15060bdb85b7578adbe0633f089e6be53691fc9d0a3266c9ea71f7aa84e2d87d39acce5a8086e43052067b

data/doc/migrating_from_nokogiri.md

@@ -44,19 +44,25 @@ CSS selectors. In Nokogiri one queries a document as following:
     document.xpath('root/foo')
     document.css('root foo')
 
-Oga currently only supports XPath expressions, CSS selectors will be added in
-the near future. Querying documents works similar to Nokogiri:
+Querying documents works similar to Nokogiri:
 
     document = Oga.parse_xml('<root><foo>bar</foo></root>')
 
     document.xpath('root/foo')
 
+or using CSS:
+
+    document = Oga.parse_xml('<root><foo>bar</foo></root>')
+
+    document.css('root foo')
+
 Nokogiri also allows you to query a document and return the first match, opposed
 to an entire node set, using the method `at`. In Nokogiri this method can be
 used for both XPath expression and CSS selectors. Oga has no such method,
 instead it provides the following more dedicated methods:
 
 * `at_xpath`: returns the first node of an XPath expression
+* `at_css`: returns the first node of a CSS expression
 
 For example:
 

data/ext/c/lexer.c

@@ -89,9 +89,10 @@ static const int c_lexer_en_attribute_pre = 73;
 static const int c_lexer_en_unquoted_attribute_value = 75;
 static const int c_lexer_en_quoted_attribute_value = 77;
 static const int c_lexer_en_element_head = 78;
-static const int c_lexer_en_text = 82;
-static const int c_lexer_en_html_script = 86;
-static const int c_lexer_en_html_style = 90;
+static const int c_lexer_en_html_element_head = 82;
+static const int c_lexer_en_text = 86;
+static const int c_lexer_en_html_script = 90;
+static const int c_lexer_en_html_style = 94;
 static const int c_lexer_en_main = 32;
 
 
@@ -158,7 +159,7 @@ VALUE oga_xml_lexer_advance(VALUE self, VALUE data_block)
     lines = state->lines;
 
     
-#line 162 "ext/c/lexer.c"
+#line 163 "ext/c/lexer.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -242,6 +243,10 @@ _again:
 		case 86: goto st86;
 		case 87: goto st87;
 		case 88: goto st88;
+		case 89: goto st89;
+		case 90: goto st90;
+		case 91: goto st91;
+		case 92: goto st92;
 		case 19: goto st19;
 		case 20: goto st20;
 		case 21: goto st21;
@@ -249,17 +254,17 @@ _again:
 		case 23: goto st23;
 		case 24: goto st24;
 		case 25: goto st25;
-		case 89: goto st89;
-		case 90: goto st90;
-		case 91: goto st91;
-		case 92: goto st92;
+		case 93: goto st93;
+		case 94: goto st94;
+		case 95: goto st95;
+		case 96: goto st96;
 		case 26: goto st26;
 		case 27: goto st27;
 		case 28: goto st28;
 		case 29: goto st29;
 		case 30: goto st30;
 		case 31: goto st31;
-		case 93: goto st93;
+		case 97: goto st97;
 	default: break;
 	}
 
@@ -270,15 +275,15 @@ _resume:
 	{
 tr0:
 	( state->cs) = 32;
-#line 565 "ext/ragel/base_lexer.rl"
+#line 618 "ext/ragel/base_lexer.rl"
 	{{p = ((te))-1;}{
         p--;
-        ( state->cs) = 82;
+        ( state->cs) = 86;
     }}
 	goto _again;
 tr4:
 	( state->cs) = 32;
-#line 86 "ext/ragel/base_lexer.rl"
+#line 89 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_comment_start);
 
@@ -287,7 +292,7 @@ tr4:
 	goto _again;
 tr17:
 	( state->cs) = 32;
-#line 125 "ext/ragel/base_lexer.rl"
+#line 128 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_cdata_start);
 
@@ -296,23 +301,23 @@ tr17:
 	goto _again;
 tr39:
 	( state->cs) = 32;
-#line 565 "ext/ragel/base_lexer.rl"
+#line 618 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         p--;
-        ( state->cs) = 82;
+        ( state->cs) = 86;
     }}
 	goto _again;
 tr41:
 	( state->cs) = 32;
-#line 565 "ext/ragel/base_lexer.rl"
+#line 618 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         p--;
-        ( state->cs) = 82;
+        ( state->cs) = 86;
     }}
 	goto _again;
 tr42:
 	( state->cs) = 32;
-#line 368 "ext/ragel/base_lexer.rl"
+#line 371 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         p--;
         ( state->cs) = 69;
@@ -320,14 +325,14 @@ tr42:
 	goto _again;
 tr44:
 	( state->cs) = 32;
-#line 373 "ext/ragel/base_lexer.rl"
+#line 376 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         ( state->cs) = 71;
     }}
 	goto _again;
 tr46:
 	( state->cs) = 32;
-#line 257 "ext/ragel/base_lexer.rl"
+#line 260 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback_simple(id_on_doctype_start);
 
@@ -345,13 +350,13 @@ tr47:
 	( state->cs) = 32;
 #line 1 "NONE"
 	{	switch( ( state->act) ) {
-	case 54:
+	case 60:
 	{{p = ((te))-1;}
         callback_simple(id_on_xml_decl_start);
         ( state->cs) = 66;
     }
 	break;
-	case 57:
+	case 63:
 	{{p = ((te))-1;}
         callback_simple(id_on_proc_ins_start);
         callback(id_on_proc_ins_name, data, encoding, ts + 2, te);
@@ -364,7 +369,7 @@ tr47:
 	goto _again;
 tr48:
 	( state->cs) = 32;
-#line 167 "ext/ragel/base_lexer.rl"
+#line 170 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback_simple(id_on_proc_ins_start);
         callback(id_on_proc_ins_name, data, encoding, ts + 2, te);
@@ -380,7 +385,7 @@ st32:
 case 32:
 #line 1 "NONE"
 	{ts = p;}
-#line 384 "ext/c/lexer.c"
+#line 389 "ext/c/lexer.c"
 	if ( (*p) == 60 )
 		goto tr40;
 	goto tr39;
@@ -392,7 +397,7 @@ st33:
 	if ( ++p == pe )
 		goto _test_eof33;
 case 33:
-#line 396 "ext/c/lexer.c"
+#line 401 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 33: goto st1;
 		case 47: goto tr44;
@@ -495,7 +500,7 @@ case 9:
 		goto tr11;
 	goto tr0;
 tr11:
-#line 58 "ext/ragel/base_lexer.rl"
+#line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
@@ -504,7 +509,7 @@ st34:
 	if ( ++p == pe )
 		goto _test_eof34;
 case 34:
-#line 508 "ext/c/lexer.c"
+#line 513 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 13: goto tr11;
 		case 32: goto tr11;
@@ -578,20 +583,20 @@ case 16:
 tr18:
 #line 1 "NONE"
 	{te = p+1;}
-#line 167 "ext/ragel/base_lexer.rl"
-	{( state->act) = 57;}
+#line 170 "ext/ragel/base_lexer.rl"
+	{( state->act) = 63;}
 	goto st35;
 tr50:
 #line 1 "NONE"
 	{te = p+1;}
-#line 321 "ext/ragel/base_lexer.rl"
-	{( state->act) = 54;}
+#line 324 "ext/ragel/base_lexer.rl"
+	{( state->act) = 60;}
 	goto st35;
 st35:
 	if ( ++p == pe )
 		goto _test_eof35;
 case 35:
-#line 595 "ext/c/lexer.c"
+#line 600 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 47: goto tr47;
 		case 96: goto tr47;
@@ -651,7 +656,7 @@ case 37:
 		goto tr48;
 	goto tr18;
 tr20:
-#line 93 "ext/ragel/base_lexer.rl"
+#line 96 "ext/ragel/base_lexer.rl"
 	{{p = ((te))-1;}{
             callback(id_on_comment_body, data, encoding, ts, te);
 
@@ -665,7 +670,7 @@ tr20:
 	goto st38;
 tr21:
 	( state->cs) = 38;
-#line 104 "ext/ragel/base_lexer.rl"
+#line 107 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_comment_end);
 
@@ -673,7 +678,7 @@ tr21:
         }}
 	goto _again;
 tr53:
-#line 93 "ext/ragel/base_lexer.rl"
+#line 96 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_comment_body, data, encoding, ts, te);
 
@@ -693,12 +698,12 @@ st38:
 case 38:
 #line 1 "NONE"
 	{ts = p;}
-#line 697 "ext/c/lexer.c"
+#line 702 "ext/c/lexer.c"
 	if ( (*p) == 45 )
 		goto tr52;
 	goto tr51;
 tr51:
-#line 58 "ext/ragel/base_lexer.rl"
+#line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
@@ -707,14 +712,14 @@ st39:
 	if ( ++p == pe )
 		goto _test_eof39;
 case 39:
-#line 711 "ext/c/lexer.c"
+#line 716 "ext/c/lexer.c"
 	if ( (*p) == 45 )
 		goto tr53;
 	goto tr51;
 tr52:
 #line 1 "NONE"
 	{te = p+1;}
-#line 58 "ext/ragel/base_lexer.rl"
+#line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
@@ -723,7 +728,7 @@ st40:
 	if ( ++p == pe )
 		goto _test_eof40;
 case 40:
-#line 727 "ext/c/lexer.c"
+#line 732 "ext/c/lexer.c"
 	if ( (*p) == 45 )
 		goto st17;
 	goto tr53;
@@ -735,7 +740,7 @@ case 17:
 		goto tr21;
 	goto tr20;
 tr22:
-#line 132 "ext/ragel/base_lexer.rl"
+#line 135 "ext/ragel/base_lexer.rl"
 	{{p = ((te))-1;}{
             callback(id_on_cdata_body, data, encoding, ts, te);
 
@@ -749,7 +754,7 @@ tr22:
 	goto st41;
 tr23:
 	( state->cs) = 41;
-#line 143 "ext/ragel/base_lexer.rl"
+#line 146 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_cdata_end);
 
@@ -757,7 +762,7 @@ tr23:
         }}
 	goto _again;
 tr57:
-#line 132 "ext/ragel/base_lexer.rl"
+#line 135 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_cdata_body, data, encoding, ts, te);
 
@@ -777,12 +782,12 @@ st41:
 case 41:
 #line 1 "NONE"
 	{ts = p;}
-#line 781 "ext/c/lexer.c"
+#line 786 "ext/c/lexer.c"
 	if ( (*p) == 93 )
 		goto tr56;
 	goto tr55;
 tr55:
-#line 58 "ext/ragel/base_lexer.rl"
+#line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
@@ -791,14 +796,14 @@ st42:
 	if ( ++p == pe )
 		goto _test_eof42;
 case 42:
-#line 795 "ext/c/lexer.c"
+#line 800 "ext/c/lexer.c"
 	if ( (*p) == 93 )
 		goto tr57;
 	goto tr55;
 tr56:
 #line 1 "NONE"
 	{te = p+1;}
-#line 58 "ext/ragel/base_lexer.rl"
+#line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
@@ -807,7 +812,7 @@ st43:
 	if ( ++p == pe )
 		goto _test_eof43;
 case 43:
-#line 811 "ext/c/lexer.c"
+#line 816 "ext/c/lexer.c"
 	if ( (*p) == 93 )
 		goto st18;
 	goto tr57;
@@ -819,7 +824,7 @@ case 18:
 		goto tr23;
 	goto tr22;
 tr61:
-#line 175 "ext/ragel/base_lexer.rl"
+#line 178 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_proc_ins_body, data, encoding, ts, te);
 
@@ -833,7 +838,7 @@ tr61:
 	goto st44;
 tr62:
 	( state->cs) = 44;
-#line 186 "ext/ragel/base_lexer.rl"
+#line 189 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_proc_ins_end);
 
@@ -848,12 +853,12 @@ st44:
 case 44:
 #line 1 "NONE"
 	{ts = p;}
-#line 852 "ext/c/lexer.c"
+#line 857 "ext/c/lexer.c"
 	if ( (*p) == 63 )
 		goto tr60;
 	goto tr59;
 tr59:
-#line 58 "ext/ragel/base_lexer.rl"
+#line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
@@ -862,12 +867,12 @@ st45:
 	if ( ++p == pe )
 		goto _test_eof45;
 case 45:
-#line 866 "ext/c/lexer.c"
+#line 871 "ext/c/lexer.c"
 	if ( (*p) == 63 )
 		goto tr61;
 	goto tr59;
 tr60:
-#line 58 "ext/ragel/base_lexer.rl"
+#line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
@@ -876,12 +881,12 @@ st46:
 	if ( ++p == pe )
 		goto _test_eof46;
 case 46:
-#line 880 "ext/c/lexer.c"
+#line 885 "ext/c/lexer.c"
 	if ( (*p) == 62 )
 		goto tr62;
 	goto tr61;
 tr64:
-#line 228 "ext/ragel/base_lexer.rl"
+#line 231 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_string_squote);
 
@@ -889,7 +894,7 @@ tr64:
         }}
 	goto st47;
 tr65:
-#line 202 "ext/ragel/base_lexer.rl"
+#line 205 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback(id_on_string_body, data, encoding, ts, te);
 
@@ -909,12 +914,12 @@ st47:
 case 47:
 #line 1 "NONE"
 	{ts = p;}
-#line 913 "ext/c/lexer.c"
+#line 918 "ext/c/lexer.c"
 	if ( (*p) == 39 )
 		goto tr64;
 	goto tr63;
 tr63:
-#line 58 "ext/ragel/base_lexer.rl"
+#line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
@@ -923,12 +928,12 @@ st48:
 	if ( ++p == pe )
 		goto _test_eof48;
 case 48:
-#line 927 "ext/c/lexer.c"
+#line 932 "ext/c/lexer.c"
 	if ( (*p) == 39 )
 		goto tr65;
 	goto tr63;
 tr67:
-#line 238 "ext/ragel/base_lexer.rl"
+#line 241 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_string_dquote);
 
@@ -936,7 +941,7 @@ tr67:
         }}
 	goto st49;
 tr68:
-#line 202 "ext/ragel/base_lexer.rl"
+#line 205 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback(id_on_string_body, data, encoding, ts, te);
 
@@ -956,12 +961,12 @@ st49:
 case 49:
 #line 1 "NONE"
 	{ts = p;}
-#line 960 "ext/c/lexer.c"
+#line 965 "ext/c/lexer.c"
 	if ( (*p) == 34 )
 		goto tr67;
 	goto tr66;
 tr66:
-#line 58 "ext/ragel/base_lexer.rl"
+#line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
@@ -970,17 +975,17 @@ st50:
 	if ( ++p == pe )
 		goto _test_eof50;
 case 50:
-#line 974 "ext/c/lexer.c"
+#line 979 "ext/c/lexer.c"
 	if ( (*p) == 34 )
 		goto tr68;
 	goto tr66;
 tr70:
 	( state->cs) = 51;
-#line 283 "ext/ragel/base_lexer.rl"
+#line 286 "ext/ragel/base_lexer.rl"
 	{te = p+1;{ ( state->cs) = 53; }}
 	goto _again;
 tr71:
-#line 272 "ext/ragel/base_lexer.rl"
+#line 275 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_doctype_inline, data, encoding, ts, te);
 
@@ -1000,12 +1005,12 @@ st51:
 case 51:
 #line 1 "NONE"
 	{ts = p;}
-#line 1004 "ext/c/lexer.c"
+#line 1009 "ext/c/lexer.c"
 	if ( (*p) == 93 )
 		goto tr70;
 	goto tr69;
 tr69:
-#line 58 "ext/ragel/base_lexer.rl"
+#line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
@@ -1014,22 +1019,22 @@ st52:
 	if ( ++p == pe )
 		goto _test_eof52;
 case 52:
-#line 1018 "ext/c/lexer.c"
+#line 1023 "ext/c/lexer.c"
 	if ( (*p) == 93 )
 		goto tr71;
 	goto tr69;
 tr73:
-#line 311 "ext/ragel/base_lexer.rl"
+#line 314 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
 	goto st53;
 tr75:
-#line 62 "ext/ragel/base_lexer.rl"
+#line 65 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         advance_line(1);
     }}
 	goto st53;
 tr77:
-#line 219 "ext/ragel/base_lexer.rl"
+#line 222 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_string_dquote);
 
@@ -1037,7 +1042,7 @@ tr77:
     }}
 	goto st53;
 tr78:
-#line 213 "ext/ragel/base_lexer.rl"
+#line 216 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_string_squote);
 
@@ -1046,7 +1051,7 @@ tr78:
 	goto st53;
 tr79:
 	( state->cs) = 53;
-#line 304 "ext/ragel/base_lexer.rl"
+#line 307 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_doctype_end);
             ( state->cs) = 32;
@@ -1054,7 +1059,7 @@ tr79:
 	goto _again;
 tr82:
 	( state->cs) = 53;
-#line 294 "ext/ragel/base_lexer.rl"
+#line 297 "ext/ragel/base_lexer.rl"
 	{te = p+1;{ ( state->cs) = 51; }}
 	goto _again;
 tr83:
@@ -1074,13 +1079,13 @@ tr83:
 	}
 	goto st53;
 tr84:
-#line 62 "ext/ragel/base_lexer.rl"
+#line 65 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         advance_line(1);
     }}
 	goto st53;
 tr85:
-#line 300 "ext/ragel/base_lexer.rl"
+#line 303 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_doctype_name, data, encoding, ts, te);
         }}
@@ -1093,7 +1098,7 @@ st53:
 case 53:
 #line 1 "NONE"
 	{ts = p;}
-#line 1097 "ext/c/lexer.c"
+#line 1102 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 9: goto tr73;
 		case 10: goto tr75;
@@ -1123,20 +1128,20 @@ case 53:
 tr72:
 #line 1 "NONE"
 	{te = p+1;}
-#line 300 "ext/ragel/base_lexer.rl"
+#line 303 "ext/ragel/base_lexer.rl"
 	{( state->act) = 17;}
 	goto st54;
 tr90:
 #line 1 "NONE"
 	{te = p+1;}
-#line 289 "ext/ragel/base_lexer.rl"
+#line 292 "ext/ragel/base_lexer.rl"
 	{( state->act) = 13;}
 	goto st54;
 st54:
 	if ( ++p == pe )
 		goto _test_eof54;
 case 54:
-#line 1140 "ext/c/lexer.c"
+#line 1145 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 47: goto tr83;
 		case 96: goto tr83;
@@ -1374,39 +1379,39 @@ case 65:
 		goto tr85;
 	goto tr72;
 tr96:
-#line 58 "ext/ragel/base_lexer.rl"
+#line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-#line 356 "ext/ragel/base_lexer.rl"
+#line 359 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
 	goto st66;
 tr97:
-#line 219 "ext/ragel/base_lexer.rl"
+#line 222 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_string_dquote);
 
         {( state->stack)[( state->top)++] = 66; goto st49;}
     }}
-#line 58 "ext/ragel/base_lexer.rl"
+#line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
 	goto st66;
 tr98:
-#line 213 "ext/ragel/base_lexer.rl"
+#line 216 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_string_squote);
 
         {( state->stack)[( state->top)++] = 66; goto st47;}
     }}
-#line 58 "ext/ragel/base_lexer.rl"
+#line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
 	goto st66;
 tr100:
-#line 342 "ext/ragel/base_lexer.rl"
+#line 345 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             if ( lines > 0 )
             {
@@ -1419,12 +1424,12 @@ tr100:
         }}
 	goto st66;
 tr102:
-#line 356 "ext/ragel/base_lexer.rl"
+#line 359 "ext/ragel/base_lexer.rl"
 	{te = p;p--;}
 	goto st66;
 tr103:
 	( state->cs) = 66;
-#line 328 "ext/ragel/base_lexer.rl"
+#line 331 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             if ( lines > 0 )
             {
@@ -1446,7 +1451,7 @@ st66:
 case 66:
 #line 1 "NONE"
 	{ts = p;}
-#line 1450 "ext/c/lexer.c"
+#line 1455 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 34: goto tr97;
 		case 39: goto tr98;
@@ -1467,7 +1472,7 @@ case 66:
 		goto tr96;
 	goto tr95;
 tr95:
-#line 58 "ext/ragel/base_lexer.rl"
+#line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
@@ -1476,7 +1481,7 @@ st67:
 	if ( ++p == pe )
 		goto _test_eof67;
 case 67:
-#line 1480 "ext/c/lexer.c"
+#line 1485 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 47: goto tr100;
 		case 96: goto tr100;
@@ -1494,7 +1499,7 @@ case 67:
 		goto tr100;
 	goto st67;
 tr99:
-#line 58 "ext/ragel/base_lexer.rl"
+#line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
@@ -1503,22 +1508,33 @@ st68:
 	if ( ++p == pe )
 		goto _test_eof68;
 case 68:
-#line 1507 "ext/c/lexer.c"
+#line 1512 "ext/c/lexer.c"
 	if ( (*p) == 62 )
 		goto tr103;
 	goto tr102;
 tr105:
 	( state->cs) = 69;
-#line 396 "ext/ragel/base_lexer.rl"
+#line 402 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_element_name, data, encoding, ts, te);
-            ( state->cs) = 78;
+
+            if ( html_p )
+            {
+                ( state->cs) = 82;
+            }
+            else
+            {
+                ( state->cs) = 78;
+            }
         }}
 	goto _again;
 tr106:
-#line 392 "ext/ragel/base_lexer.rl"
+#line 395 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
-            callback(id_on_element_ns, data, encoding, ts, te - 1);
+            if ( !html_p )
+            {
+                callback(id_on_element_ns, data, encoding, ts, te - 1);
+            }
         }}
 	goto st69;
 st69:
@@ -1529,7 +1545,7 @@ st69:
 case 69:
 #line 1 "NONE"
 	{ts = p;}
-#line 1533 "ext/c/lexer.c"
+#line 1549 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 47: goto st0;
 		case 96: goto st0;
@@ -1568,16 +1584,16 @@ case 70:
 		goto tr105;
 	goto st70;
 tr108:
-#line 58 "ext/ragel/base_lexer.rl"
+#line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-#line 421 "ext/ragel/base_lexer.rl"
+#line 435 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
 	goto st71;
 tr109:
 	( state->cs) = 71;
-#line 410 "ext/ragel/base_lexer.rl"
+#line 424 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             if ( lines > 0 )
             {
@@ -1588,19 +1604,19 @@ tr109:
 
             ( state->cs) = 32;
         }}
-#line 58 "ext/ragel/base_lexer.rl"
+#line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
 	goto _again;
 tr110:
-#line 377 "ext/ragel/base_lexer.rl"
+#line 380 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback(id_on_element_end, data, encoding, ts, te);
     }}
 	goto st71;
 tr112:
-#line 406 "ext/ragel/base_lexer.rl"
+#line 420 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
 	goto st71;
 st71:
@@ -1611,7 +1627,7 @@ st71:
 case 71:
 #line 1 "NONE"
 	{ts = p;}
-#line 1615 "ext/c/lexer.c"
+#line 1631 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 47: goto tr108;
 		case 62: goto tr109;
@@ -1630,7 +1646,7 @@ case 71:
 		goto tr108;
 	goto tr107;
 tr107:
-#line 58 "ext/ragel/base_lexer.rl"
+#line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
@@ -1639,7 +1655,7 @@ st72:
 	if ( ++p == pe )
 		goto _test_eof72;
 case 72:
-#line 1643 "ext/c/lexer.c"
+#line 1659 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 47: goto tr110;
 		case 58: goto tr112;
@@ -1659,7 +1675,7 @@ case 72:
 	goto st72;
 tr113:
 	( state->cs) = 73;
-#line 442 "ext/ragel/base_lexer.rl"
+#line 456 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             p--;
 
@@ -1682,16 +1698,16 @@ tr113:
         }}
 	goto _again;
 tr114:
-#line 58 "ext/ragel/base_lexer.rl"
+#line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-#line 427 "ext/ragel/base_lexer.rl"
+#line 441 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
 	goto st73;
 tr116:
 	( state->cs) = 73;
-#line 429 "ext/ragel/base_lexer.rl"
+#line 443 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             p--;
 
@@ -1706,7 +1722,7 @@ tr116:
         }}
 	goto _again;
 tr117:
-#line 427 "ext/ragel/base_lexer.rl"
+#line 441 "ext/ragel/base_lexer.rl"
 	{te = p;p--;}
 	goto st73;
 st73:
@@ -1717,7 +1733,7 @@ st73:
 case 73:
 #line 1 "NONE"
 	{ts = p;}
-#line 1721 "ext/c/lexer.c"
+#line 1737 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 13: goto tr115;
 		case 32: goto tr114;
@@ -1728,7 +1744,7 @@ case 73:
 		goto tr114;
 	goto tr113;
 tr115:
-#line 58 "ext/ragel/base_lexer.rl"
+#line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
@@ -1737,19 +1753,19 @@ st74:
 	if ( ++p == pe )
 		goto _test_eof74;
 case 74:
-#line 1741 "ext/c/lexer.c"
+#line 1757 "ext/c/lexer.c"
 	if ( (*p) == 10 )
 		goto tr114;
 	goto tr117;
 tr119:
-#line 66 "ext/ragel/base_lexer.rl"
+#line 69 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         p--;
         {( state->cs) = ( state->stack)[--( state->top)];goto _again;}
     }}
 	goto st75;
 tr120:
-#line 480 "ext/ragel/base_lexer.rl"
+#line 494 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback_simple(id_on_string_squote);
 
@@ -1766,7 +1782,7 @@ st75:
 case 75:
 #line 1 "NONE"
 	{ts = p;}
-#line 1770 "ext/c/lexer.c"
+#line 1786 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 13: goto tr119;
 		case 32: goto tr119;
@@ -1788,7 +1804,7 @@ case 76:
 		goto tr120;
 	goto st76;
 tr121:
-#line 66 "ext/ragel/base_lexer.rl"
+#line 69 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         p--;
         {( state->cs) = ( state->stack)[--( state->top)];goto _again;}
@@ -1796,7 +1812,7 @@ tr121:
 	goto st77;
 tr122:
 	( state->cs) = 77;
-#line 502 "ext/ragel/base_lexer.rl"
+#line 516 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_string_dquote);
 
@@ -1805,7 +1821,7 @@ tr122:
 	goto _again;
 tr123:
 	( state->cs) = 77;
-#line 496 "ext/ragel/base_lexer.rl"
+#line 510 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_string_squote);
 
@@ -1820,77 +1836,66 @@ st77:
 case 77:
 #line 1 "NONE"
 	{ts = p;}
-#line 1824 "ext/c/lexer.c"
+#line 1840 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 34: goto tr122;
 		case 39: goto tr123;
 	}
 	goto tr121;
 tr125:
-#line 554 "ext/ragel/base_lexer.rl"
+#line 574 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
 	goto st78;
 tr126:
-#line 62 "ext/ragel/base_lexer.rl"
+#line 65 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         advance_line(1);
     }}
 	goto st78;
 tr129:
-#line 526 "ext/ragel/base_lexer.rl"
+#line 525 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
-            {( state->stack)[( state->top)++] = 78; goto st73;}
-        }}
+        {( state->stack)[( state->top)++] = 78; goto st73;}
+    }}
 	goto st78;
 tr130:
 	( state->cs) = 78;
-#line 531 "ext/ragel/base_lexer.rl"
+#line 566 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_element_open_end);
 
-            if ( html_script_p() )
-            {
-                ( state->cs) = 86;
-            }
-            else if ( html_style_p() )
-            {
-                ( state->cs) = 90;
-            }
-            else
-            {
-                ( state->cs) = 32;
-            }
+            ( state->cs) = 32;
         }}
 	goto _again;
 tr131:
-#line 521 "ext/ragel/base_lexer.rl"
+#line 560 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_attribute, data, encoding, ts, te);
         }}
 	goto st78;
 tr132:
-#line 517 "ext/ragel/base_lexer.rl"
+#line 556 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback(id_on_attribute_ns, data, encoding, ts, te - 1);
         }}
 	goto st78;
 tr133:
-#line 62 "ext/ragel/base_lexer.rl"
+#line 65 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         advance_line(1);
     }}
 	goto st78;
 tr134:
-#line 554 "ext/ragel/base_lexer.rl"
+#line 574 "ext/ragel/base_lexer.rl"
 	{te = p;p--;}
 	goto st78;
 tr135:
 	( state->cs) = 78;
-#line 549 "ext/ragel/base_lexer.rl"
+#line 546 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
-            callback_simple(id_on_element_end);
-            ( state->cs) = 32;
-        }}
+        callback_simple(id_on_element_end);
+        ( state->cs) = 32;
+    }}
 	goto _again;
 st78:
 #line 1 "NONE"
@@ -1900,7 +1905,7 @@ st78:
 case 78:
 #line 1 "NONE"
 	{ts = p;}
-#line 1904 "ext/c/lexer.c"
+#line 1909 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 10: goto tr126;
 		case 13: goto st80;
@@ -1956,9 +1961,132 @@ case 81:
 	if ( (*p) == 62 )
 		goto tr135;
 	goto tr134;
+tr137:
+#line 607 "ext/ragel/base_lexer.rl"
+	{te = p+1;}
+	goto st82;
 tr138:
+#line 65 "ext/ragel/base_lexer.rl"
+	{te = p+1;{
+        advance_line(1);
+    }}
+	goto st82;
+tr141:
+#line 525 "ext/ragel/base_lexer.rl"
+	{te = p+1;{
+        {( state->stack)[( state->top)++] = 82; goto st73;}
+    }}
+	goto st82;
+tr142:
 	( state->cs) = 82;
-#line 591 "ext/ragel/base_lexer.rl"
+#line 588 "ext/ragel/base_lexer.rl"
+	{te = p+1;{
+            callback_simple(id_on_element_open_end);
+
+            if ( html_script_p() )
+            {
+                ( state->cs) = 90;
+            }
+            else if ( html_style_p() )
+            {
+                ( state->cs) = 94;
+            }
+            else
+            {
+                ( state->cs) = 32;
+            }
+        }}
+	goto _again;
+tr143:
+#line 582 "ext/ragel/base_lexer.rl"
+	{te = p;p--;{
+            callback(id_on_attribute, data, encoding, ts, te);
+        }}
+	goto st82;
+tr144:
+#line 65 "ext/ragel/base_lexer.rl"
+	{te = p;p--;{
+        advance_line(1);
+    }}
+	goto st82;
+tr145:
+#line 607 "ext/ragel/base_lexer.rl"
+	{te = p;p--;}
+	goto st82;
+tr146:
+	( state->cs) = 82;
+#line 546 "ext/ragel/base_lexer.rl"
+	{te = p+1;{
+        callback_simple(id_on_element_end);
+        ( state->cs) = 32;
+    }}
+	goto _again;
+st82:
+#line 1 "NONE"
+	{ts = 0;}
+	if ( ++p == pe )
+		goto _test_eof82;
+case 82:
+#line 1 "NONE"
+	{ts = p;}
+#line 2033 "ext/c/lexer.c"
+	switch( (*p) ) {
+		case 10: goto tr138;
+		case 13: goto st84;
+		case 47: goto st85;
+		case 61: goto tr141;
+		case 62: goto tr142;
+		case 96: goto tr137;
+	}
+	if ( (*p) < 59 ) {
+		if ( 0 <= (*p) && (*p) <= 44 )
+			goto tr137;
+	} else if ( (*p) > 64 ) {
+		if ( (*p) > 94 ) {
+			if ( 123 <= (*p) )
+				goto tr137;
+		} else if ( (*p) >= 91 )
+			goto tr137;
+	} else
+		goto tr137;
+	goto st83;
+st83:
+	if ( ++p == pe )
+		goto _test_eof83;
+case 83:
+	switch( (*p) ) {
+		case 47: goto tr143;
+		case 96: goto tr143;
+	}
+	if ( (*p) < 59 ) {
+		if ( 0 <= (*p) && (*p) <= 44 )
+			goto tr143;
+	} else if ( (*p) > 64 ) {
+		if ( (*p) > 94 ) {
+			if ( 123 <= (*p) )
+				goto tr143;
+		} else if ( (*p) >= 91 )
+			goto tr143;
+	} else
+		goto tr143;
+	goto st83;
+st84:
+	if ( ++p == pe )
+		goto _test_eof84;
+case 84:
+	if ( (*p) == 10 )
+		goto tr138;
+	goto tr144;
+st85:
+	if ( ++p == pe )
+		goto _test_eof85;
+case 85:
+	if ( (*p) == 62 )
+		goto tr146;
+	goto tr145;
+tr149:
+	( state->cs) = 86;
+#line 644 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_text, data, encoding, ts, te);
 
@@ -1972,9 +2100,9 @@ tr138:
             ( state->cs) = 32;
         }}
 	goto _again;
-tr140:
-	( state->cs) = 82;
-#line 605 "ext/ragel/base_lexer.rl"
+tr151:
+	( state->cs) = 86;
+#line 658 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback(id_on_text, data, encoding, ts, mark);
 
@@ -1991,9 +2119,9 @@ tr140:
             ( state->cs) = 32;
         }}
 	goto _again;
-tr141:
-	( state->cs) = 82;
-#line 591 "ext/ragel/base_lexer.rl"
+tr152:
+	( state->cs) = 86;
+#line 644 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback(id_on_text, data, encoding, ts, te);
 
@@ -2007,100 +2135,100 @@ tr141:
             ( state->cs) = 32;
         }}
 	goto _again;
-st82:
+st86:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof82;
-case 82:
+		goto _test_eof86;
+case 86:
 #line 1 "NONE"
 	{ts = p;}
-#line 2019 "ext/c/lexer.c"
+#line 2147 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr137;
-	goto tr136;
-tr136:
-#line 58 "ext/ragel/base_lexer.rl"
+		goto tr148;
+	goto tr147;
+tr147:
+#line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st83;
-st83:
+	goto st87;
+st87:
 	if ( ++p == pe )
-		goto _test_eof83;
-case 83:
-#line 2033 "ext/c/lexer.c"
+		goto _test_eof87;
+case 87:
+#line 2161 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr139;
-	goto tr136;
-tr139:
-#line 58 "ext/ragel/base_lexer.rl"
+		goto tr150;
+	goto tr147;
+tr150:
+#line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-#line 605 "ext/ragel/base_lexer.rl"
+#line 658 "ext/ragel/base_lexer.rl"
 	{ mark = p; }
-	goto st84;
-st84:
+	goto st88;
+st88:
 	if ( ++p == pe )
-		goto _test_eof84;
-case 84:
-#line 2049 "ext/c/lexer.c"
+		goto _test_eof88;
+case 88:
+#line 2177 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 60: goto tr139;
-		case 64: goto tr136;
-		case 96: goto tr136;
+		case 60: goto tr150;
+		case 64: goto tr147;
+		case 96: goto tr147;
 	}
 	if ( (*p) < 58 ) {
 		if ( (*p) > 32 ) {
 			if ( 34 <= (*p) && (*p) <= 44 )
-				goto tr136;
+				goto tr147;
 		} else if ( (*p) >= 0 )
-			goto tr136;
+			goto tr147;
 	} else if ( (*p) > 62 ) {
 		if ( (*p) > 94 ) {
 			if ( 123 <= (*p) )
-				goto tr136;
+				goto tr147;
 		} else if ( (*p) >= 91 )
-			goto tr136;
+			goto tr147;
 	} else
-		goto tr136;
-	goto tr140;
-tr137:
-#line 58 "ext/ragel/base_lexer.rl"
+		goto tr147;
+	goto tr151;
+tr148:
+#line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-#line 605 "ext/ragel/base_lexer.rl"
+#line 658 "ext/ragel/base_lexer.rl"
 	{ mark = p; }
-	goto st85;
-st85:
+	goto st89;
+st89:
 	if ( ++p == pe )
-		goto _test_eof85;
-case 85:
-#line 2082 "ext/c/lexer.c"
+		goto _test_eof89;
+case 89:
+#line 2210 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 60: goto tr139;
-		case 64: goto tr136;
-		case 96: goto tr136;
+		case 60: goto tr150;
+		case 64: goto tr147;
+		case 96: goto tr147;
 	}
 	if ( (*p) < 58 ) {
 		if ( (*p) > 32 ) {
 			if ( 34 <= (*p) && (*p) <= 44 )
-				goto tr136;
+				goto tr147;
 		} else if ( (*p) >= 0 )
-			goto tr136;
+			goto tr147;
 	} else if ( (*p) > 62 ) {
 		if ( (*p) > 94 ) {
 			if ( 123 <= (*p) )
-				goto tr136;
+				goto tr147;
 		} else if ( (*p) >= 91 )
-			goto tr136;
+			goto tr147;
 	} else
-		goto tr136;
-	goto tr141;
+		goto tr147;
+	goto tr152;
 tr24:
-#line 579 "ext/ragel/base_lexer.rl"
+#line 632 "ext/ragel/base_lexer.rl"
 	{{p = ((te))-1;}{
         callback(id_on_text, data, encoding, ts, te);
 
@@ -2111,18 +2239,18 @@ tr24:
             lines = 0;
         }
     }}
-	goto st86;
+	goto st90;
 tr31:
-	( state->cs) = 86;
-#line 381 "ext/ragel/base_lexer.rl"
+	( state->cs) = 90;
+#line 384 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_element_end);
 
         ( state->cs) = 32;
     }}
 	goto _again;
-tr144:
-#line 579 "ext/ragel/base_lexer.rl"
+tr155:
+#line 632 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback(id_on_text, data, encoding, ts, te);
 
@@ -2133,51 +2261,51 @@ tr144:
             lines = 0;
         }
     }}
-	goto st86;
-st86:
+	goto st90;
+st90:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof86;
-case 86:
+		goto _test_eof90;
+case 90:
 #line 1 "NONE"
 	{ts = p;}
-#line 2146 "ext/c/lexer.c"
+#line 2274 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr143;
-	goto tr142;
-tr142:
-#line 58 "ext/ragel/base_lexer.rl"
+		goto tr154;
+	goto tr153;
+tr153:
+#line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st87;
-st87:
+	goto st91;
+st91:
 	if ( ++p == pe )
-		goto _test_eof87;
-case 87:
-#line 2160 "ext/c/lexer.c"
+		goto _test_eof91;
+case 91:
+#line 2288 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr144;
-	goto tr142;
-tr143:
+		goto tr155;
+	goto tr153;
+tr154:
 #line 1 "NONE"
 	{te = p+1;}
-#line 58 "ext/ragel/base_lexer.rl"
+#line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st88;
-st88:
+	goto st92;
+st92:
 	if ( ++p == pe )
-		goto _test_eof88;
-case 88:
-#line 2176 "ext/c/lexer.c"
+		goto _test_eof92;
+case 92:
+#line 2304 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 47: goto st19;
-		case 60: goto tr146;
+		case 60: goto tr157;
 	}
-	goto tr144;
+	goto tr155;
 st19:
 	if ( ++p == pe )
 		goto _test_eof19;
@@ -2227,22 +2355,22 @@ case 25:
 	if ( (*p) == 62 )
 		goto tr31;
 	goto tr24;
-tr146:
-#line 58 "ext/ragel/base_lexer.rl"
+tr157:
+#line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st89;
-st89:
+	goto st93;
+st93:
 	if ( ++p == pe )
-		goto _test_eof89;
-case 89:
-#line 2241 "ext/c/lexer.c"
+		goto _test_eof93;
+case 93:
+#line 2369 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr146;
-	goto tr144;
+		goto tr157;
+	goto tr155;
 tr32:
-#line 579 "ext/ragel/base_lexer.rl"
+#line 632 "ext/ragel/base_lexer.rl"
 	{{p = ((te))-1;}{
         callback(id_on_text, data, encoding, ts, te);
 
@@ -2253,18 +2381,18 @@ tr32:
             lines = 0;
         }
     }}
-	goto st90;
+	goto st94;
 tr38:
-	( state->cs) = 90;
-#line 381 "ext/ragel/base_lexer.rl"
+	( state->cs) = 94;
+#line 384 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_element_end);
 
         ( state->cs) = 32;
     }}
 	goto _again;
-tr149:
-#line 579 "ext/ragel/base_lexer.rl"
+tr160:
+#line 632 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback(id_on_text, data, encoding, ts, te);
 
@@ -2275,51 +2403,51 @@ tr149:
             lines = 0;
         }
     }}
-	goto st90;
-st90:
+	goto st94;
+st94:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof90;
-case 90:
+		goto _test_eof94;
+case 94:
 #line 1 "NONE"
 	{ts = p;}
-#line 2288 "ext/c/lexer.c"
+#line 2416 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr148;
-	goto tr147;
-tr147:
-#line 58 "ext/ragel/base_lexer.rl"
+		goto tr159;
+	goto tr158;
+tr158:
+#line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st91;
-st91:
+	goto st95;
+st95:
 	if ( ++p == pe )
-		goto _test_eof91;
-case 91:
-#line 2302 "ext/c/lexer.c"
+		goto _test_eof95;
+case 95:
+#line 2430 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr149;
-	goto tr147;
-tr148:
+		goto tr160;
+	goto tr158;
+tr159:
 #line 1 "NONE"
 	{te = p+1;}
-#line 58 "ext/ragel/base_lexer.rl"
+#line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st92;
-st92:
+	goto st96;
+st96:
 	if ( ++p == pe )
-		goto _test_eof92;
-case 92:
-#line 2318 "ext/c/lexer.c"
+		goto _test_eof96;
+case 96:
+#line 2446 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 47: goto st26;
-		case 60: goto tr151;
+		case 60: goto tr162;
 	}
-	goto tr149;
+	goto tr160;
 st26:
 	if ( ++p == pe )
 		goto _test_eof26;
@@ -2362,20 +2490,20 @@ case 31:
 	if ( (*p) == 62 )
 		goto tr38;
 	goto tr32;
-tr151:
-#line 58 "ext/ragel/base_lexer.rl"
+tr162:
+#line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st93;
-st93:
+	goto st97;
+st97:
 	if ( ++p == pe )
-		goto _test_eof93;
-case 93:
-#line 2376 "ext/c/lexer.c"
+		goto _test_eof97;
+case 97:
+#line 2504 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr151;
-	goto tr149;
+		goto tr162;
+	goto tr160;
 	}
 	_test_eof32: ( state->cs) = 32; goto _test_eof; 
 	_test_eof33: ( state->cs) = 33; goto _test_eof; 
@@ -2452,6 +2580,10 @@ case 93:
 	_test_eof86: ( state->cs) = 86; goto _test_eof; 
 	_test_eof87: ( state->cs) = 87; goto _test_eof; 
 	_test_eof88: ( state->cs) = 88; goto _test_eof; 
+	_test_eof89: ( state->cs) = 89; goto _test_eof; 
+	_test_eof90: ( state->cs) = 90; goto _test_eof; 
+	_test_eof91: ( state->cs) = 91; goto _test_eof; 
+	_test_eof92: ( state->cs) = 92; goto _test_eof; 
 	_test_eof19: ( state->cs) = 19; goto _test_eof; 
 	_test_eof20: ( state->cs) = 20; goto _test_eof; 
 	_test_eof21: ( state->cs) = 21; goto _test_eof; 
@@ -2459,17 +2591,17 @@ case 93:
 	_test_eof23: ( state->cs) = 23; goto _test_eof; 
 	_test_eof24: ( state->cs) = 24; goto _test_eof; 
 	_test_eof25: ( state->cs) = 25; goto _test_eof; 
-	_test_eof89: ( state->cs) = 89; goto _test_eof; 
-	_test_eof90: ( state->cs) = 90; goto _test_eof; 
-	_test_eof91: ( state->cs) = 91; goto _test_eof; 
-	_test_eof92: ( state->cs) = 92; goto _test_eof; 
+	_test_eof93: ( state->cs) = 93; goto _test_eof; 
+	_test_eof94: ( state->cs) = 94; goto _test_eof; 
+	_test_eof95: ( state->cs) = 95; goto _test_eof; 
+	_test_eof96: ( state->cs) = 96; goto _test_eof; 
 	_test_eof26: ( state->cs) = 26; goto _test_eof; 
 	_test_eof27: ( state->cs) = 27; goto _test_eof; 
 	_test_eof28: ( state->cs) = 28; goto _test_eof; 
 	_test_eof29: ( state->cs) = 29; goto _test_eof; 
 	_test_eof30: ( state->cs) = 30; goto _test_eof; 
 	_test_eof31: ( state->cs) = 31; goto _test_eof; 
-	_test_eof93: ( state->cs) = 93; goto _test_eof; 
+	_test_eof97: ( state->cs) = 97; goto _test_eof; 
 
 	_test_eof: {}
 	if ( p == eof )
@@ -2528,11 +2660,14 @@ case 93:
 	case 79: goto tr131;
 	case 80: goto tr133;
 	case 81: goto tr134;
-	case 83: goto tr138;
-	case 84: goto tr138;
-	case 85: goto tr138;
-	case 87: goto tr144;
-	case 88: goto tr144;
+	case 83: goto tr143;
+	case 84: goto tr144;
+	case 85: goto tr145;
+	case 87: goto tr149;
+	case 88: goto tr149;
+	case 89: goto tr149;
+	case 91: goto tr155;
+	case 92: goto tr155;
 	case 19: goto tr24;
 	case 20: goto tr24;
 	case 21: goto tr24;
@@ -2540,16 +2675,16 @@ case 93:
 	case 23: goto tr24;
 	case 24: goto tr24;
 	case 25: goto tr24;
-	case 89: goto tr144;
-	case 91: goto tr149;
-	case 92: goto tr149;
+	case 93: goto tr155;
+	case 95: goto tr160;
+	case 96: goto tr160;
 	case 26: goto tr32;
 	case 27: goto tr32;
 	case 28: goto tr32;
 	case 29: goto tr32;
 	case 30: goto tr32;
 	case 31: goto tr32;
-	case 93: goto tr149;
+	case 97: goto tr160;
 	}
 	}