oga 2.11 → 2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1b540a9f445ed303bc177df0a6207bfb07d84c7e
-  data.tar.gz: c74ab206a3728fa865751932c7f9e5e08b11e107
+SHA256:
+  metadata.gz: 2267ebf8ba6a58b91153e72833f671ad55470d759d93816fd3084b05c2aa6ca5
+  data.tar.gz: a34fee2348bc6492a1f6c3c24eee976479ede3dac290cd74f58568da6e4884ca
 SHA512:
-  metadata.gz: 3df865a3fee82becc0d8ab5d390b4faf55ff44791297d22bdd599de1ca68419a88a1677e7354683e006cedb8fa3badc106d1ff063aae981c0e23bc72e101a656
-  data.tar.gz: cb434d0175f1e158dcdb964af3949966d9b1a0a7a24029e9359232b4f741109de182c8b3d0a1ad1ccf6906945082acd0a0a8f61b19b8b3bae19d1ddc3ac1ba0f
+  metadata.gz: 4bd99edf8a7e785fd13be6590b9dcad5c9ddc6119c9f9f120b5ea205dced9cbb5579465d5432f90aedd0ccf04a4a676efad9f8c77405c9454de89112dd73a098
+  data.tar.gz: f3029cc519e6315c58cde6a2eed4eda20a2097749a2bf0597cdc63bcbb8e05a8dc00e3ff3ae790a717a1e0e11a59cc1f0c263577482125ff59d73573a781ccd1

data/README.md

@@ -270,7 +270,7 @@ well as complicating the parsing internals of Oga. As a result I have decided
 that Oga _does not_ insert these tags when left out.
 
 A more in depth explanation can be found here:
-<https://github.com/YorickPeterse/oga/issues/98#issuecomment-96833066>.
+<https://gitlab.com/yorickpeterse/oga/issues/98#note_45443992>
 
 ## Documentation
 

data/ext/c/lexer.c

@@ -71,29 +71,29 @@ void liboga_xml_lexer_callback_simple(VALUE self, VALUE name)
 
 
 #line 74 "ext/c/lexer.c"
-static const int c_lexer_start = 33;
-static const int c_lexer_first_final = 33;
+static const int c_lexer_start = 35;
+static const int c_lexer_first_final = 35;
 static const int c_lexer_error = 0;
 
-static const int c_lexer_en_comment_body = 40;
-static const int c_lexer_en_cdata_body = 43;
-static const int c_lexer_en_proc_ins_body = 46;
-static const int c_lexer_en_string_squote = 49;
-static const int c_lexer_en_string_dquote = 51;
-static const int c_lexer_en_doctype_inline = 53;
-static const int c_lexer_en_doctype = 55;
-static const int c_lexer_en_xml_decl = 68;
-static const int c_lexer_en_element_name = 71;
-static const int c_lexer_en_element_close = 73;
-static const int c_lexer_en_attribute_pre = 75;
-static const int c_lexer_en_unquoted_attribute_value = 77;
-static const int c_lexer_en_quoted_attribute_value = 79;
-static const int c_lexer_en_element_head = 80;
-static const int c_lexer_en_html_element_head = 84;
-static const int c_lexer_en_text = 88;
-static const int c_lexer_en_html_script = 92;
-static const int c_lexer_en_html_style = 96;
-static const int c_lexer_en_main = 33;
+static const int c_lexer_en_comment_body = 42;
+static const int c_lexer_en_cdata_body = 45;
+static const int c_lexer_en_proc_ins_body = 48;
+static const int c_lexer_en_string_squote = 51;
+static const int c_lexer_en_string_dquote = 53;
+static const int c_lexer_en_doctype_inline = 55;
+static const int c_lexer_en_doctype = 57;
+static const int c_lexer_en_xml_decl = 70;
+static const int c_lexer_en_element_name = 73;
+static const int c_lexer_en_element_close = 75;
+static const int c_lexer_en_attribute_pre = 77;
+static const int c_lexer_en_unquoted_attribute_value = 79;
+static const int c_lexer_en_quoted_attribute_value = 81;
+static const int c_lexer_en_element_head = 82;
+static const int c_lexer_en_html_element_head = 89;
+static const int c_lexer_en_text = 96;
+static const int c_lexer_en_html_script = 100;
+static const int c_lexer_en_html_style = 104;
+static const int c_lexer_en_main = 35;
 
 
 #line 70 "ext/c/lexer.rl"
@@ -167,8 +167,8 @@ VALUE oga_xml_lexer_advance(VALUE self, VALUE data_block)
 
 _again:
 	switch ( ( state->cs) ) {
-		case 33: goto st33;
-		case 34: goto st34;
+		case 35: goto st35;
+		case 36: goto st36;
 		case 1: goto st1;
 		case 2: goto st2;
 		case 3: goto st3;
@@ -178,7 +178,7 @@ _again:
 		case 7: goto st7;
 		case 8: goto st8;
 		case 9: goto st9;
-		case 35: goto st35;
+		case 37: goto st37;
 		case 10: goto st10;
 		case 11: goto st11;
 		case 12: goto st12;
@@ -186,21 +186,19 @@ _again:
 		case 14: goto st14;
 		case 15: goto st15;
 		case 16: goto st16;
-		case 36: goto st36;
-		case 17: goto st17;
-		case 37: goto st37;
 		case 38: goto st38;
+		case 17: goto st17;
 		case 39: goto st39;
 		case 40: goto st40;
 		case 41: goto st41;
 		case 42: goto st42;
-		case 18: goto st18;
 		case 43: goto st43;
 		case 44: goto st44;
+		case 18: goto st18;
 		case 45: goto st45;
-		case 19: goto st19;
 		case 46: goto st46;
 		case 47: goto st47;
+		case 19: goto st19;
 		case 48: goto st48;
 		case 49: goto st49;
 		case 50: goto st50;
@@ -210,9 +208,9 @@ _again:
 		case 54: goto st54;
 		case 55: goto st55;
 		case 56: goto st56;
-		case 0: goto st0;
 		case 57: goto st57;
 		case 58: goto st58;
+		case 0: goto st0;
 		case 59: goto st59;
 		case 60: goto st60;
 		case 61: goto st61;
@@ -242,6 +240,7 @@ _again:
 		case 85: goto st85;
 		case 86: goto st86;
 		case 87: goto st87;
+		case 20: goto st20;
 		case 88: goto st88;
 		case 89: goto st89;
 		case 90: goto st90;
@@ -249,24 +248,33 @@ _again:
 		case 92: goto st92;
 		case 93: goto st93;
 		case 94: goto st94;
-		case 20: goto st20;
 		case 21: goto st21;
+		case 95: goto st95;
+		case 96: goto st96;
+		case 97: goto st97;
+		case 98: goto st98;
+		case 99: goto st99;
+		case 100: goto st100;
+		case 101: goto st101;
+		case 102: goto st102;
 		case 22: goto st22;
 		case 23: goto st23;
 		case 24: goto st24;
 		case 25: goto st25;
 		case 26: goto st26;
-		case 95: goto st95;
-		case 96: goto st96;
-		case 97: goto st97;
-		case 98: goto st98;
 		case 27: goto st27;
 		case 28: goto st28;
+		case 103: goto st103;
+		case 104: goto st104;
+		case 105: goto st105;
+		case 106: goto st106;
 		case 29: goto st29;
 		case 30: goto st30;
 		case 31: goto st31;
 		case 32: goto st32;
-		case 99: goto st99;
+		case 33: goto st33;
+		case 34: goto st34;
+		case 107: goto st107;
 	default: break;
 	}
 
@@ -276,85 +284,85 @@ _resume:
 	switch ( ( state->cs) )
 	{
 tr0:
-	( state->cs) = 33;
-#line 618 "ext/ragel/base_lexer.rl"
+	( state->cs) = 35;
+#line 621 "ext/ragel/base_lexer.rl"
 	{{p = ((te))-1;}{
         p--;
-        ( state->cs) = 88;
+        ( state->cs) = 96;
     }}
 	goto _again;
 tr4:
-	( state->cs) = 33;
+	( state->cs) = 35;
 #line 89 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_comment_start);
 
-        ( state->cs) = 40;
+        ( state->cs) = 42;
     }}
 	goto _again;
 tr17:
-	( state->cs) = 33;
+	( state->cs) = 35;
 #line 128 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_cdata_start);
 
-        ( state->cs) = 43;
+        ( state->cs) = 45;
     }}
 	goto _again;
 tr20:
-	( state->cs) = 33;
+	( state->cs) = 35;
 #line 1 "NONE"
 	{	switch( ( state->act) ) {
-	case 60:
+	case 62:
 	{{p = ((te))-1;}
         callback_simple(id_on_xml_decl_start);
-        ( state->cs) = 68;
+        ( state->cs) = 70;
     }
 	break;
-	case 63:
+	case 65:
 	{{p = ((te))-1;}
         callback_simple(id_on_proc_ins_start);
         callback(id_on_proc_ins_name, data, encoding, ts + 2, te);
 
-        ( state->cs) = 46;
+        ( state->cs) = 48;
     }
 	break;
 	}
 	}
 	goto _again;
-tr41:
-	( state->cs) = 33;
-#line 618 "ext/ragel/base_lexer.rl"
+tr45:
+	( state->cs) = 35;
+#line 621 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         p--;
-        ( state->cs) = 88;
+        ( state->cs) = 96;
     }}
 	goto _again;
-tr43:
-	( state->cs) = 33;
-#line 618 "ext/ragel/base_lexer.rl"
+tr47:
+	( state->cs) = 35;
+#line 621 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         p--;
-        ( state->cs) = 88;
+        ( state->cs) = 96;
     }}
 	goto _again;
-tr44:
-	( state->cs) = 33;
+tr48:
+	( state->cs) = 35;
 #line 371 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         p--;
-        ( state->cs) = 71;
+        ( state->cs) = 73;
     }}
 	goto _again;
-tr46:
-	( state->cs) = 33;
+tr50:
+	( state->cs) = 35;
 #line 376 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
-        ( state->cs) = 73;
+        ( state->cs) = 75;
     }}
 	goto _again;
-tr48:
-	( state->cs) = 33;
+tr52:
+	( state->cs) = 35;
 #line 260 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback_simple(id_on_doctype_start);
@@ -366,58 +374,58 @@ tr48:
             lines = 0;
         }
 
-        ( state->cs) = 55;
+        ( state->cs) = 57;
     }}
 	goto _again;
-tr50:
-	( state->cs) = 33;
+tr54:
+	( state->cs) = 35;
 #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);
 
-        ( state->cs) = 46;
+        ( state->cs) = 48;
     }}
 	goto _again;
-st33:
+st35:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof33;
-case 33:
+		goto _test_eof35;
+case 35:
 #line 1 "NONE"
 	{ts = p;}
-#line 391 "ext/c/lexer.c"
+#line 399 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr42;
-	goto tr41;
-tr42:
+		goto tr46;
+	goto tr45;
+tr46:
 #line 1 "NONE"
 	{te = p+1;}
-	goto st34;
-st34:
+	goto st36;
+st36:
 	if ( ++p == pe )
-		goto _test_eof34;
-case 34:
-#line 403 "ext/c/lexer.c"
+		goto _test_eof36;
+case 36:
+#line 411 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 33: goto st1;
-		case 47: goto tr46;
+		case 47: goto tr50;
 		case 63: goto st16;
-		case 96: goto tr43;
+		case 96: goto tr47;
 	}
 	if ( (*p) < 58 ) {
 		if ( 0 <= (*p) && (*p) <= 44 )
-			goto tr43;
+			goto tr47;
 	} else if ( (*p) > 64 ) {
 		if ( (*p) > 94 ) {
 			if ( 123 <= (*p) )
-				goto tr43;
+				goto tr47;
 		} else if ( (*p) >= 91 )
-			goto tr43;
+			goto tr47;
 	} else
-		goto tr43;
-	goto tr44;
+		goto tr47;
+	goto tr48;
 st1:
 	if ( ++p == pe )
 		goto _test_eof1;
@@ -506,19 +514,19 @@ tr11:
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st35;
-st35:
+	goto st37;
+st37:
 	if ( ++p == pe )
-		goto _test_eof35;
-case 35:
-#line 515 "ext/c/lexer.c"
+		goto _test_eof37;
+case 37:
+#line 523 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 13: goto tr11;
 		case 32: goto tr11;
 	}
 	if ( 9 <= (*p) && (*p) <= 10 )
 		goto tr11;
-	goto tr48;
+	goto tr52;
 st10:
 	if ( ++p == pe )
 		goto _test_eof10;
@@ -586,19 +594,19 @@ tr18:
 #line 1 "NONE"
 	{te = p+1;}
 #line 170 "ext/ragel/base_lexer.rl"
-	{( state->act) = 63;}
-	goto st36;
-tr52:
+	{( state->act) = 65;}
+	goto st38;
+tr56:
 #line 1 "NONE"
 	{te = p+1;}
 #line 324 "ext/ragel/base_lexer.rl"
-	{( state->act) = 60;}
-	goto st36;
-st36:
+	{( state->act) = 62;}
+	goto st38;
+st38:
 	if ( ++p == pe )
-		goto _test_eof36;
-case 36:
-#line 602 "ext/c/lexer.c"
+		goto _test_eof38;
+case 38:
+#line 610 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 47: goto tr20;
 		case 58: goto st17;
@@ -635,84 +643,84 @@ case 17:
 			goto tr20;
 	} else
 		goto tr20;
-	goto st37;
-st37:
+	goto st39;
+st39:
 	if ( ++p == pe )
-		goto _test_eof37;
-case 37:
+		goto _test_eof39;
+case 39:
 	switch( (*p) ) {
-		case 47: goto tr50;
-		case 96: goto tr50;
+		case 47: goto tr54;
+		case 96: goto tr54;
 	}
 	if ( (*p) < 58 ) {
 		if ( 0 <= (*p) && (*p) <= 44 )
-			goto tr50;
+			goto tr54;
 	} else if ( (*p) > 64 ) {
 		if ( (*p) > 94 ) {
 			if ( 123 <= (*p) )
-				goto tr50;
+				goto tr54;
 		} else if ( (*p) >= 91 )
-			goto tr50;
+			goto tr54;
 	} else
-		goto tr50;
-	goto st37;
+		goto tr54;
+	goto st39;
 tr19:
 #line 1 "NONE"
 	{te = p+1;}
 #line 170 "ext/ragel/base_lexer.rl"
-	{( state->act) = 63;}
-	goto st38;
-st38:
+	{( state->act) = 65;}
+	goto st40;
+st40:
 	if ( ++p == pe )
-		goto _test_eof38;
-case 38:
-#line 670 "ext/c/lexer.c"
+		goto _test_eof40;
+case 40:
+#line 678 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 47: goto tr50;
+		case 47: goto tr54;
 		case 58: goto st17;
-		case 96: goto tr50;
-		case 109: goto tr51;
+		case 96: goto tr54;
+		case 109: goto tr55;
 	}
 	if ( (*p) < 59 ) {
 		if ( 0 <= (*p) && (*p) <= 44 )
-			goto tr50;
+			goto tr54;
 	} else if ( (*p) > 64 ) {
 		if ( (*p) > 94 ) {
 			if ( 123 <= (*p) )
-				goto tr50;
+				goto tr54;
 		} else if ( (*p) >= 91 )
-			goto tr50;
+			goto tr54;
 	} else
-		goto tr50;
+		goto tr54;
 	goto tr18;
-tr51:
+tr55:
 #line 1 "NONE"
 	{te = p+1;}
 #line 170 "ext/ragel/base_lexer.rl"
-	{( state->act) = 63;}
-	goto st39;
-st39:
+	{( state->act) = 65;}
+	goto st41;
+st41:
 	if ( ++p == pe )
-		goto _test_eof39;
-case 39:
-#line 699 "ext/c/lexer.c"
+		goto _test_eof41;
+case 41:
+#line 707 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 47: goto tr50;
+		case 47: goto tr54;
 		case 58: goto st17;
-		case 96: goto tr50;
-		case 108: goto tr52;
+		case 96: goto tr54;
+		case 108: goto tr56;
 	}
 	if ( (*p) < 59 ) {
 		if ( 0 <= (*p) && (*p) <= 44 )
-			goto tr50;
+			goto tr54;
 	} else if ( (*p) > 64 ) {
 		if ( (*p) > 94 ) {
 			if ( 123 <= (*p) )
-				goto tr50;
+				goto tr54;
 		} else if ( (*p) >= 91 )
-			goto tr50;
+			goto tr54;
 	} else
-		goto tr50;
+		goto tr54;
 	goto tr18;
 tr22:
 #line 96 "ext/ragel/base_lexer.rl"
@@ -726,17 +734,17 @@ tr22:
                 lines = 0;
             }
         }}
-	goto st40;
+	goto st42;
 tr23:
-	( state->cs) = 40;
+	( state->cs) = 42;
 #line 107 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_comment_end);
 
-            ( state->cs) = 33;
+            ( state->cs) = 35;
         }}
 	goto _again;
-tr55:
+tr59:
 #line 96 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_comment_body, data, encoding, ts, te);
@@ -748,49 +756,49 @@ tr55:
                 lines = 0;
             }
         }}
-	goto st40;
-st40:
+	goto st42;
+st42:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof40;
-case 40:
+		goto _test_eof42;
+case 42:
 #line 1 "NONE"
 	{ts = p;}
-#line 761 "ext/c/lexer.c"
+#line 769 "ext/c/lexer.c"
 	if ( (*p) == 45 )
-		goto tr54;
-	goto tr53;
-tr53:
+		goto tr58;
+	goto tr57;
+tr57:
 #line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st41;
-st41:
+	goto st43;
+st43:
 	if ( ++p == pe )
-		goto _test_eof41;
-case 41:
-#line 775 "ext/c/lexer.c"
+		goto _test_eof43;
+case 43:
+#line 783 "ext/c/lexer.c"
 	if ( (*p) == 45 )
-		goto tr55;
-	goto tr53;
-tr54:
+		goto tr59;
+	goto tr57;
+tr58:
 #line 1 "NONE"
 	{te = p+1;}
 #line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st42;
-st42:
+	goto st44;
+st44:
 	if ( ++p == pe )
-		goto _test_eof42;
-case 42:
-#line 791 "ext/c/lexer.c"
+		goto _test_eof44;
+case 44:
+#line 799 "ext/c/lexer.c"
 	if ( (*p) == 45 )
 		goto st18;
-	goto tr55;
+	goto tr59;
 st18:
 	if ( ++p == pe )
 		goto _test_eof18;
@@ -810,17 +818,17 @@ tr24:
                 lines = 0;
             }
         }}
-	goto st43;
+	goto st45;
 tr25:
-	( state->cs) = 43;
+	( state->cs) = 45;
 #line 146 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_cdata_end);
 
-            ( state->cs) = 33;
+            ( state->cs) = 35;
         }}
 	goto _again;
-tr59:
+tr63:
 #line 135 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_cdata_body, data, encoding, ts, te);
@@ -832,49 +840,49 @@ tr59:
                 lines = 0;
             }
         }}
-	goto st43;
-st43:
+	goto st45;
+st45:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof43;
-case 43:
+		goto _test_eof45;
+case 45:
 #line 1 "NONE"
 	{ts = p;}
-#line 845 "ext/c/lexer.c"
+#line 853 "ext/c/lexer.c"
 	if ( (*p) == 93 )
-		goto tr58;
-	goto tr57;
-tr57:
+		goto tr62;
+	goto tr61;
+tr61:
 #line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st44;
-st44:
+	goto st46;
+st46:
 	if ( ++p == pe )
-		goto _test_eof44;
-case 44:
-#line 859 "ext/c/lexer.c"
+		goto _test_eof46;
+case 46:
+#line 867 "ext/c/lexer.c"
 	if ( (*p) == 93 )
-		goto tr59;
-	goto tr57;
-tr58:
+		goto tr63;
+	goto tr61;
+tr62:
 #line 1 "NONE"
 	{te = p+1;}
 #line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st45;
-st45:
+	goto st47;
+st47:
 	if ( ++p == pe )
-		goto _test_eof45;
-case 45:
-#line 875 "ext/c/lexer.c"
+		goto _test_eof47;
+case 47:
+#line 883 "ext/c/lexer.c"
 	if ( (*p) == 93 )
 		goto st19;
-	goto tr59;
+	goto tr63;
 st19:
 	if ( ++p == pe )
 		goto _test_eof19;
@@ -882,7 +890,7 @@ case 19:
 	if ( (*p) == 62 )
 		goto tr25;
 	goto tr24;
-tr63:
+tr67:
 #line 178 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_proc_ins_body, data, encoding, ts, te);
@@ -894,65 +902,65 @@ tr63:
                 lines = 0;
             }
         }}
-	goto st46;
-tr64:
-	( state->cs) = 46;
+	goto st48;
+tr68:
+	( state->cs) = 48;
 #line 189 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_proc_ins_end);
 
-            ( state->cs) = 33;
+            ( state->cs) = 35;
         }}
 	goto _again;
-st46:
+st48:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof46;
-case 46:
+		goto _test_eof48;
+case 48:
 #line 1 "NONE"
 	{ts = p;}
-#line 916 "ext/c/lexer.c"
+#line 924 "ext/c/lexer.c"
 	if ( (*p) == 63 )
-		goto tr62;
-	goto tr61;
-tr61:
+		goto tr66;
+	goto tr65;
+tr65:
 #line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st47;
-st47:
+	goto st49;
+st49:
 	if ( ++p == pe )
-		goto _test_eof47;
-case 47:
-#line 930 "ext/c/lexer.c"
+		goto _test_eof49;
+case 49:
+#line 938 "ext/c/lexer.c"
 	if ( (*p) == 63 )
-		goto tr63;
-	goto tr61;
-tr62:
+		goto tr67;
+	goto tr65;
+tr66:
 #line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st48;
-st48:
+	goto st50;
+st50:
 	if ( ++p == pe )
-		goto _test_eof48;
-case 48:
-#line 944 "ext/c/lexer.c"
+		goto _test_eof50;
+case 50:
+#line 952 "ext/c/lexer.c"
 	if ( (*p) == 62 )
-		goto tr64;
-	goto tr63;
-tr66:
+		goto tr68;
+	goto tr67;
+tr70:
 #line 231 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_string_squote);
 
             {( state->cs) = ( state->stack)[--( state->top)];goto _again;}
         }}
-	goto st49;
-tr67:
+	goto st51;
+tr71:
 #line 205 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback(id_on_string_body, data, encoding, ts, te);
@@ -964,42 +972,42 @@ tr67:
             lines = 0;
         }
     }}
-	goto st49;
-st49:
+	goto st51;
+st51:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof49;
-case 49:
+		goto _test_eof51;
+case 51:
 #line 1 "NONE"
 	{ts = p;}
-#line 977 "ext/c/lexer.c"
+#line 985 "ext/c/lexer.c"
 	if ( (*p) == 39 )
-		goto tr66;
-	goto tr65;
-tr65:
+		goto tr70;
+	goto tr69;
+tr69:
 #line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st50;
-st50:
+	goto st52;
+st52:
 	if ( ++p == pe )
-		goto _test_eof50;
-case 50:
-#line 991 "ext/c/lexer.c"
+		goto _test_eof52;
+case 52:
+#line 999 "ext/c/lexer.c"
 	if ( (*p) == 39 )
-		goto tr67;
-	goto tr65;
-tr69:
+		goto tr71;
+	goto tr69;
+tr73:
 #line 241 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_string_dquote);
 
             {( state->cs) = ( state->stack)[--( state->top)];goto _again;}
         }}
-	goto st51;
-tr70:
+	goto st53;
+tr74:
 #line 205 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback(id_on_string_body, data, encoding, ts, te);
@@ -1011,39 +1019,39 @@ tr70:
             lines = 0;
         }
     }}
-	goto st51;
-st51:
+	goto st53;
+st53:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof51;
-case 51:
+		goto _test_eof53;
+case 53:
 #line 1 "NONE"
 	{ts = p;}
-#line 1024 "ext/c/lexer.c"
+#line 1032 "ext/c/lexer.c"
 	if ( (*p) == 34 )
-		goto tr69;
-	goto tr68;
-tr68:
+		goto tr73;
+	goto tr72;
+tr72:
 #line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st52;
-st52:
+	goto st54;
+st54:
 	if ( ++p == pe )
-		goto _test_eof52;
-case 52:
-#line 1038 "ext/c/lexer.c"
+		goto _test_eof54;
+case 54:
+#line 1046 "ext/c/lexer.c"
 	if ( (*p) == 34 )
-		goto tr70;
-	goto tr68;
-tr72:
-	( state->cs) = 53;
+		goto tr74;
+	goto tr72;
+tr76:
+	( state->cs) = 55;
 #line 286 "ext/ragel/base_lexer.rl"
-	{te = p+1;{ ( state->cs) = 55; }}
+	{te = p+1;{ ( state->cs) = 57; }}
 	goto _again;
-tr73:
+tr77:
 #line 275 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_doctype_inline, data, encoding, ts, te);
@@ -1055,73 +1063,73 @@ tr73:
                 lines = 0;
             }
         }}
-	goto st53;
-st53:
+	goto st55;
+st55:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof53;
-case 53:
+		goto _test_eof55;
+case 55:
 #line 1 "NONE"
 	{ts = p;}
-#line 1068 "ext/c/lexer.c"
+#line 1076 "ext/c/lexer.c"
 	if ( (*p) == 93 )
-		goto tr72;
-	goto tr71;
-tr71:
+		goto tr76;
+	goto tr75;
+tr75:
 #line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st54;
-st54:
+	goto st56;
+st56:
 	if ( ++p == pe )
-		goto _test_eof54;
-case 54:
-#line 1082 "ext/c/lexer.c"
+		goto _test_eof56;
+case 56:
+#line 1090 "ext/c/lexer.c"
 	if ( (*p) == 93 )
-		goto tr73;
-	goto tr71;
-tr75:
+		goto tr77;
+	goto tr75;
+tr79:
 #line 314 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
-	goto st55;
-tr77:
+	goto st57;
+tr81:
 #line 65 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         advance_line(1);
     }}
-	goto st55;
-tr79:
+	goto st57;
+tr83:
 #line 222 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_string_dquote);
 
-        {( state->stack)[( state->top)++] = 55;goto st51;}
+        {( state->stack)[( state->top)++] = 57;goto st53;}
     }}
-	goto st55;
-tr80:
+	goto st57;
+tr84:
 #line 216 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_string_squote);
 
-        {( state->stack)[( state->top)++] = 55;goto st49;}
+        {( state->stack)[( state->top)++] = 57;goto st51;}
     }}
-	goto st55;
-tr81:
-	( state->cs) = 55;
+	goto st57;
+tr85:
+	( state->cs) = 57;
 #line 307 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_doctype_end);
-            ( state->cs) = 33;
+            ( state->cs) = 35;
         }}
 	goto _again;
-tr84:
-	( state->cs) = 55;
+tr88:
+	( state->cs) = 57;
 #line 297 "ext/ragel/base_lexer.rl"
-	{te = p+1;{ ( state->cs) = 53; }}
+	{te = p+1;{ ( state->cs) = 55; }}
 	goto _again;
-tr85:
+tr89:
 #line 1 "NONE"
 	{	switch( ( state->act) ) {
 	case 13:
@@ -1136,40 +1144,40 @@ tr85:
 	break;
 	}
 	}
-	goto st55;
-tr86:
+	goto st57;
+tr90:
 #line 65 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         advance_line(1);
     }}
-	goto st55;
-tr87:
+	goto st57;
+tr91:
 #line 303 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_doctype_name, data, encoding, ts, te);
         }}
-	goto st55;
-st55:
+	goto st57;
+st57:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof55;
-case 55:
+		goto _test_eof57;
+case 57:
 #line 1 "NONE"
 	{ts = p;}
-#line 1161 "ext/c/lexer.c"
+#line 1169 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 9: goto tr75;
-		case 10: goto tr77;
-		case 13: goto st57;
-		case 32: goto tr75;
-		case 34: goto tr79;
-		case 39: goto tr80;
+		case 9: goto tr79;
+		case 10: goto tr81;
+		case 13: goto st59;
+		case 32: goto tr79;
+		case 34: goto tr83;
+		case 39: goto tr84;
 		case 47: goto st0;
-		case 62: goto tr81;
-		case 80: goto st58;
-		case 83: goto st63;
-		case 91: goto tr84;
+		case 62: goto tr85;
+		case 80: goto st60;
+		case 83: goto st65;
+		case 91: goto tr88;
 		case 96: goto st0;
 	}
 	if ( (*p) < 58 ) {
@@ -1183,293 +1191,293 @@ case 55:
 			goto st0;
 	} else
 		goto st0;
-	goto tr74;
-tr74:
+	goto tr78;
+tr78:
 #line 1 "NONE"
 	{te = p+1;}
 #line 303 "ext/ragel/base_lexer.rl"
 	{( state->act) = 17;}
-	goto st56;
-tr92:
+	goto st58;
+tr96:
 #line 1 "NONE"
 	{te = p+1;}
 #line 292 "ext/ragel/base_lexer.rl"
 	{( state->act) = 13;}
-	goto st56;
-st56:
-	if ( ++p == pe )
-		goto _test_eof56;
-case 56:
-#line 1204 "ext/c/lexer.c"
-	switch( (*p) ) {
-		case 47: goto tr85;
-		case 96: goto tr85;
-	}
-	if ( (*p) < 58 ) {
-		if ( 0 <= (*p) && (*p) <= 44 )
-			goto tr85;
-	} else if ( (*p) > 64 ) {
-		if ( (*p) > 94 ) {
-			if ( 123 <= (*p) )
-				goto tr85;
-		} else if ( (*p) >= 91 )
-			goto tr85;
-	} else
-		goto tr85;
-	goto tr74;
-st0:
-( state->cs) = 0;
-	goto _out;
-st57:
-	if ( ++p == pe )
-		goto _test_eof57;
-case 57:
-	if ( (*p) == 10 )
-		goto tr77;
-	goto tr86;
+	goto st58;
 st58:
 	if ( ++p == pe )
 		goto _test_eof58;
 case 58:
+#line 1212 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 47: goto tr87;
-		case 85: goto st59;
-		case 96: goto tr87;
+		case 47: goto tr89;
+		case 96: goto tr89;
 	}
 	if ( (*p) < 58 ) {
 		if ( 0 <= (*p) && (*p) <= 44 )
-			goto tr87;
+			goto tr89;
 	} else if ( (*p) > 64 ) {
 		if ( (*p) > 94 ) {
 			if ( 123 <= (*p) )
-				goto tr87;
+				goto tr89;
 		} else if ( (*p) >= 91 )
-			goto tr87;
+			goto tr89;
 	} else
-		goto tr87;
-	goto tr74;
+		goto tr89;
+	goto tr78;
+st0:
+( state->cs) = 0;
+	goto _out;
 st59:
 	if ( ++p == pe )
 		goto _test_eof59;
 case 59:
-	switch( (*p) ) {
-		case 47: goto tr87;
-		case 66: goto st60;
-		case 96: goto tr87;
-	}
-	if ( (*p) < 58 ) {
-		if ( 0 <= (*p) && (*p) <= 44 )
-			goto tr87;
-	} else if ( (*p) > 64 ) {
-		if ( (*p) > 94 ) {
-			if ( 123 <= (*p) )
-				goto tr87;
-		} else if ( (*p) >= 91 )
-			goto tr87;
-	} else
-		goto tr87;
-	goto tr74;
+	if ( (*p) == 10 )
+		goto tr81;
+	goto tr90;
 st60:
 	if ( ++p == pe )
 		goto _test_eof60;
 case 60:
 	switch( (*p) ) {
-		case 47: goto tr87;
-		case 76: goto st61;
-		case 96: goto tr87;
+		case 47: goto tr91;
+		case 85: goto st61;
+		case 96: goto tr91;
 	}
 	if ( (*p) < 58 ) {
 		if ( 0 <= (*p) && (*p) <= 44 )
-			goto tr87;
+			goto tr91;
 	} else if ( (*p) > 64 ) {
 		if ( (*p) > 94 ) {
 			if ( 123 <= (*p) )
-				goto tr87;
+				goto tr91;
 		} else if ( (*p) >= 91 )
-			goto tr87;
+			goto tr91;
 	} else
-		goto tr87;
-	goto tr74;
+		goto tr91;
+	goto tr78;
 st61:
 	if ( ++p == pe )
 		goto _test_eof61;
 case 61:
 	switch( (*p) ) {
-		case 47: goto tr87;
-		case 73: goto st62;
-		case 96: goto tr87;
+		case 47: goto tr91;
+		case 66: goto st62;
+		case 96: goto tr91;
 	}
 	if ( (*p) < 58 ) {
 		if ( 0 <= (*p) && (*p) <= 44 )
-			goto tr87;
+			goto tr91;
 	} else if ( (*p) > 64 ) {
 		if ( (*p) > 94 ) {
 			if ( 123 <= (*p) )
-				goto tr87;
+				goto tr91;
 		} else if ( (*p) >= 91 )
-			goto tr87;
+			goto tr91;
 	} else
-		goto tr87;
-	goto tr74;
+		goto tr91;
+	goto tr78;
 st62:
 	if ( ++p == pe )
 		goto _test_eof62;
 case 62:
 	switch( (*p) ) {
-		case 47: goto tr87;
-		case 67: goto tr92;
-		case 96: goto tr87;
+		case 47: goto tr91;
+		case 76: goto st63;
+		case 96: goto tr91;
 	}
 	if ( (*p) < 58 ) {
 		if ( 0 <= (*p) && (*p) <= 44 )
-			goto tr87;
+			goto tr91;
 	} else if ( (*p) > 64 ) {
 		if ( (*p) > 94 ) {
 			if ( 123 <= (*p) )
-				goto tr87;
+				goto tr91;
 		} else if ( (*p) >= 91 )
-			goto tr87;
+			goto tr91;
 	} else
-		goto tr87;
-	goto tr74;
+		goto tr91;
+	goto tr78;
 st63:
 	if ( ++p == pe )
 		goto _test_eof63;
 case 63:
 	switch( (*p) ) {
-		case 47: goto tr87;
-		case 89: goto st64;
-		case 96: goto tr87;
+		case 47: goto tr91;
+		case 73: goto st64;
+		case 96: goto tr91;
 	}
 	if ( (*p) < 58 ) {
 		if ( 0 <= (*p) && (*p) <= 44 )
-			goto tr87;
+			goto tr91;
 	} else if ( (*p) > 64 ) {
 		if ( (*p) > 94 ) {
 			if ( 123 <= (*p) )
-				goto tr87;
+				goto tr91;
 		} else if ( (*p) >= 91 )
-			goto tr87;
+			goto tr91;
 	} else
-		goto tr87;
-	goto tr74;
+		goto tr91;
+	goto tr78;
 st64:
 	if ( ++p == pe )
 		goto _test_eof64;
 case 64:
 	switch( (*p) ) {
-		case 47: goto tr87;
-		case 83: goto st65;
-		case 96: goto tr87;
+		case 47: goto tr91;
+		case 67: goto tr96;
+		case 96: goto tr91;
 	}
 	if ( (*p) < 58 ) {
 		if ( 0 <= (*p) && (*p) <= 44 )
-			goto tr87;
+			goto tr91;
 	} else if ( (*p) > 64 ) {
 		if ( (*p) > 94 ) {
 			if ( 123 <= (*p) )
-				goto tr87;
+				goto tr91;
 		} else if ( (*p) >= 91 )
-			goto tr87;
+			goto tr91;
 	} else
-		goto tr87;
-	goto tr74;
+		goto tr91;
+	goto tr78;
 st65:
 	if ( ++p == pe )
 		goto _test_eof65;
 case 65:
 	switch( (*p) ) {
-		case 47: goto tr87;
-		case 84: goto st66;
-		case 96: goto tr87;
+		case 47: goto tr91;
+		case 89: goto st66;
+		case 96: goto tr91;
 	}
 	if ( (*p) < 58 ) {
 		if ( 0 <= (*p) && (*p) <= 44 )
-			goto tr87;
+			goto tr91;
 	} else if ( (*p) > 64 ) {
 		if ( (*p) > 94 ) {
 			if ( 123 <= (*p) )
-				goto tr87;
+				goto tr91;
 		} else if ( (*p) >= 91 )
-			goto tr87;
+			goto tr91;
 	} else
-		goto tr87;
-	goto tr74;
+		goto tr91;
+	goto tr78;
 st66:
 	if ( ++p == pe )
 		goto _test_eof66;
 case 66:
 	switch( (*p) ) {
-		case 47: goto tr87;
-		case 69: goto st67;
-		case 96: goto tr87;
+		case 47: goto tr91;
+		case 83: goto st67;
+		case 96: goto tr91;
 	}
 	if ( (*p) < 58 ) {
 		if ( 0 <= (*p) && (*p) <= 44 )
-			goto tr87;
+			goto tr91;
 	} else if ( (*p) > 64 ) {
 		if ( (*p) > 94 ) {
 			if ( 123 <= (*p) )
-				goto tr87;
+				goto tr91;
 		} else if ( (*p) >= 91 )
-			goto tr87;
+			goto tr91;
 	} else
-		goto tr87;
-	goto tr74;
+		goto tr91;
+	goto tr78;
 st67:
 	if ( ++p == pe )
 		goto _test_eof67;
 case 67:
 	switch( (*p) ) {
-		case 47: goto tr87;
-		case 77: goto tr92;
-		case 96: goto tr87;
+		case 47: goto tr91;
+		case 84: goto st68;
+		case 96: goto tr91;
+	}
+	if ( (*p) < 58 ) {
+		if ( 0 <= (*p) && (*p) <= 44 )
+			goto tr91;
+	} else if ( (*p) > 64 ) {
+		if ( (*p) > 94 ) {
+			if ( 123 <= (*p) )
+				goto tr91;
+		} else if ( (*p) >= 91 )
+			goto tr91;
+	} else
+		goto tr91;
+	goto tr78;
+st68:
+	if ( ++p == pe )
+		goto _test_eof68;
+case 68:
+	switch( (*p) ) {
+		case 47: goto tr91;
+		case 69: goto st69;
+		case 96: goto tr91;
+	}
+	if ( (*p) < 58 ) {
+		if ( 0 <= (*p) && (*p) <= 44 )
+			goto tr91;
+	} else if ( (*p) > 64 ) {
+		if ( (*p) > 94 ) {
+			if ( 123 <= (*p) )
+				goto tr91;
+		} else if ( (*p) >= 91 )
+			goto tr91;
+	} else
+		goto tr91;
+	goto tr78;
+st69:
+	if ( ++p == pe )
+		goto _test_eof69;
+case 69:
+	switch( (*p) ) {
+		case 47: goto tr91;
+		case 77: goto tr96;
+		case 96: goto tr91;
 	}
 	if ( (*p) < 58 ) {
 		if ( 0 <= (*p) && (*p) <= 44 )
-			goto tr87;
+			goto tr91;
 	} else if ( (*p) > 64 ) {
 		if ( (*p) > 94 ) {
 			if ( 123 <= (*p) )
-				goto tr87;
+				goto tr91;
 		} else if ( (*p) >= 91 )
-			goto tr87;
+			goto tr91;
 	} else
-		goto tr87;
-	goto tr74;
-tr98:
+		goto tr91;
+	goto tr78;
+tr102:
 #line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
 #line 359 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
-	goto st68;
-tr99:
+	goto st70;
+tr103:
 #line 222 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_string_dquote);
 
-        {( state->stack)[( state->top)++] = 68;goto st51;}
+        {( state->stack)[( state->top)++] = 70;goto st53;}
     }}
 #line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st68;
-tr100:
+	goto st70;
+tr104:
 #line 216 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_string_squote);
 
-        {( state->stack)[( state->top)++] = 68;goto st49;}
+        {( state->stack)[( state->top)++] = 70;goto st51;}
     }}
 #line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st68;
-tr102:
+	goto st70;
+tr106:
 #line 345 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             if ( lines > 0 )
@@ -1481,13 +1489,13 @@ tr102:
 
             callback(id_on_attribute, data, encoding, ts, te);
         }}
-	goto st68;
-tr104:
+	goto st70;
+tr108:
 #line 359 "ext/ragel/base_lexer.rl"
 	{te = p;p--;}
-	goto st68;
-tr105:
-	( state->cs) = 68;
+	goto st70;
+tr109:
+	( state->cs) = 70;
 #line 331 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             if ( lines > 0 )
@@ -1499,112 +1507,112 @@ tr105:
 
             callback_simple(id_on_xml_decl_end);
 
-            ( state->cs) = 33;
+            ( state->cs) = 35;
         }}
 	goto _again;
-st68:
+st70:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof68;
-case 68:
+		goto _test_eof70;
+case 70:
 #line 1 "NONE"
 	{ts = p;}
-#line 1514 "ext/c/lexer.c"
+#line 1522 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 34: goto tr99;
-		case 39: goto tr100;
-		case 47: goto tr98;
-		case 63: goto tr101;
-		case 96: goto tr98;
+		case 34: goto tr103;
+		case 39: goto tr104;
+		case 47: goto tr102;
+		case 63: goto tr105;
+		case 96: goto tr102;
 	}
 	if ( (*p) < 58 ) {
 		if ( 0 <= (*p) && (*p) <= 44 )
-			goto tr98;
+			goto tr102;
 	} else if ( (*p) > 64 ) {
 		if ( (*p) > 94 ) {
 			if ( 123 <= (*p) )
-				goto tr98;
+				goto tr102;
 		} else if ( (*p) >= 91 )
-			goto tr98;
+			goto tr102;
 	} else
-		goto tr98;
-	goto tr97;
-tr97:
+		goto tr102;
+	goto tr101;
+tr101:
 #line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st69;
-st69:
+	goto st71;
+st71:
 	if ( ++p == pe )
-		goto _test_eof69;
-case 69:
-#line 1544 "ext/c/lexer.c"
+		goto _test_eof71;
+case 71:
+#line 1552 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 47: goto tr102;
-		case 96: goto tr102;
+		case 47: goto tr106;
+		case 96: goto tr106;
 	}
 	if ( (*p) < 58 ) {
 		if ( 0 <= (*p) && (*p) <= 44 )
-			goto tr102;
+			goto tr106;
 	} else if ( (*p) > 64 ) {
 		if ( (*p) > 94 ) {
 			if ( 123 <= (*p) )
-				goto tr102;
+				goto tr106;
 		} else if ( (*p) >= 91 )
-			goto tr102;
+			goto tr106;
 	} else
-		goto tr102;
-	goto st69;
-tr101:
+		goto tr106;
+	goto st71;
+tr105:
 #line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st70;
-st70:
+	goto st72;
+st72:
 	if ( ++p == pe )
-		goto _test_eof70;
-case 70:
-#line 1571 "ext/c/lexer.c"
+		goto _test_eof72;
+case 72:
+#line 1579 "ext/c/lexer.c"
 	if ( (*p) == 62 )
-		goto tr105;
-	goto tr104;
-tr107:
-	( state->cs) = 71;
-#line 402 "ext/ragel/base_lexer.rl"
+		goto tr109;
+	goto tr108;
+tr111:
+	( state->cs) = 73;
+#line 403 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_element_name, data, encoding, ts, te);
 
             if ( html_p )
             {
-                ( state->cs) = 84;
+                ( state->cs) = 89;
             }
             else
             {
-                ( state->cs) = 80;
+                ( state->cs) = 82;
             }
         }}
 	goto _again;
-tr108:
-#line 395 "ext/ragel/base_lexer.rl"
+tr112:
+#line 396 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             if ( !html_p )
             {
                 callback(id_on_element_ns, data, encoding, ts, te - 1);
             }
         }}
-	goto st71;
-st71:
+	goto st73;
+st73:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof71;
-case 71:
+		goto _test_eof73;
+case 73:
 #line 1 "NONE"
 	{ts = p;}
-#line 1608 "ext/c/lexer.c"
+#line 1616 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 47: goto st0;
 		case 96: goto st0;
@@ -1620,39 +1628,39 @@ case 71:
 			goto st0;
 	} else
 		goto st0;
-	goto st72;
-st72:
+	goto st74;
+st74:
 	if ( ++p == pe )
-		goto _test_eof72;
-case 72:
+		goto _test_eof74;
+case 74:
 	switch( (*p) ) {
-		case 47: goto tr107;
-		case 58: goto tr108;
-		case 96: goto tr107;
+		case 47: goto tr111;
+		case 58: goto tr112;
+		case 96: goto tr111;
 	}
 	if ( (*p) < 59 ) {
 		if ( 0 <= (*p) && (*p) <= 44 )
-			goto tr107;
+			goto tr111;
 	} else if ( (*p) > 64 ) {
 		if ( (*p) > 94 ) {
 			if ( 123 <= (*p) )
-				goto tr107;
+				goto tr111;
 		} else if ( (*p) >= 91 )
-			goto tr107;
+			goto tr111;
 	} else
-		goto tr107;
-	goto st72;
-tr110:
+		goto tr111;
+	goto st74;
+tr114:
 #line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-#line 435 "ext/ragel/base_lexer.rl"
+#line 436 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
-	goto st73;
-tr111:
-	( state->cs) = 73;
-#line 424 "ext/ragel/base_lexer.rl"
+	goto st75;
+tr115:
+	( state->cs) = 75;
+#line 425 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             if ( lines > 0 )
             {
@@ -1661,80 +1669,80 @@ tr111:
                 lines = 0;
             }
 
-            ( state->cs) = 33;
+            ( state->cs) = 35;
         }}
 #line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
 	goto _again;
-tr112:
+tr116:
 #line 380 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback(id_on_element_end, data, encoding, ts, te);
     }}
-	goto st73;
-tr114:
-#line 420 "ext/ragel/base_lexer.rl"
+	goto st75;
+tr118:
+#line 421 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
-	goto st73;
-st73:
+	goto st75;
+st75:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof73;
-case 73:
+		goto _test_eof75;
+case 75:
 #line 1 "NONE"
 	{ts = p;}
-#line 1690 "ext/c/lexer.c"
+#line 1698 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 47: goto tr110;
-		case 62: goto tr111;
-		case 96: goto tr110;
+		case 47: goto tr114;
+		case 62: goto tr115;
+		case 96: goto tr114;
 	}
 	if ( (*p) < 58 ) {
 		if ( 0 <= (*p) && (*p) <= 44 )
-			goto tr110;
+			goto tr114;
 	} else if ( (*p) > 64 ) {
 		if ( (*p) > 94 ) {
 			if ( 123 <= (*p) )
-				goto tr110;
+				goto tr114;
 		} else if ( (*p) >= 91 )
-			goto tr110;
+			goto tr114;
 	} else
-		goto tr110;
-	goto tr109;
-tr109:
+		goto tr114;
+	goto tr113;
+tr113:
 #line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st74;
-st74:
+	goto st76;
+st76:
 	if ( ++p == pe )
-		goto _test_eof74;
-case 74:
-#line 1718 "ext/c/lexer.c"
+		goto _test_eof76;
+case 76:
+#line 1726 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 47: goto tr112;
-		case 58: goto tr114;
-		case 96: goto tr112;
+		case 47: goto tr116;
+		case 58: goto tr118;
+		case 96: goto tr116;
 	}
 	if ( (*p) < 59 ) {
 		if ( 0 <= (*p) && (*p) <= 44 )
-			goto tr112;
+			goto tr116;
 	} else if ( (*p) > 64 ) {
 		if ( (*p) > 94 ) {
 			if ( 123 <= (*p) )
-				goto tr112;
+				goto tr116;
 		} else if ( (*p) >= 91 )
-			goto tr112;
+			goto tr116;
 	} else
-		goto tr112;
-	goto st74;
-tr115:
-	( state->cs) = 75;
-#line 456 "ext/ragel/base_lexer.rl"
+		goto tr116;
+	goto st76;
+tr119:
+	( state->cs) = 77;
+#line 457 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             p--;
 
@@ -1747,7 +1755,7 @@ tr115:
 
             if ( html_p )
             {
-                ( state->cs) = 77;
+                ( state->cs) = 79;
             }
             /* XML doesn't support unquoted attribute values */
             else
@@ -1756,18 +1764,18 @@ tr115:
             }
         }}
 	goto _again;
-tr116:
+tr120:
 #line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-#line 441 "ext/ragel/base_lexer.rl"
+#line 442 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
-	goto st75;
-tr118:
-	( state->cs) = 75;
-#line 443 "ext/ragel/base_lexer.rl"
-	{te = p+1;{
+	goto st77;
+tr122:
+	( state->cs) = 77;
+#line 444 "ext/ragel/base_lexer.rl"
+	{te = p+1;{
             p--;
 
             if ( lines > 0 )
@@ -1777,54 +1785,54 @@ tr118:
                 lines = 0;
             }
 
-            ( state->cs) = 79;
+            ( state->cs) = 81;
         }}
 	goto _again;
-tr119:
-#line 441 "ext/ragel/base_lexer.rl"
+tr123:
+#line 442 "ext/ragel/base_lexer.rl"
 	{te = p;p--;}
-	goto st75;
-st75:
+	goto st77;
+st77:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof75;
-case 75:
+		goto _test_eof77;
+case 77:
 #line 1 "NONE"
 	{ts = p;}
-#line 1796 "ext/c/lexer.c"
+#line 1804 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 13: goto tr117;
-		case 32: goto tr116;
-		case 34: goto tr118;
-		case 39: goto tr118;
+		case 13: goto tr121;
+		case 32: goto tr120;
+		case 34: goto tr122;
+		case 39: goto tr122;
 	}
 	if ( 9 <= (*p) && (*p) <= 10 )
-		goto tr116;
-	goto tr115;
-tr117:
+		goto tr120;
+	goto tr119;
+tr121:
 #line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st76;
-st76:
+	goto st78;
+st78:
 	if ( ++p == pe )
-		goto _test_eof76;
-case 76:
-#line 1816 "ext/c/lexer.c"
+		goto _test_eof78;
+case 78:
+#line 1824 "ext/c/lexer.c"
 	if ( (*p) == 10 )
-		goto tr116;
-	goto tr119;
-tr121:
+		goto tr120;
+	goto tr123;
+tr125:
 #line 69 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         p--;
         {( state->cs) = ( state->stack)[--( state->top)];goto _again;}
     }}
-	goto st77;
-tr122:
-#line 494 "ext/ragel/base_lexer.rl"
+	goto st79;
+tr126:
+#line 495 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback_simple(id_on_string_squote);
 
@@ -1832,320 +1840,510 @@ tr122:
 
             callback_simple(id_on_string_squote);
         }}
-	goto st77;
-st77:
+	goto st79;
+st79:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof77;
-case 77:
+		goto _test_eof79;
+case 79:
 #line 1 "NONE"
 	{ts = p;}
-#line 1845 "ext/c/lexer.c"
+#line 1853 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 13: goto tr121;
-		case 32: goto tr121;
-		case 62: goto tr121;
+		case 13: goto tr125;
+		case 32: goto tr125;
+		case 62: goto tr125;
 	}
 	if ( 9 <= (*p) && (*p) <= 10 )
-		goto tr121;
-	goto st78;
-st78:
+		goto tr125;
+	goto st80;
+st80:
 	if ( ++p == pe )
-		goto _test_eof78;
-case 78:
+		goto _test_eof80;
+case 80:
 	switch( (*p) ) {
-		case 13: goto tr122;
-		case 32: goto tr122;
-		case 62: goto tr122;
+		case 13: goto tr126;
+		case 32: goto tr126;
+		case 62: goto tr126;
 	}
 	if ( 9 <= (*p) && (*p) <= 10 )
-		goto tr122;
-	goto st78;
-tr123:
+		goto tr126;
+	goto st80;
+tr127:
 #line 69 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         p--;
         {( state->cs) = ( state->stack)[--( state->top)];goto _again;}
     }}
-	goto st79;
-tr124:
-	( state->cs) = 79;
-#line 516 "ext/ragel/base_lexer.rl"
+	goto st81;
+tr128:
+	( state->cs) = 81;
+#line 517 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_string_dquote);
 
-            ( state->cs) = 51;
+            ( state->cs) = 53;
         }}
 	goto _again;
-tr125:
-	( state->cs) = 79;
-#line 510 "ext/ragel/base_lexer.rl"
+tr129:
+	( state->cs) = 81;
+#line 511 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_string_squote);
 
-            ( state->cs) = 49;
+            ( state->cs) = 51;
         }}
 	goto _again;
-st79:
+st81:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof79;
-case 79:
+		goto _test_eof81;
+case 81:
 #line 1 "NONE"
 	{ts = p;}
-#line 1899 "ext/c/lexer.c"
+#line 1907 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 34: goto tr124;
-		case 39: goto tr125;
+		case 34: goto tr128;
+		case 39: goto tr129;
 	}
-	goto tr123;
-tr127:
-#line 574 "ext/ragel/base_lexer.rl"
+	goto tr127;
+tr26:
+#line 555 "ext/ragel/base_lexer.rl"
+	{{p = ((te))-1;}}
+	goto st82;
+tr131:
+#line 576 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
-	goto st80;
-tr128:
+	goto st82;
+tr132:
 #line 65 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         advance_line(1);
     }}
-	goto st80;
-tr131:
-#line 525 "ext/ragel/base_lexer.rl"
+	goto st82;
+tr136:
+#line 526 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
-        {( state->stack)[( state->top)++] = 80;goto st75;}
+        {( state->stack)[( state->top)++] = 82;goto st77;}
     }}
-	goto st80;
-tr132:
-	( state->cs) = 80;
-#line 566 "ext/ragel/base_lexer.rl"
+	goto st82;
+tr137:
+	( state->cs) = 82;
+#line 568 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_element_open_end);
 
-            ( state->cs) = 33;
+            ( state->cs) = 35;
         }}
 	goto _again;
-tr133:
-#line 560 "ext/ragel/base_lexer.rl"
+tr138:
+#line 562 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_attribute, data, encoding, ts, te);
         }}
-	goto st80;
-tr134:
-#line 556 "ext/ragel/base_lexer.rl"
+	goto st82;
+tr139:
+#line 558 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback(id_on_attribute_ns, data, encoding, ts, te - 1);
         }}
-	goto st80;
-tr135:
+	goto st82;
+tr140:
 #line 65 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         advance_line(1);
     }}
-	goto st80;
-tr136:
-#line 574 "ext/ragel/base_lexer.rl"
+	goto st82;
+tr141:
+#line 576 "ext/ragel/base_lexer.rl"
 	{te = p;p--;}
-	goto st80;
-tr137:
-	( state->cs) = 80;
-#line 546 "ext/ragel/base_lexer.rl"
+	goto st82;
+tr142:
+	( state->cs) = 82;
+#line 547 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_element_end);
-        ( state->cs) = 33;
+        ( state->cs) = 35;
     }}
 	goto _again;
-st80:
+tr144:
+#line 555 "ext/ragel/base_lexer.rl"
+	{te = p;p--;}
+	goto st82;
+st82:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof80;
-case 80:
+		goto _test_eof82;
+case 82:
 #line 1 "NONE"
 	{ts = p;}
-#line 1968 "ext/c/lexer.c"
+#line 1984 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 10: goto tr128;
-		case 13: goto st82;
-		case 47: goto st83;
-		case 61: goto tr131;
-		case 62: goto tr132;
-		case 96: goto tr127;
+		case 10: goto tr132;
+		case 13: goto st84;
+		case 47: goto st85;
+		case 60: goto st86;
+		case 61: goto tr136;
+		case 62: goto tr137;
+		case 96: goto tr131;
 	}
 	if ( (*p) < 58 ) {
 		if ( 0 <= (*p) && (*p) <= 44 )
-			goto tr127;
+			goto tr131;
 	} else if ( (*p) > 64 ) {
 		if ( (*p) > 94 ) {
 			if ( 123 <= (*p) )
-				goto tr127;
+				goto tr131;
 		} else if ( (*p) >= 91 )
-			goto tr127;
+			goto tr131;
 	} else
-		goto tr127;
-	goto st81;
-st81:
+		goto tr131;
+	goto st83;
+st83:
 	if ( ++p == pe )
-		goto _test_eof81;
-case 81:
+		goto _test_eof83;
+case 83:
 	switch( (*p) ) {
-		case 47: goto tr133;
-		case 58: goto tr134;
-		case 96: goto tr133;
+		case 47: goto tr138;
+		case 58: goto tr139;
+		case 96: goto tr138;
 	}
 	if ( (*p) < 59 ) {
 		if ( 0 <= (*p) && (*p) <= 44 )
-			goto tr133;
+			goto tr138;
 	} else if ( (*p) > 64 ) {
 		if ( (*p) > 94 ) {
 			if ( 123 <= (*p) )
-				goto tr133;
+				goto tr138;
 		} else if ( (*p) >= 91 )
-			goto tr133;
+			goto tr138;
 	} else
-		goto tr133;
-	goto st81;
-st82:
+		goto tr138;
+	goto st83;
+st84:
 	if ( ++p == pe )
-		goto _test_eof82;
-case 82:
+		goto _test_eof84;
+case 84:
 	if ( (*p) == 10 )
-		goto tr128;
-	goto tr135;
-st83:
+		goto tr132;
+	goto tr140;
+st85:
 	if ( ++p == pe )
-		goto _test_eof83;
-case 83:
+		goto _test_eof85;
+case 85:
 	if ( (*p) == 62 )
-		goto tr137;
-	goto tr136;
-tr139:
-#line 607 "ext/ragel/base_lexer.rl"
+		goto tr142;
+	goto tr141;
+st86:
+	if ( ++p == pe )
+		goto _test_eof86;
+case 86:
+	switch( (*p) ) {
+		case 47: goto tr141;
+		case 96: goto tr141;
+	}
+	if ( (*p) < 58 ) {
+		if ( 0 <= (*p) && (*p) <= 44 )
+			goto tr141;
+	} else if ( (*p) > 64 ) {
+		if ( (*p) > 94 ) {
+			if ( 123 <= (*p) )
+				goto tr141;
+		} else if ( (*p) >= 91 )
+			goto tr141;
+	} else
+		goto tr141;
+	goto tr143;
+tr143:
+#line 1 "NONE"
 	{te = p+1;}
-	goto st84;
-tr140:
+	goto st87;
+st87:
+	if ( ++p == pe )
+		goto _test_eof87;
+case 87:
+#line 2069 "ext/c/lexer.c"
+	switch( (*p) ) {
+		case 47: goto tr144;
+		case 58: goto st20;
+		case 96: goto tr144;
+	}
+	if ( (*p) < 59 ) {
+		if ( 0 <= (*p) && (*p) <= 44 )
+			goto tr144;
+	} else if ( (*p) > 64 ) {
+		if ( (*p) > 94 ) {
+			if ( 123 <= (*p) )
+				goto tr144;
+		} else if ( (*p) >= 91 )
+			goto tr144;
+	} else
+		goto tr144;
+	goto tr143;
+st20:
+	if ( ++p == pe )
+		goto _test_eof20;
+case 20:
+	switch( (*p) ) {
+		case 47: goto tr26;
+		case 96: goto tr26;
+	}
+	if ( (*p) < 58 ) {
+		if ( 0 <= (*p) && (*p) <= 44 )
+			goto tr26;
+	} else if ( (*p) > 64 ) {
+		if ( (*p) > 94 ) {
+			if ( 123 <= (*p) )
+				goto tr26;
+		} else if ( (*p) >= 91 )
+			goto tr26;
+	} else
+		goto tr26;
+	goto st88;
+st88:
+	if ( ++p == pe )
+		goto _test_eof88;
+case 88:
+	switch( (*p) ) {
+		case 47: goto tr144;
+		case 96: goto tr144;
+	}
+	if ( (*p) < 58 ) {
+		if ( 0 <= (*p) && (*p) <= 44 )
+			goto tr144;
+	} else if ( (*p) > 64 ) {
+		if ( (*p) > 94 ) {
+			if ( 123 <= (*p) )
+				goto tr144;
+		} else if ( (*p) >= 91 )
+			goto tr144;
+	} else
+		goto tr144;
+	goto st88;
+tr28:
+#line 583 "ext/ragel/base_lexer.rl"
+	{{p = ((te))-1;}}
+	goto st89;
+tr147:
+#line 610 "ext/ragel/base_lexer.rl"
+	{te = p+1;}
+	goto st89;
+tr148:
 #line 65 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         advance_line(1);
     }}
-	goto st84;
-tr143:
-#line 525 "ext/ragel/base_lexer.rl"
+	goto st89;
+tr152:
+#line 526 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
-        {( state->stack)[( state->top)++] = 84;goto st75;}
+        {( state->stack)[( state->top)++] = 89;goto st77;}
     }}
-	goto st84;
-tr144:
-	( state->cs) = 84;
-#line 588 "ext/ragel/base_lexer.rl"
+	goto st89;
+tr153:
+	( state->cs) = 89;
+#line 591 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_element_open_end);
 
             if ( html_script_p() )
             {
-                ( state->cs) = 92;
+                ( state->cs) = 100;
             }
             else if ( html_style_p() )
             {
-                ( state->cs) = 96;
+                ( state->cs) = 104;
             }
             else
             {
-                ( state->cs) = 33;
+                ( state->cs) = 35;
             }
         }}
 	goto _again;
-tr145:
-#line 582 "ext/ragel/base_lexer.rl"
+tr154:
+#line 585 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_attribute, data, encoding, ts, te);
         }}
-	goto st84;
-tr146:
+	goto st89;
+tr155:
 #line 65 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         advance_line(1);
     }}
-	goto st84;
-tr147:
-#line 607 "ext/ragel/base_lexer.rl"
+	goto st89;
+tr156:
+#line 610 "ext/ragel/base_lexer.rl"
 	{te = p;p--;}
-	goto st84;
-tr148:
-	( state->cs) = 84;
-#line 546 "ext/ragel/base_lexer.rl"
+	goto st89;
+tr157:
+	( state->cs) = 89;
+#line 547 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_element_end);
-        ( state->cs) = 33;
+        ( state->cs) = 35;
     }}
 	goto _again;
-st84:
+tr159:
+#line 583 "ext/ragel/base_lexer.rl"
+	{te = p;p--;}
+	goto st89;
+st89:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof84;
-case 84:
+		goto _test_eof89;
+case 89:
 #line 1 "NONE"
 	{ts = p;}
-#line 2092 "ext/c/lexer.c"
+#line 2203 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 10: goto tr140;
-		case 13: goto st86;
-		case 47: goto st87;
-		case 61: goto tr143;
-		case 62: goto tr144;
-		case 96: goto tr139;
+		case 10: goto tr148;
+		case 13: goto st91;
+		case 47: goto st92;
+		case 60: goto st93;
+		case 61: goto tr152;
+		case 62: goto tr153;
+		case 96: goto tr147;
 	}
 	if ( (*p) < 59 ) {
 		if ( 0 <= (*p) && (*p) <= 44 )
-			goto tr139;
+			goto tr147;
 	} else if ( (*p) > 64 ) {
 		if ( (*p) > 94 ) {
 			if ( 123 <= (*p) )
-				goto tr139;
+				goto tr147;
 		} else if ( (*p) >= 91 )
-			goto tr139;
+			goto tr147;
 	} else
-		goto tr139;
-	goto st85;
-st85:
+		goto tr147;
+	goto st90;
+st90:
 	if ( ++p == pe )
-		goto _test_eof85;
-case 85:
+		goto _test_eof90;
+case 90:
 	switch( (*p) ) {
-		case 47: goto tr145;
-		case 96: goto tr145;
+		case 47: goto tr154;
+		case 96: goto tr154;
 	}
 	if ( (*p) < 59 ) {
 		if ( 0 <= (*p) && (*p) <= 44 )
-			goto tr145;
+			goto tr154;
 	} else if ( (*p) > 64 ) {
 		if ( (*p) > 94 ) {
 			if ( 123 <= (*p) )
-				goto tr145;
+				goto tr154;
 		} else if ( (*p) >= 91 )
-			goto tr145;
+			goto tr154;
 	} else
-		goto tr145;
-	goto st85;
-st86:
+		goto tr154;
+	goto st90;
+st91:
 	if ( ++p == pe )
-		goto _test_eof86;
-case 86:
+		goto _test_eof91;
+case 91:
 	if ( (*p) == 10 )
-		goto tr140;
-	goto tr146;
-st87:
+		goto tr148;
+	goto tr155;
+st92:
 	if ( ++p == pe )
-		goto _test_eof87;
-case 87:
+		goto _test_eof92;
+case 92:
 	if ( (*p) == 62 )
-		goto tr148;
-	goto tr147;
-tr151:
-	( state->cs) = 88;
-#line 644 "ext/ragel/base_lexer.rl"
+		goto tr157;
+	goto tr156;
+st93:
+	if ( ++p == pe )
+		goto _test_eof93;
+case 93:
+	switch( (*p) ) {
+		case 47: goto tr156;
+		case 96: goto tr156;
+	}
+	if ( (*p) < 58 ) {
+		if ( 0 <= (*p) && (*p) <= 44 )
+			goto tr156;
+	} else if ( (*p) > 64 ) {
+		if ( (*p) > 94 ) {
+			if ( 123 <= (*p) )
+				goto tr156;
+		} else if ( (*p) >= 91 )
+			goto tr156;
+	} else
+		goto tr156;
+	goto tr158;
+tr158:
+#line 1 "NONE"
+	{te = p+1;}
+	goto st94;
+st94:
+	if ( ++p == pe )
+		goto _test_eof94;
+case 94:
+#line 2287 "ext/c/lexer.c"
+	switch( (*p) ) {
+		case 47: goto tr159;
+		case 58: goto st21;
+		case 96: goto tr159;
+	}
+	if ( (*p) < 59 ) {
+		if ( 0 <= (*p) && (*p) <= 44 )
+			goto tr159;
+	} else if ( (*p) > 64 ) {
+		if ( (*p) > 94 ) {
+			if ( 123 <= (*p) )
+				goto tr159;
+		} else if ( (*p) >= 91 )
+			goto tr159;
+	} else
+		goto tr159;
+	goto tr158;
+st21:
+	if ( ++p == pe )
+		goto _test_eof21;
+case 21:
+	switch( (*p) ) {
+		case 47: goto tr28;
+		case 96: goto tr28;
+	}
+	if ( (*p) < 58 ) {
+		if ( 0 <= (*p) && (*p) <= 44 )
+			goto tr28;
+	} else if ( (*p) > 64 ) {
+		if ( (*p) > 94 ) {
+			if ( 123 <= (*p) )
+				goto tr28;
+		} else if ( (*p) >= 91 )
+			goto tr28;
+	} else
+		goto tr28;
+	goto st95;
+st95:
+	if ( ++p == pe )
+		goto _test_eof95;
+case 95:
+	switch( (*p) ) {
+		case 47: goto tr159;
+		case 96: goto tr159;
+	}
+	if ( (*p) < 58 ) {
+		if ( 0 <= (*p) && (*p) <= 44 )
+			goto tr159;
+	} else if ( (*p) > 64 ) {
+		if ( (*p) > 94 ) {
+			if ( 123 <= (*p) )
+				goto tr159;
+		} else if ( (*p) >= 91 )
+			goto tr159;
+	} else
+		goto tr159;
+	goto st95;
+tr163:
+	( state->cs) = 96;
+#line 647 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_text, data, encoding, ts, te);
 
@@ -2156,12 +2354,12 @@ tr151:
                 lines = 0;
             }
 
-            ( state->cs) = 33;
+            ( state->cs) = 35;
         }}
 	goto _again;
-tr153:
-	( state->cs) = 88;
-#line 658 "ext/ragel/base_lexer.rl"
+tr165:
+	( state->cs) = 96;
+#line 661 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback(id_on_text, data, encoding, ts, mark);
 
@@ -2175,12 +2373,12 @@ tr153:
                 lines = 0;
             }
 
-            ( state->cs) = 33;
+            ( state->cs) = 35;
         }}
 	goto _again;
-tr154:
-	( state->cs) = 88;
-#line 644 "ext/ragel/base_lexer.rl"
+tr166:
+	( state->cs) = 96;
+#line 647 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback(id_on_text, data, encoding, ts, te);
 
@@ -2191,103 +2389,103 @@ tr154:
                 lines = 0;
             }
 
-            ( state->cs) = 33;
+            ( state->cs) = 35;
         }}
 	goto _again;
-st88:
+st96:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof88;
-case 88:
+		goto _test_eof96;
+case 96:
 #line 1 "NONE"
 	{ts = p;}
-#line 2206 "ext/c/lexer.c"
+#line 2404 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr150;
-	goto tr149;
-tr149:
+		goto tr162;
+	goto tr161;
+tr161:
 #line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st89;
-st89:
+	goto st97;
+st97:
 	if ( ++p == pe )
-		goto _test_eof89;
-case 89:
-#line 2220 "ext/c/lexer.c"
+		goto _test_eof97;
+case 97:
+#line 2418 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr152;
-	goto tr149;
-tr152:
+		goto tr164;
+	goto tr161;
+tr164:
 #line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-#line 658 "ext/ragel/base_lexer.rl"
+#line 661 "ext/ragel/base_lexer.rl"
 	{ mark = p; }
-	goto st90;
-st90:
+	goto st98;
+st98:
 	if ( ++p == pe )
-		goto _test_eof90;
-case 90:
-#line 2236 "ext/c/lexer.c"
+		goto _test_eof98;
+case 98:
+#line 2434 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 60: goto tr152;
-		case 64: goto tr149;
-		case 96: goto tr149;
+		case 60: goto tr164;
+		case 64: goto tr161;
+		case 96: goto tr161;
 	}
 	if ( (*p) < 58 ) {
 		if ( (*p) > 32 ) {
 			if ( 34 <= (*p) && (*p) <= 44 )
-				goto tr149;
+				goto tr161;
 		} else if ( (*p) >= 0 )
-			goto tr149;
+			goto tr161;
 	} else if ( (*p) > 62 ) {
 		if ( (*p) > 94 ) {
 			if ( 123 <= (*p) )
-				goto tr149;
+				goto tr161;
 		} else if ( (*p) >= 91 )
-			goto tr149;
+			goto tr161;
 	} else
-		goto tr149;
-	goto tr153;
-tr150:
+		goto tr161;
+	goto tr165;
+tr162:
 #line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-#line 658 "ext/ragel/base_lexer.rl"
+#line 661 "ext/ragel/base_lexer.rl"
 	{ mark = p; }
-	goto st91;
-st91:
+	goto st99;
+st99:
 	if ( ++p == pe )
-		goto _test_eof91;
-case 91:
-#line 2269 "ext/c/lexer.c"
+		goto _test_eof99;
+case 99:
+#line 2467 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 60: goto tr152;
-		case 64: goto tr149;
-		case 96: goto tr149;
+		case 60: goto tr164;
+		case 64: goto tr161;
+		case 96: goto tr161;
 	}
 	if ( (*p) < 58 ) {
 		if ( (*p) > 32 ) {
 			if ( 34 <= (*p) && (*p) <= 44 )
-				goto tr149;
+				goto tr161;
 		} else if ( (*p) >= 0 )
-			goto tr149;
+			goto tr161;
 	} else if ( (*p) > 62 ) {
 		if ( (*p) > 94 ) {
 			if ( 123 <= (*p) )
-				goto tr149;
+				goto tr161;
 		} else if ( (*p) >= 91 )
-			goto tr149;
+			goto tr161;
 	} else
-		goto tr149;
-	goto tr154;
-tr26:
-#line 632 "ext/ragel/base_lexer.rl"
+		goto tr161;
+	goto tr166;
+tr30:
+#line 635 "ext/ragel/base_lexer.rl"
 	{{p = ((te))-1;}{
         callback(id_on_text, data, encoding, ts, te);
 
@@ -2298,18 +2496,18 @@ tr26:
             lines = 0;
         }
     }}
-	goto st92;
-tr33:
-	( state->cs) = 92;
+	goto st100;
+tr37:
+	( state->cs) = 100;
 #line 384 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_element_end);
 
-        ( state->cs) = 33;
+        ( state->cs) = 35;
     }}
 	goto _again;
-tr157:
-#line 632 "ext/ragel/base_lexer.rl"
+tr169:
+#line 635 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback(id_on_text, data, encoding, ts, te);
 
@@ -2320,116 +2518,116 @@ tr157:
             lines = 0;
         }
     }}
-	goto st92;
-st92:
+	goto st100;
+st100:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof92;
-case 92:
+		goto _test_eof100;
+case 100:
 #line 1 "NONE"
 	{ts = p;}
-#line 2333 "ext/c/lexer.c"
+#line 2531 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr156;
-	goto tr155;
-tr155:
+		goto tr168;
+	goto tr167;
+tr167:
 #line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st93;
-st93:
+	goto st101;
+st101:
 	if ( ++p == pe )
-		goto _test_eof93;
-case 93:
-#line 2347 "ext/c/lexer.c"
+		goto _test_eof101;
+case 101:
+#line 2545 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr157;
-	goto tr155;
-tr156:
+		goto tr169;
+	goto tr167;
+tr168:
 #line 1 "NONE"
 	{te = p+1;}
 #line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st94;
-st94:
+	goto st102;
+st102:
 	if ( ++p == pe )
-		goto _test_eof94;
-case 94:
-#line 2363 "ext/c/lexer.c"
+		goto _test_eof102;
+case 102:
+#line 2561 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 47: goto st20;
-		case 60: goto tr159;
+		case 47: goto st22;
+		case 60: goto tr171;
 	}
-	goto tr157;
-st20:
-	if ( ++p == pe )
-		goto _test_eof20;
-case 20:
-	if ( (*p) == 115 )
-		goto st21;
-	goto tr26;
-st21:
-	if ( ++p == pe )
-		goto _test_eof21;
-case 21:
-	if ( (*p) == 99 )
-		goto st22;
-	goto tr26;
+	goto tr169;
 st22:
 	if ( ++p == pe )
 		goto _test_eof22;
 case 22:
-	if ( (*p) == 114 )
+	if ( (*p) == 115 )
 		goto st23;
-	goto tr26;
+	goto tr30;
 st23:
 	if ( ++p == pe )
 		goto _test_eof23;
 case 23:
-	if ( (*p) == 105 )
+	if ( (*p) == 99 )
 		goto st24;
-	goto tr26;
+	goto tr30;
 st24:
 	if ( ++p == pe )
 		goto _test_eof24;
 case 24:
-	if ( (*p) == 112 )
+	if ( (*p) == 114 )
 		goto st25;
-	goto tr26;
+	goto tr30;
 st25:
 	if ( ++p == pe )
 		goto _test_eof25;
 case 25:
-	if ( (*p) == 116 )
+	if ( (*p) == 105 )
 		goto st26;
-	goto tr26;
+	goto tr30;
 st26:
 	if ( ++p == pe )
 		goto _test_eof26;
 case 26:
+	if ( (*p) == 112 )
+		goto st27;
+	goto tr30;
+st27:
+	if ( ++p == pe )
+		goto _test_eof27;
+case 27:
+	if ( (*p) == 116 )
+		goto st28;
+	goto tr30;
+st28:
+	if ( ++p == pe )
+		goto _test_eof28;
+case 28:
 	if ( (*p) == 62 )
-		goto tr33;
-	goto tr26;
-tr159:
+		goto tr37;
+	goto tr30;
+tr171:
 #line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st95;
-st95:
+	goto st103;
+st103:
 	if ( ++p == pe )
-		goto _test_eof95;
-case 95:
-#line 2428 "ext/c/lexer.c"
+		goto _test_eof103;
+case 103:
+#line 2626 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr159;
-	goto tr157;
-tr34:
-#line 632 "ext/ragel/base_lexer.rl"
+		goto tr171;
+	goto tr169;
+tr38:
+#line 635 "ext/ragel/base_lexer.rl"
 	{{p = ((te))-1;}{
         callback(id_on_text, data, encoding, ts, te);
 
@@ -2440,18 +2638,18 @@ tr34:
             lines = 0;
         }
     }}
-	goto st96;
-tr40:
-	( state->cs) = 96;
+	goto st104;
+tr44:
+	( state->cs) = 104;
 #line 384 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_element_end);
 
-        ( state->cs) = 33;
+        ( state->cs) = 35;
     }}
 	goto _again;
-tr162:
-#line 632 "ext/ragel/base_lexer.rl"
+tr174:
+#line 635 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback(id_on_text, data, encoding, ts, te);
 
@@ -2462,110 +2660,110 @@ tr162:
             lines = 0;
         }
     }}
-	goto st96;
-st96:
+	goto st104;
+st104:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof96;
-case 96:
+		goto _test_eof104;
+case 104:
 #line 1 "NONE"
 	{ts = p;}
-#line 2475 "ext/c/lexer.c"
+#line 2673 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr161;
-	goto tr160;
-tr160:
+		goto tr173;
+	goto tr172;
+tr172:
 #line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st97;
-st97:
+	goto st105;
+st105:
 	if ( ++p == pe )
-		goto _test_eof97;
-case 97:
-#line 2489 "ext/c/lexer.c"
+		goto _test_eof105;
+case 105:
+#line 2687 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr162;
-	goto tr160;
-tr161:
+		goto tr174;
+	goto tr172;
+tr173:
 #line 1 "NONE"
 	{te = p+1;}
 #line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st98;
-st98:
+	goto st106;
+st106:
 	if ( ++p == pe )
-		goto _test_eof98;
-case 98:
-#line 2505 "ext/c/lexer.c"
+		goto _test_eof106;
+case 106:
+#line 2703 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 47: goto st27;
-		case 60: goto tr164;
+		case 47: goto st29;
+		case 60: goto tr176;
 	}
-	goto tr162;
-st27:
-	if ( ++p == pe )
-		goto _test_eof27;
-case 27:
-	if ( (*p) == 115 )
-		goto st28;
-	goto tr34;
-st28:
-	if ( ++p == pe )
-		goto _test_eof28;
-case 28:
-	if ( (*p) == 116 )
-		goto st29;
-	goto tr34;
+	goto tr174;
 st29:
 	if ( ++p == pe )
 		goto _test_eof29;
 case 29:
-	if ( (*p) == 121 )
+	if ( (*p) == 115 )
 		goto st30;
-	goto tr34;
+	goto tr38;
 st30:
 	if ( ++p == pe )
 		goto _test_eof30;
 case 30:
-	if ( (*p) == 108 )
+	if ( (*p) == 116 )
 		goto st31;
-	goto tr34;
+	goto tr38;
 st31:
 	if ( ++p == pe )
 		goto _test_eof31;
 case 31:
-	if ( (*p) == 101 )
+	if ( (*p) == 121 )
 		goto st32;
-	goto tr34;
+	goto tr38;
 st32:
 	if ( ++p == pe )
 		goto _test_eof32;
 case 32:
+	if ( (*p) == 108 )
+		goto st33;
+	goto tr38;
+st33:
+	if ( ++p == pe )
+		goto _test_eof33;
+case 33:
+	if ( (*p) == 101 )
+		goto st34;
+	goto tr38;
+st34:
+	if ( ++p == pe )
+		goto _test_eof34;
+case 34:
 	if ( (*p) == 62 )
-		goto tr40;
-	goto tr34;
-tr164:
+		goto tr44;
+	goto tr38;
+tr176:
 #line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st99;
-st99:
+	goto st107;
+st107:
 	if ( ++p == pe )
-		goto _test_eof99;
-case 99:
-#line 2563 "ext/c/lexer.c"
+		goto _test_eof107;
+case 107:
+#line 2761 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr164;
-	goto tr162;
+		goto tr176;
+	goto tr174;
 	}
-	_test_eof33: ( state->cs) = 33; goto _test_eof; 
-	_test_eof34: ( state->cs) = 34; goto _test_eof; 
+	_test_eof35: ( state->cs) = 35; goto _test_eof; 
+	_test_eof36: ( state->cs) = 36; goto _test_eof; 
 	_test_eof1: ( state->cs) = 1; goto _test_eof; 
 	_test_eof2: ( state->cs) = 2; goto _test_eof; 
 	_test_eof3: ( state->cs) = 3; goto _test_eof; 
@@ -2575,7 +2773,7 @@ case 99:
 	_test_eof7: ( state->cs) = 7; goto _test_eof; 
 	_test_eof8: ( state->cs) = 8; goto _test_eof; 
 	_test_eof9: ( state->cs) = 9; goto _test_eof; 
-	_test_eof35: ( state->cs) = 35; goto _test_eof; 
+	_test_eof37: ( state->cs) = 37; goto _test_eof; 
 	_test_eof10: ( state->cs) = 10; goto _test_eof; 
 	_test_eof11: ( state->cs) = 11; goto _test_eof; 
 	_test_eof12: ( state->cs) = 12; goto _test_eof; 
@@ -2583,21 +2781,19 @@ case 99:
 	_test_eof14: ( state->cs) = 14; goto _test_eof; 
 	_test_eof15: ( state->cs) = 15; goto _test_eof; 
 	_test_eof16: ( state->cs) = 16; goto _test_eof; 
-	_test_eof36: ( state->cs) = 36; goto _test_eof; 
-	_test_eof17: ( state->cs) = 17; goto _test_eof; 
-	_test_eof37: ( state->cs) = 37; goto _test_eof; 
 	_test_eof38: ( state->cs) = 38; goto _test_eof; 
+	_test_eof17: ( state->cs) = 17; goto _test_eof; 
 	_test_eof39: ( state->cs) = 39; goto _test_eof; 
 	_test_eof40: ( state->cs) = 40; goto _test_eof; 
 	_test_eof41: ( state->cs) = 41; goto _test_eof; 
 	_test_eof42: ( state->cs) = 42; goto _test_eof; 
-	_test_eof18: ( state->cs) = 18; goto _test_eof; 
 	_test_eof43: ( state->cs) = 43; goto _test_eof; 
 	_test_eof44: ( state->cs) = 44; goto _test_eof; 
+	_test_eof18: ( state->cs) = 18; goto _test_eof; 
 	_test_eof45: ( state->cs) = 45; goto _test_eof; 
-	_test_eof19: ( state->cs) = 19; goto _test_eof; 
 	_test_eof46: ( state->cs) = 46; goto _test_eof; 
 	_test_eof47: ( state->cs) = 47; goto _test_eof; 
+	_test_eof19: ( state->cs) = 19; goto _test_eof; 
 	_test_eof48: ( state->cs) = 48; goto _test_eof; 
 	_test_eof49: ( state->cs) = 49; goto _test_eof; 
 	_test_eof50: ( state->cs) = 50; goto _test_eof; 
@@ -2638,6 +2834,7 @@ case 99:
 	_test_eof85: ( state->cs) = 85; goto _test_eof; 
 	_test_eof86: ( state->cs) = 86; goto _test_eof; 
 	_test_eof87: ( state->cs) = 87; goto _test_eof; 
+	_test_eof20: ( state->cs) = 20; 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; 
@@ -2645,30 +2842,39 @@ case 99:
 	_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_eof20: ( state->cs) = 20; goto _test_eof; 
 	_test_eof21: ( state->cs) = 21; goto _test_eof; 
+	_test_eof95: ( state->cs) = 95; goto _test_eof; 
+	_test_eof96: ( state->cs) = 96; goto _test_eof; 
+	_test_eof97: ( state->cs) = 97; goto _test_eof; 
+	_test_eof98: ( state->cs) = 98; goto _test_eof; 
+	_test_eof99: ( state->cs) = 99; goto _test_eof; 
+	_test_eof100: ( state->cs) = 100; goto _test_eof; 
+	_test_eof101: ( state->cs) = 101; goto _test_eof; 
+	_test_eof102: ( state->cs) = 102; goto _test_eof; 
 	_test_eof22: ( state->cs) = 22; goto _test_eof; 
 	_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_eof26: ( state->cs) = 26; goto _test_eof; 
-	_test_eof95: ( state->cs) = 95; goto _test_eof; 
-	_test_eof96: ( state->cs) = 96; goto _test_eof; 
-	_test_eof97: ( state->cs) = 97; goto _test_eof; 
-	_test_eof98: ( state->cs) = 98; goto _test_eof; 
 	_test_eof27: ( state->cs) = 27; goto _test_eof; 
 	_test_eof28: ( state->cs) = 28; goto _test_eof; 
+	_test_eof103: ( state->cs) = 103; goto _test_eof; 
+	_test_eof104: ( state->cs) = 104; goto _test_eof; 
+	_test_eof105: ( state->cs) = 105; goto _test_eof; 
+	_test_eof106: ( state->cs) = 106; 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_eof32: ( state->cs) = 32; goto _test_eof; 
-	_test_eof99: ( state->cs) = 99; goto _test_eof; 
+	_test_eof33: ( state->cs) = 33; goto _test_eof; 
+	_test_eof34: ( state->cs) = 34; goto _test_eof; 
+	_test_eof107: ( state->cs) = 107; goto _test_eof; 
 
 	_test_eof: {}
 	if ( p == eof )
 	{
 	switch ( ( state->cs) ) {
-	case 34: goto tr43;
+	case 36: goto tr47;
 	case 1: goto tr0;
 	case 2: goto tr0;
 	case 3: goto tr0;
@@ -2678,7 +2884,7 @@ case 99:
 	case 7: goto tr0;
 	case 8: goto tr0;
 	case 9: goto tr0;
-	case 35: goto tr48;
+	case 37: goto tr52;
 	case 10: goto tr0;
 	case 11: goto tr0;
 	case 12: goto tr0;
@@ -2686,68 +2892,76 @@ case 99:
 	case 14: goto tr0;
 	case 15: goto tr0;
 	case 16: goto tr0;
-	case 36: goto tr20;
+	case 38: goto tr20;
 	case 17: goto tr20;
-	case 37: goto tr50;
-	case 38: goto tr50;
-	case 39: goto tr50;
-	case 41: goto tr55;
-	case 42: goto tr55;
-	case 18: goto tr22;
+	case 39: goto tr54;
+	case 40: goto tr54;
+	case 41: goto tr54;
+	case 43: goto tr59;
 	case 44: goto tr59;
-	case 45: goto tr59;
-	case 19: goto tr24;
+	case 18: goto tr22;
+	case 46: goto tr63;
 	case 47: goto tr63;
-	case 48: goto tr63;
+	case 19: goto tr24;
+	case 49: goto tr67;
 	case 50: goto tr67;
-	case 52: goto tr70;
-	case 54: goto tr73;
-	case 56: goto tr85;
-	case 57: goto tr86;
-	case 58: goto tr87;
-	case 59: goto tr87;
-	case 60: goto tr87;
-	case 61: goto tr87;
-	case 62: goto tr87;
-	case 63: goto tr87;
-	case 64: goto tr87;
-	case 65: goto tr87;
-	case 66: goto tr87;
-	case 67: goto tr87;
-	case 69: goto tr102;
-	case 70: goto tr104;
-	case 72: goto tr107;
-	case 74: goto tr112;
-	case 76: goto tr119;
-	case 78: goto tr122;
-	case 81: goto tr133;
-	case 82: goto tr135;
-	case 83: goto tr136;
-	case 85: goto tr145;
-	case 86: goto tr146;
-	case 87: goto tr147;
-	case 89: goto tr151;
-	case 90: goto tr151;
-	case 91: goto tr151;
-	case 93: goto tr157;
-	case 94: goto tr157;
+	case 52: goto tr71;
+	case 54: goto tr74;
+	case 56: goto tr77;
+	case 58: goto tr89;
+	case 59: goto tr90;
+	case 60: goto tr91;
+	case 61: goto tr91;
+	case 62: goto tr91;
+	case 63: goto tr91;
+	case 64: goto tr91;
+	case 65: goto tr91;
+	case 66: goto tr91;
+	case 67: goto tr91;
+	case 68: goto tr91;
+	case 69: goto tr91;
+	case 71: goto tr106;
+	case 72: goto tr108;
+	case 74: goto tr111;
+	case 76: goto tr116;
+	case 78: goto tr123;
+	case 80: goto tr126;
+	case 83: goto tr138;
+	case 84: goto tr140;
+	case 85: goto tr141;
+	case 86: goto tr141;
+	case 87: goto tr144;
 	case 20: goto tr26;
-	case 21: goto tr26;
-	case 22: goto tr26;
-	case 23: goto tr26;
-	case 24: goto tr26;
-	case 25: goto tr26;
-	case 26: goto tr26;
-	case 95: goto tr157;
-	case 97: goto tr162;
-	case 98: goto tr162;
-	case 27: goto tr34;
-	case 28: goto tr34;
-	case 29: goto tr34;
-	case 30: goto tr34;
-	case 31: goto tr34;
-	case 32: goto tr34;
-	case 99: goto tr162;
+	case 88: goto tr144;
+	case 90: goto tr154;
+	case 91: goto tr155;
+	case 92: goto tr156;
+	case 93: goto tr156;
+	case 94: goto tr159;
+	case 21: goto tr28;
+	case 95: goto tr159;
+	case 97: goto tr163;
+	case 98: goto tr163;
+	case 99: goto tr163;
+	case 101: goto tr169;
+	case 102: goto tr169;
+	case 22: goto tr30;
+	case 23: goto tr30;
+	case 24: goto tr30;
+	case 25: goto tr30;
+	case 26: goto tr30;
+	case 27: goto tr30;
+	case 28: goto tr30;
+	case 103: goto tr169;
+	case 105: goto tr174;
+	case 106: goto tr174;
+	case 29: goto tr38;
+	case 30: goto tr38;
+	case 31: goto tr38;
+	case 32: goto tr38;
+	case 33: goto tr38;
+	case 34: goto tr38;
+	case 107: goto tr174;
 	}
 	}