oga 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db4b96ad057c25c8862ea08609016370ee71ef38
-  data.tar.gz: 906a9c5f12250335940e2a05a4dbd65287a5c558
+  metadata.gz: d5c02d84a4161b33137cf8e33f59fe380f82c44e
+  data.tar.gz: f9cd0112fa6b6975db454284bb084a0537cdaab4
 SHA512:
-  metadata.gz: 7d1d40c743fc853791413d7530c1ed4e87da47c67e1a680db6ca3074f423e7897dd45c10d6af1a47973149f11a20efbf3e9ee33fc7df77f4518b3da803cdb801
-  data.tar.gz: 2f25d9fa9dc7d9ae40fc76acd0227a204e6d049e37b335bd1b8e94f72adfc37b9005d6905897fbe809baaf3262045686285d2fb8462fdae2b90cac7a02862090
+  metadata.gz: e5d24799bc8ccaca4baa3756a0d38f5ccf55f26136c6dfca00463b674192098c913869219e09bc034bbb23af00250451d783e6734dbfbe57b45719b3169635ad
+  data.tar.gz: 671e57a0082aae1df5e8cb808a2c1fcfbffed8f2343da2c19778a73cd56ec368b2c147b56c84c1ceb5bd52cc350ff6f6abfe79d6ab65803ab4b1508e62350771

data/ext/c/lexer.c

@@ -71,26 +71,27 @@ void liboga_xml_lexer_callback_simple(VALUE self, VALUE name)
 
 
 #line 74 "ext/c/lexer.c"
-static const int c_lexer_start = 34;
-static const int c_lexer_first_final = 34;
+static const int c_lexer_start = 32;
+static const int c_lexer_first_final = 32;
 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_comment_body = 38;
+static const int c_lexer_en_cdata_body = 41;
+static const int c_lexer_en_proc_ins_body = 44;
+static const int c_lexer_en_string_squote = 47;
+static const int c_lexer_en_string_dquote = 49;
+static const int c_lexer_en_doctype_inline = 51;
+static const int c_lexer_en_doctype = 53;
+static const int c_lexer_en_xml_decl = 66;
+static const int c_lexer_en_element_name = 69;
+static const int c_lexer_en_element_close = 71;
 static const int c_lexer_en_html_attribute_value = 73;
 static const int c_lexer_en_xml_attribute_value = 75;
 static const int c_lexer_en_element_head = 76;
 static const int c_lexer_en_text = 80;
 static const int c_lexer_en_html_script = 84;
 static const int c_lexer_en_html_style = 88;
-static const int c_lexer_en_main = 34;
+static const int c_lexer_en_main = 32;
 
 
 #line 70 "ext/c/lexer.rl"
@@ -156,7 +157,7 @@ VALUE oga_xml_lexer_advance(VALUE self, VALUE data_block)
     lines = state->lines;
 
     
-#line 160 "ext/c/lexer.c"
+#line 161 "ext/c/lexer.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -164,8 +165,8 @@ VALUE oga_xml_lexer_advance(VALUE self, VALUE data_block)
 
 _again:
 	switch ( ( state->cs) ) {
-		case 34: goto st34;
-		case 35: goto st35;
+		case 32: goto st32;
+		case 33: goto st33;
 		case 1: goto st1;
 		case 2: goto st2;
 		case 3: goto st3;
@@ -175,7 +176,7 @@ _again:
 		case 7: goto st7;
 		case 8: goto st8;
 		case 9: goto st9;
-		case 36: goto st36;
+		case 34: goto st34;
 		case 10: goto st10;
 		case 11: goto st11;
 		case 12: goto st12;
@@ -183,19 +184,19 @@ _again:
 		case 14: goto st14;
 		case 15: goto st15;
 		case 16: goto st16;
-		case 17: goto st17;
-		case 18: goto st18;
+		case 35: goto st35;
+		case 36: goto st36;
 		case 37: goto st37;
 		case 38: goto st38;
 		case 39: goto st39;
 		case 40: goto st40;
+		case 17: goto st17;
 		case 41: goto st41;
 		case 42: goto st42;
-		case 19: goto st19;
 		case 43: goto st43;
+		case 18: goto st18;
 		case 44: goto st44;
 		case 45: goto st45;
-		case 20: goto st20;
 		case 46: goto st46;
 		case 47: goto st47;
 		case 48: goto st48;
@@ -204,9 +205,9 @@ _again:
 		case 51: goto st51;
 		case 52: goto st52;
 		case 53: goto st53;
+		case 0: goto st0;
 		case 54: goto st54;
 		case 55: goto st55;
-		case 0: goto st0;
 		case 56: goto st56;
 		case 57: goto st57;
 		case 58: goto st58;
@@ -238,23 +239,23 @@ _again:
 		case 84: goto st84;
 		case 85: goto st85;
 		case 86: goto st86;
+		case 19: goto st19;
+		case 20: goto st20;
 		case 21: goto st21;
 		case 22: goto st22;
 		case 23: goto st23;
 		case 24: goto st24;
 		case 25: goto st25;
-		case 26: goto st26;
-		case 27: goto st27;
 		case 87: goto st87;
 		case 88: goto st88;
 		case 89: goto st89;
 		case 90: goto st90;
+		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 32: goto st32;
-		case 33: goto st33;
 		case 91: goto st91;
 	default: break;
 	}
@@ -265,63 +266,64 @@ _resume:
 	switch ( ( state->cs) )
 	{
 tr0:
-	( state->cs) = 34;
-#line 504 "ext/ragel/base_lexer.rl"
+	( state->cs) = 32;
+#line 530 "ext/ragel/base_lexer.rl"
 	{{p = ((te))-1;}{
         p--;
         ( state->cs) = 80;
     }}
 	goto _again;
 tr4:
-	( state->cs) = 34;
+	( state->cs) = 32;
 #line 84 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_comment_start);
 
-        ( state->cs) = 40;
+        ( state->cs) = 38;
     }}
 	goto _again;
 tr17:
-	( state->cs) = 34;
+	( state->cs) = 32;
 #line 123 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_cdata_start);
 
-        ( state->cs) = 43;
+        ( state->cs) = 41;
     }}
 	goto _again;
-tr20:
-#line 374 "ext/ragel/base_lexer.rl"
-	{te = p+1;{
-        callback_simple(id_on_element_end);
-    }}
-	goto st34;
-tr42:
-	( state->cs) = 34;
-#line 504 "ext/ragel/base_lexer.rl"
+tr39:
+	( state->cs) = 32;
+#line 530 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         p--;
         ( state->cs) = 80;
     }}
 	goto _again;
-tr44:
-	( state->cs) = 34;
-#line 504 "ext/ragel/base_lexer.rl"
+tr41:
+	( state->cs) = 32;
+#line 530 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         p--;
         ( state->cs) = 80;
     }}
 	goto _again;
-tr46:
-	( state->cs) = 34;
-#line 369 "ext/ragel/base_lexer.rl"
+tr43:
+	( state->cs) = 32;
+#line 366 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         p--;
+        ( state->cs) = 69;
+    }}
+	goto _again;
+tr44:
+	( state->cs) = 32;
+#line 371 "ext/ragel/base_lexer.rl"
+	{te = p+1;{
         ( state->cs) = 71;
     }}
 	goto _again;
-tr48:
-	( state->cs) = 34;
+tr46:
+	( state->cs) = 32;
 #line 255 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback_simple(id_on_doctype_start);
@@ -333,77 +335,77 @@ tr48:
             lines = 0;
         }
 
-        ( state->cs) = 55;
+        ( state->cs) = 53;
     }}
 	goto _again;
-tr49:
-	( state->cs) = 34;
+tr47:
+	( state->cs) = 32;
 #line 1 "NONE"
 	{	switch( ( state->act) ) {
-	case 48:
+	case 52:
 	{{p = ((te))-1;}
         callback_simple(id_on_xml_decl_start);
-        ( state->cs) = 68;
+        ( state->cs) = 66;
     }
 	break;
-	case 51:
+	case 55:
 	{{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) = 44;
     }
 	break;
 	}
 	}
 	goto _again;
-tr50:
-	( state->cs) = 34;
+tr48:
+	( state->cs) = 32;
 #line 165 "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) = 44;
     }}
 	goto _again;
-st34:
+st32:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof34;
-case 34:
+		goto _test_eof32;
+case 32:
 #line 1 "NONE"
 	{ts = p;}
-#line 379 "ext/c/lexer.c"
+#line 381 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr43;
-	goto tr42;
-tr43:
+		goto tr40;
+	goto tr39;
+tr40:
 #line 1 "NONE"
 	{te = p+1;}
-	goto st35;
-st35:
+	goto st33;
+st33:
 	if ( ++p == pe )
-		goto _test_eof35;
-case 35:
-#line 391 "ext/c/lexer.c"
+		goto _test_eof33;
+case 33:
+#line 393 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 33: goto st1;
-		case 45: goto tr46;
-		case 47: goto st16;
-		case 63: goto st18;
-		case 95: goto tr46;
+		case 45: goto tr43;
+		case 47: goto tr44;
+		case 63: goto st16;
+		case 95: goto tr43;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr46;
+			goto tr43;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr46;
+			goto tr43;
 	} else
-		goto tr46;
-	goto tr44;
+		goto tr43;
+	goto tr41;
 st1:
 	if ( ++p == pe )
 		goto _test_eof1;
@@ -492,19 +494,19 @@ tr11:
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st36;
-st36:
+	goto st34;
+st34:
 	if ( ++p == pe )
-		goto _test_eof36;
-case 36:
-#line 501 "ext/c/lexer.c"
+		goto _test_eof34;
+case 34:
+#line 503 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 13: goto tr11;
 		case 32: goto tr11;
 	}
 	if ( 9 <= (*p) && (*p) <= 10 )
 		goto tr11;
-	goto tr48;
+	goto tr46;
 st10:
 	if ( ++p == pe )
 		goto _test_eof10;
@@ -552,122 +554,86 @@ st16:
 		goto _test_eof16;
 case 16:
 	switch( (*p) ) {
-		case 45: goto st17;
-		case 95: goto st17;
-	}
-	if ( (*p) < 65 ) {
-		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st17;
-	} else if ( (*p) > 90 ) {
-		if ( 97 <= (*p) && (*p) <= 122 )
-			goto st17;
-	} else
-		goto st17;
-	goto tr0;
-st17:
-	if ( ++p == pe )
-		goto _test_eof17;
-case 17:
-	switch( (*p) ) {
-		case 45: goto st17;
-		case 58: goto st16;
-		case 62: goto tr20;
-		case 95: goto st17;
+		case 45: goto tr18;
+		case 95: goto tr18;
+		case 120: goto st36;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st17;
+			goto tr18;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto st17;
+			goto tr18;
 	} else
-		goto st17;
+		goto tr18;
 	goto tr0;
-st18:
-	if ( ++p == pe )
-		goto _test_eof18;
-case 18:
-	switch( (*p) ) {
-		case 45: goto tr21;
-		case 95: goto tr21;
-		case 120: goto st38;
-	}
-	if ( (*p) < 65 ) {
-		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr21;
-	} else if ( (*p) > 90 ) {
-		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr21;
-	} else
-		goto tr21;
-	goto tr0;
-tr21:
+tr18:
 #line 1 "NONE"
 	{te = p+1;}
 #line 165 "ext/ragel/base_lexer.rl"
-	{( state->act) = 51;}
-	goto st37;
-tr52:
+	{( state->act) = 55;}
+	goto st35;
+tr50:
 #line 1 "NONE"
 	{te = p+1;}
 #line 319 "ext/ragel/base_lexer.rl"
-	{( state->act) = 48;}
-	goto st37;
-st37:
+	{( state->act) = 52;}
+	goto st35;
+st35:
 	if ( ++p == pe )
-		goto _test_eof37;
-case 37:
-#line 621 "ext/c/lexer.c"
+		goto _test_eof35;
+case 35:
+#line 587 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 45: goto tr21;
-		case 95: goto tr21;
+		case 45: goto tr18;
+		case 95: goto tr18;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr21;
+			goto tr18;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr21;
+			goto tr18;
 	} else
-		goto tr21;
-	goto tr49;
-st38:
+		goto tr18;
+	goto tr47;
+st36:
 	if ( ++p == pe )
-		goto _test_eof38;
-case 38:
+		goto _test_eof36;
+case 36:
 	switch( (*p) ) {
-		case 45: goto tr21;
-		case 95: goto tr21;
-		case 109: goto st39;
+		case 45: goto tr18;
+		case 95: goto tr18;
+		case 109: goto st37;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr21;
+			goto tr18;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr21;
+			goto tr18;
 	} else
-		goto tr21;
-	goto tr50;
-st39:
+		goto tr18;
+	goto tr48;
+st37:
 	if ( ++p == pe )
-		goto _test_eof39;
-case 39:
+		goto _test_eof37;
+case 37:
 	switch( (*p) ) {
-		case 45: goto tr21;
-		case 95: goto tr21;
-		case 108: goto tr52;
+		case 45: goto tr18;
+		case 95: goto tr18;
+		case 108: goto tr50;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr21;
+			goto tr18;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr21;
+			goto tr18;
 	} else
-		goto tr21;
-	goto tr50;
-tr23:
+		goto tr18;
+	goto tr48;
+tr20:
 #line 91 "ext/ragel/base_lexer.rl"
 	{{p = ((te))-1;}{
             callback(id_on_comment_body, data, encoding, ts, te);
@@ -679,17 +645,17 @@ tr23:
                 lines = 0;
             }
         }}
-	goto st40;
-tr24:
-	( state->cs) = 40;
+	goto st38;
+tr21:
+	( state->cs) = 38;
 #line 102 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_comment_end);
 
-            ( state->cs) = 34;
+            ( state->cs) = 32;
         }}
 	goto _again;
-tr55:
+tr53:
 #line 91 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_comment_body, data, encoding, ts, te);
@@ -701,57 +667,57 @@ tr55:
                 lines = 0;
             }
         }}
-	goto st40;
-st40:
+	goto st38;
+st38:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof40;
-case 40:
+		goto _test_eof38;
+case 38:
 #line 1 "NONE"
 	{ts = p;}
-#line 714 "ext/c/lexer.c"
+#line 680 "ext/c/lexer.c"
 	if ( (*p) == 45 )
-		goto tr54;
-	goto tr53;
-tr53:
+		goto tr52;
+	goto tr51;
+tr51:
 #line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st41;
-st41:
+	goto st39;
+st39:
 	if ( ++p == pe )
-		goto _test_eof41;
-case 41:
-#line 728 "ext/c/lexer.c"
+		goto _test_eof39;
+case 39:
+#line 694 "ext/c/lexer.c"
 	if ( (*p) == 45 )
-		goto tr55;
-	goto tr53;
-tr54:
+		goto tr53;
+	goto tr51;
+tr52:
 #line 1 "NONE"
 	{te = p+1;}
 #line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st42;
-st42:
+	goto st40;
+st40:
 	if ( ++p == pe )
-		goto _test_eof42;
-case 42:
-#line 744 "ext/c/lexer.c"
+		goto _test_eof40;
+case 40:
+#line 710 "ext/c/lexer.c"
 	if ( (*p) == 45 )
-		goto st19;
-	goto tr55;
-st19:
+		goto st17;
+	goto tr53;
+st17:
 	if ( ++p == pe )
-		goto _test_eof19;
-case 19:
+		goto _test_eof17;
+case 17:
 	if ( (*p) == 62 )
-		goto tr24;
-	goto tr23;
-tr25:
+		goto tr21;
+	goto tr20;
+tr22:
 #line 130 "ext/ragel/base_lexer.rl"
 	{{p = ((te))-1;}{
             callback(id_on_cdata_body, data, encoding, ts, te);
@@ -763,17 +729,17 @@ tr25:
                 lines = 0;
             }
         }}
-	goto st43;
-tr26:
-	( state->cs) = 43;
+	goto st41;
+tr23:
+	( state->cs) = 41;
 #line 141 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_cdata_end);
 
-            ( state->cs) = 34;
+            ( state->cs) = 32;
         }}
 	goto _again;
-tr59:
+tr57:
 #line 130 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_cdata_body, data, encoding, ts, te);
@@ -785,57 +751,57 @@ tr59:
                 lines = 0;
             }
         }}
-	goto st43;
-st43:
+	goto st41;
+st41:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof43;
-case 43:
+		goto _test_eof41;
+case 41:
 #line 1 "NONE"
 	{ts = p;}
-#line 798 "ext/c/lexer.c"
+#line 764 "ext/c/lexer.c"
 	if ( (*p) == 93 )
-		goto tr58;
-	goto tr57;
-tr57:
+		goto tr56;
+	goto tr55;
+tr55:
 #line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st44;
-st44:
+	goto st42;
+st42:
 	if ( ++p == pe )
-		goto _test_eof44;
-case 44:
-#line 812 "ext/c/lexer.c"
+		goto _test_eof42;
+case 42:
+#line 778 "ext/c/lexer.c"
 	if ( (*p) == 93 )
-		goto tr59;
-	goto tr57;
-tr58:
+		goto tr57;
+	goto tr55;
+tr56:
 #line 1 "NONE"
 	{te = p+1;}
 #line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st45;
-st45:
+	goto st43;
+st43:
 	if ( ++p == pe )
-		goto _test_eof45;
-case 45:
-#line 828 "ext/c/lexer.c"
+		goto _test_eof43;
+case 43:
+#line 794 "ext/c/lexer.c"
 	if ( (*p) == 93 )
-		goto st20;
-	goto tr59;
-st20:
+		goto st18;
+	goto tr57;
+st18:
 	if ( ++p == pe )
-		goto _test_eof20;
-case 20:
+		goto _test_eof18;
+case 18:
 	if ( (*p) == 62 )
-		goto tr26;
-	goto tr25;
-tr63:
+		goto tr23;
+	goto tr22;
+tr61:
 #line 173 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_proc_ins_body, data, encoding, ts, te);
@@ -847,65 +813,65 @@ tr63:
                 lines = 0;
             }
         }}
-	goto st46;
-tr64:
-	( state->cs) = 46;
+	goto st44;
+tr62:
+	( state->cs) = 44;
 #line 184 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_proc_ins_end);
 
-            ( state->cs) = 34;
+            ( state->cs) = 32;
         }}
 	goto _again;
-st46:
+st44:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof46;
-case 46:
+		goto _test_eof44;
+case 44:
 #line 1 "NONE"
 	{ts = p;}
-#line 869 "ext/c/lexer.c"
+#line 835 "ext/c/lexer.c"
 	if ( (*p) == 63 )
-		goto tr62;
-	goto tr61;
-tr61:
+		goto tr60;
+	goto tr59;
+tr59:
 #line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st47;
-st47:
+	goto st45;
+st45:
 	if ( ++p == pe )
-		goto _test_eof47;
-case 47:
-#line 883 "ext/c/lexer.c"
+		goto _test_eof45;
+case 45:
+#line 849 "ext/c/lexer.c"
 	if ( (*p) == 63 )
-		goto tr63;
-	goto tr61;
-tr62:
+		goto tr61;
+	goto tr59;
+tr60:
 #line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st48;
-st48:
+	goto st46;
+st46:
 	if ( ++p == pe )
-		goto _test_eof48;
-case 48:
-#line 897 "ext/c/lexer.c"
+		goto _test_eof46;
+case 46:
+#line 863 "ext/c/lexer.c"
 	if ( (*p) == 62 )
-		goto tr64;
-	goto tr63;
-tr66:
+		goto tr62;
+	goto tr61;
+tr64:
 #line 226 "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 st47;
+tr65:
 #line 200 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback(id_on_string_body, data, encoding, ts, te);
@@ -917,42 +883,42 @@ tr67:
             lines = 0;
         }
     }}
-	goto st49;
-st49:
+	goto st47;
+st47:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof49;
-case 49:
+		goto _test_eof47;
+case 47:
 #line 1 "NONE"
 	{ts = p;}
-#line 930 "ext/c/lexer.c"
+#line 896 "ext/c/lexer.c"
 	if ( (*p) == 39 )
-		goto tr66;
-	goto tr65;
-tr65:
+		goto tr64;
+	goto tr63;
+tr63:
 #line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st50;
-st50:
+	goto st48;
+st48:
 	if ( ++p == pe )
-		goto _test_eof50;
-case 50:
-#line 944 "ext/c/lexer.c"
+		goto _test_eof48;
+case 48:
+#line 910 "ext/c/lexer.c"
 	if ( (*p) == 39 )
-		goto tr67;
-	goto tr65;
-tr69:
+		goto tr65;
+	goto tr63;
+tr67:
 #line 236 "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 st49;
+tr68:
 #line 200 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback(id_on_string_body, data, encoding, ts, te);
@@ -964,39 +930,39 @@ tr70:
             lines = 0;
         }
     }}
-	goto st51;
-st51:
+	goto st49;
+st49:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof51;
-case 51:
+		goto _test_eof49;
+case 49:
 #line 1 "NONE"
 	{ts = p;}
-#line 977 "ext/c/lexer.c"
+#line 943 "ext/c/lexer.c"
 	if ( (*p) == 34 )
-		goto tr69;
-	goto tr68;
-tr68:
+		goto tr67;
+	goto tr66;
+tr66:
 #line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st52;
-st52:
+	goto st50;
+st50:
 	if ( ++p == pe )
-		goto _test_eof52;
-case 52:
-#line 991 "ext/c/lexer.c"
+		goto _test_eof50;
+case 50:
+#line 957 "ext/c/lexer.c"
 	if ( (*p) == 34 )
-		goto tr70;
-	goto tr68;
-tr72:
-	( state->cs) = 53;
+		goto tr68;
+	goto tr66;
+tr70:
+	( state->cs) = 51;
 #line 281 "ext/ragel/base_lexer.rl"
-	{te = p+1;{ ( state->cs) = 55; }}
+	{te = p+1;{ ( state->cs) = 53; }}
 	goto _again;
-tr73:
+tr71:
 #line 270 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_doctype_inline, data, encoding, ts, te);
@@ -1008,79 +974,79 @@ tr73:
                 lines = 0;
             }
         }}
-	goto st53;
-st53:
+	goto st51;
+st51:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof53;
-case 53:
+		goto _test_eof51;
+case 51:
 #line 1 "NONE"
 	{ts = p;}
-#line 1021 "ext/c/lexer.c"
+#line 987 "ext/c/lexer.c"
 	if ( (*p) == 93 )
-		goto tr72;
-	goto tr71;
-tr71:
+		goto tr70;
+	goto tr69;
+tr69:
 #line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st54;
-st54:
+	goto st52;
+st52:
 	if ( ++p == pe )
-		goto _test_eof54;
-case 54:
-#line 1035 "ext/c/lexer.c"
+		goto _test_eof52;
+case 52:
+#line 1001 "ext/c/lexer.c"
 	if ( (*p) == 93 )
-		goto tr73;
-	goto tr71;
-tr74:
+		goto tr71;
+	goto tr69;
+tr72:
 #line 309 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
-	goto st55;
-tr76:
+	goto st53;
+tr74:
 #line 60 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         advance_line(1);
     }}
-	goto st55;
-tr78:
+	goto st53;
+tr76:
 #line 217 "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)++] = 53; goto st49;}
     }}
-	goto st55;
-tr79:
+	goto st53;
+tr77:
 #line 211 "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)++] = 53; goto st47;}
     }}
-	goto st55;
-tr81:
-	( state->cs) = 55;
+	goto st53;
+tr79:
+	( state->cs) = 53;
 #line 302 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_doctype_end);
-            ( state->cs) = 34;
+            ( state->cs) = 32;
         }}
 	goto _again;
-tr84:
-	( state->cs) = 55;
+tr82:
+	( state->cs) = 53;
 #line 292 "ext/ragel/base_lexer.rl"
-	{te = p+1;{ ( state->cs) = 53; }}
+	{te = p+1;{ ( state->cs) = 51; }}
 	goto _again;
-tr85:
+tr83:
 #line 60 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         advance_line(1);
     }}
-	goto st55;
-tr86:
+	goto st53;
+tr84:
 #line 1 "NONE"
 	{	switch( ( state->act) ) {
 	case 13:
@@ -1095,298 +1061,298 @@ tr86:
 	break;
 	}
 	}
-	goto st55;
-tr87:
+	goto st53;
+tr85:
 #line 298 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_doctype_name, data, encoding, ts, te);
         }}
-	goto st55;
-st55:
+	goto st53;
+st53:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof55;
-case 55:
+		goto _test_eof53;
+case 53:
 #line 1 "NONE"
 	{ts = p;}
-#line 1114 "ext/c/lexer.c"
+#line 1080 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 9: goto tr74;
-		case 10: goto tr76;
-		case 13: goto st56;
-		case 32: goto tr74;
-		case 34: goto tr78;
-		case 39: goto tr79;
-		case 45: goto tr80;
-		case 62: goto tr81;
-		case 80: goto st58;
-		case 83: goto st63;
-		case 91: goto tr84;
-		case 95: goto tr80;
+		case 9: goto tr72;
+		case 10: goto tr74;
+		case 13: goto st54;
+		case 32: goto tr72;
+		case 34: goto tr76;
+		case 39: goto tr77;
+		case 45: goto tr78;
+		case 62: goto tr79;
+		case 80: goto st56;
+		case 83: goto st61;
+		case 91: goto tr82;
+		case 95: goto tr78;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr80;
+			goto tr78;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr80;
+			goto tr78;
 	} else
-		goto tr80;
+		goto tr78;
 	goto st0;
 st0:
 ( state->cs) = 0;
 	goto _out;
-st56:
+st54:
 	if ( ++p == pe )
-		goto _test_eof56;
-case 56:
+		goto _test_eof54;
+case 54:
 	if ( (*p) == 10 )
-		goto tr76;
-	goto tr85;
-tr80:
+		goto tr74;
+	goto tr83;
+tr78:
 #line 1 "NONE"
 	{te = p+1;}
 #line 298 "ext/ragel/base_lexer.rl"
 	{( state->act) = 17;}
-	goto st57;
-tr92:
+	goto st55;
+tr90:
 #line 1 "NONE"
 	{te = p+1;}
 #line 287 "ext/ragel/base_lexer.rl"
 	{( state->act) = 13;}
-	goto st57;
+	goto st55;
+st55:
+	if ( ++p == pe )
+		goto _test_eof55;
+case 55:
+#line 1130 "ext/c/lexer.c"
+	switch( (*p) ) {
+		case 45: goto tr78;
+		case 95: goto tr78;
+	}
+	if ( (*p) < 65 ) {
+		if ( 48 <= (*p) && (*p) <= 57 )
+			goto tr78;
+	} else if ( (*p) > 90 ) {
+		if ( 97 <= (*p) && (*p) <= 122 )
+			goto tr78;
+	} else
+		goto tr78;
+	goto tr84;
+st56:
+	if ( ++p == pe )
+		goto _test_eof56;
+case 56:
+	switch( (*p) ) {
+		case 45: goto tr78;
+		case 85: goto st57;
+		case 95: goto tr78;
+	}
+	if ( (*p) < 65 ) {
+		if ( 48 <= (*p) && (*p) <= 57 )
+			goto tr78;
+	} else if ( (*p) > 90 ) {
+		if ( 97 <= (*p) && (*p) <= 122 )
+			goto tr78;
+	} else
+		goto tr78;
+	goto tr85;
 st57:
 	if ( ++p == pe )
 		goto _test_eof57;
 case 57:
-#line 1164 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 45: goto tr80;
-		case 95: goto tr80;
+		case 45: goto tr78;
+		case 66: goto st58;
+		case 95: goto tr78;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr80;
+			goto tr78;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr80;
+			goto tr78;
 	} else
-		goto tr80;
-	goto tr86;
+		goto tr78;
+	goto tr85;
 st58:
 	if ( ++p == pe )
 		goto _test_eof58;
 case 58:
 	switch( (*p) ) {
-		case 45: goto tr80;
-		case 85: goto st59;
-		case 95: goto tr80;
+		case 45: goto tr78;
+		case 76: goto st59;
+		case 95: goto tr78;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr80;
+			goto tr78;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr80;
+			goto tr78;
 	} else
-		goto tr80;
-	goto tr87;
+		goto tr78;
+	goto tr85;
 st59:
 	if ( ++p == pe )
 		goto _test_eof59;
 case 59:
 	switch( (*p) ) {
-		case 45: goto tr80;
-		case 66: goto st60;
-		case 95: goto tr80;
+		case 45: goto tr78;
+		case 73: goto st60;
+		case 95: goto tr78;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr80;
+			goto tr78;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr80;
+			goto tr78;
 	} else
-		goto tr80;
-	goto tr87;
+		goto tr78;
+	goto tr85;
 st60:
 	if ( ++p == pe )
 		goto _test_eof60;
 case 60:
 	switch( (*p) ) {
-		case 45: goto tr80;
-		case 76: goto st61;
-		case 95: goto tr80;
+		case 45: goto tr78;
+		case 67: goto tr90;
+		case 95: goto tr78;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr80;
+			goto tr78;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr80;
+			goto tr78;
 	} else
-		goto tr80;
-	goto tr87;
+		goto tr78;
+	goto tr85;
 st61:
 	if ( ++p == pe )
 		goto _test_eof61;
 case 61:
 	switch( (*p) ) {
-		case 45: goto tr80;
-		case 73: goto st62;
-		case 95: goto tr80;
+		case 45: goto tr78;
+		case 89: goto st62;
+		case 95: goto tr78;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr80;
+			goto tr78;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr80;
+			goto tr78;
 	} else
-		goto tr80;
-	goto tr87;
+		goto tr78;
+	goto tr85;
 st62:
 	if ( ++p == pe )
 		goto _test_eof62;
 case 62:
 	switch( (*p) ) {
-		case 45: goto tr80;
-		case 67: goto tr92;
-		case 95: goto tr80;
+		case 45: goto tr78;
+		case 83: goto st63;
+		case 95: goto tr78;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr80;
+			goto tr78;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr80;
+			goto tr78;
 	} else
-		goto tr80;
-	goto tr87;
+		goto tr78;
+	goto tr85;
 st63:
 	if ( ++p == pe )
 		goto _test_eof63;
 case 63:
 	switch( (*p) ) {
-		case 45: goto tr80;
-		case 89: goto st64;
-		case 95: goto tr80;
+		case 45: goto tr78;
+		case 84: goto st64;
+		case 95: goto tr78;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr80;
+			goto tr78;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr80;
+			goto tr78;
 	} else
-		goto tr80;
-	goto tr87;
+		goto tr78;
+	goto tr85;
 st64:
 	if ( ++p == pe )
 		goto _test_eof64;
 case 64:
 	switch( (*p) ) {
-		case 45: goto tr80;
-		case 83: goto st65;
-		case 95: goto tr80;
+		case 45: goto tr78;
+		case 69: goto st65;
+		case 95: goto tr78;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr80;
+			goto tr78;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr80;
+			goto tr78;
 	} else
-		goto tr80;
-	goto tr87;
+		goto tr78;
+	goto tr85;
 st65:
 	if ( ++p == pe )
 		goto _test_eof65;
 case 65:
 	switch( (*p) ) {
-		case 45: goto tr80;
-		case 84: goto st66;
-		case 95: goto tr80;
+		case 45: goto tr78;
+		case 77: goto tr90;
+		case 95: goto tr78;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr80;
+			goto tr78;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr80;
+			goto tr78;
 	} else
-		goto tr80;
-	goto tr87;
-st66:
-	if ( ++p == pe )
-		goto _test_eof66;
-case 66:
-	switch( (*p) ) {
-		case 45: goto tr80;
-		case 69: goto st67;
-		case 95: goto tr80;
-	}
-	if ( (*p) < 65 ) {
-		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr80;
-	} else if ( (*p) > 90 ) {
-		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr80;
-	} else
-		goto tr80;
-	goto tr87;
-st67:
-	if ( ++p == pe )
-		goto _test_eof67;
-case 67:
-	switch( (*p) ) {
-		case 45: goto tr80;
-		case 77: goto tr92;
-		case 95: goto tr80;
-	}
-	if ( (*p) < 65 ) {
-		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr80;
-	} else if ( (*p) > 90 ) {
-		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr80;
-	} else
-		goto tr80;
-	goto tr87;
-tr97:
+		goto tr78;
+	goto tr85;
+tr95:
 #line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
 #line 354 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
-	goto st68;
-tr98:
+	goto st66;
+tr96:
 #line 217 "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)++] = 66; goto st49;}
     }}
 #line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st68;
-tr99:
+	goto st66;
+tr97:
 #line 211 "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)++] = 66; goto st47;}
     }}
 #line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st68;
-tr102:
+	goto st66;
+tr100:
 #line 340 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             if ( lines > 0 )
@@ -1398,13 +1364,13 @@ tr102:
 
             callback(id_on_attribute, data, encoding, ts, te);
         }}
-	goto st68;
-tr104:
+	goto st66;
+tr102:
 #line 354 "ext/ragel/base_lexer.rl"
-	{te = p;p--;}
-	goto st68;
-tr105:
-	( state->cs) = 68;
+	{te = p;p--;}
+	goto st66;
+tr103:
+	( state->cs) = 66;
 #line 326 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             if ( lines > 0 )
@@ -1416,85 +1382,161 @@ tr105:
 
             callback_simple(id_on_xml_decl_end);
 
-            ( state->cs) = 34;
+            ( state->cs) = 32;
         }}
 	goto _again;
-st68:
+st66:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof68;
-case 68:
+		goto _test_eof66;
+case 66:
 #line 1 "NONE"
 	{ts = p;}
-#line 1431 "ext/c/lexer.c"
+#line 1397 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 34: goto tr98;
-		case 39: goto tr99;
-		case 45: goto tr100;
-		case 63: goto tr101;
-		case 95: goto tr100;
+		case 34: goto tr96;
+		case 39: goto tr97;
+		case 45: goto tr98;
+		case 63: goto tr99;
+		case 95: goto tr98;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr100;
+			goto tr98;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr100;
+			goto tr98;
 	} else
-		goto tr100;
-	goto tr97;
-tr100:
+		goto tr98;
+	goto tr95;
+tr98:
 #line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st69;
-st69:
+	goto st67;
+st67:
 	if ( ++p == pe )
-		goto _test_eof69;
-case 69:
-#line 1458 "ext/c/lexer.c"
+		goto _test_eof67;
+case 67:
+#line 1424 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 45: goto st69;
-		case 95: goto st69;
+		case 45: goto st67;
+		case 95: goto st67;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st69;
+			goto st67;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto st69;
+			goto st67;
 	} else
-		goto st69;
-	goto tr102;
-tr101:
+		goto st67;
+	goto tr100;
+tr99:
 #line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st70;
-st70:
+	goto st68;
+st68:
 	if ( ++p == pe )
-		goto _test_eof70;
-case 70:
-#line 1482 "ext/c/lexer.c"
+		goto _test_eof68;
+case 68:
+#line 1448 "ext/c/lexer.c"
 	if ( (*p) == 62 )
-		goto tr105;
-	goto tr104;
-tr107:
-	( state->cs) = 71;
-#line 390 "ext/ragel/base_lexer.rl"
+		goto tr103;
+	goto tr102;
+tr105:
+	( state->cs) = 69;
+#line 394 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_element_name, data, encoding, ts, te);
             ( state->cs) = 76;
         }}
 	goto _again;
-tr108:
-#line 386 "ext/ragel/base_lexer.rl"
+tr106:
+#line 390 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback(id_on_element_ns, data, encoding, ts, te - 1);
         }}
+	goto st69;
+st69:
+#line 1 "NONE"
+	{ts = 0;}
+	if ( ++p == pe )
+		goto _test_eof69;
+case 69:
+#line 1 "NONE"
+	{ts = p;}
+#line 1474 "ext/c/lexer.c"
+	switch( (*p) ) {
+		case 45: goto st70;
+		case 95: goto st70;
+	}
+	if ( (*p) < 65 ) {
+		if ( 48 <= (*p) && (*p) <= 57 )
+			goto st70;
+	} else if ( (*p) > 90 ) {
+		if ( 97 <= (*p) && (*p) <= 122 )
+			goto st70;
+	} else
+		goto st70;
+	goto st0;
+st70:
+	if ( ++p == pe )
+		goto _test_eof70;
+case 70:
+	switch( (*p) ) {
+		case 45: goto st70;
+		case 58: goto tr106;
+		case 95: goto st70;
+	}
+	if ( (*p) < 65 ) {
+		if ( 48 <= (*p) && (*p) <= 57 )
+			goto st70;
+	} else if ( (*p) > 90 ) {
+		if ( 97 <= (*p) && (*p) <= 122 )
+			goto st70;
+	} else
+		goto st70;
+	goto tr105;
+tr107:
+#line 56 "ext/ragel/base_lexer.rl"
+	{
+        if ( (*p) == '\n' ) lines++;
+    }
+#line 419 "ext/ragel/base_lexer.rl"
+	{te = p+1;}
+	goto st71;
+tr109:
+	( state->cs) = 71;
+#line 408 "ext/ragel/base_lexer.rl"
+	{te = p+1;{
+            if ( lines > 0 )
+            {
+                advance_line(lines);
+
+                lines = 0;
+            }
+
+            ( state->cs) = 32;
+        }}
+#line 56 "ext/ragel/base_lexer.rl"
+	{
+        if ( (*p) == '\n' ) lines++;
+    }
+	goto _again;
+tr110:
+#line 375 "ext/ragel/base_lexer.rl"
+	{te = p;p--;{
+        callback(id_on_element_end, data, encoding, ts, te);
+    }}
+	goto st71;
+tr112:
+#line 404 "ext/ragel/base_lexer.rl"
+	{te = p+1;}
 	goto st71;
 st71:
 #line 1 "NONE"
@@ -1504,27 +1546,35 @@ st71:
 case 71:
 #line 1 "NONE"
 	{ts = p;}
-#line 1508 "ext/c/lexer.c"
+#line 1550 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 45: goto st72;
-		case 95: goto st72;
+		case 45: goto tr108;
+		case 62: goto tr109;
+		case 95: goto tr108;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st72;
+			goto tr108;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto st72;
+			goto tr108;
 	} else
-		goto st72;
-	goto st0;
+		goto tr108;
+	goto tr107;
+tr108:
+#line 56 "ext/ragel/base_lexer.rl"
+	{
+        if ( (*p) == '\n' ) lines++;
+    }
+	goto st72;
 st72:
 	if ( ++p == pe )
 		goto _test_eof72;
 case 72:
+#line 1575 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 45: goto st72;
-		case 58: goto tr108;
+		case 58: goto tr112;
 		case 95: goto st72;
 	}
 	if ( (*p) < 65 ) {
@@ -1535,24 +1585,24 @@ case 72:
 			goto st72;
 	} else
 		goto st72;
-	goto tr107;
-tr110:
+	goto tr110;
+tr114:
 #line 64 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         p--;
         {( state->cs) = ( state->stack)[--( state->top)];goto _again;}
     }}
 	goto st73;
-tr111:
+tr115:
 	( state->cs) = 73;
-#line 405 "ext/ragel/base_lexer.rl"
+#line 431 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             p--;
             ( state->cs) = 75;
         }}
 	goto _again;
-tr112:
-#line 412 "ext/ragel/base_lexer.rl"
+tr116:
+#line 438 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback_simple(id_on_string_squote);
 
@@ -1569,60 +1619,60 @@ st73:
 case 73:
 #line 1 "NONE"
 	{ts = p;}
-#line 1573 "ext/c/lexer.c"
+#line 1623 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 13: goto tr110;
-		case 32: goto tr110;
-		case 34: goto tr111;
-		case 39: goto tr111;
-		case 96: goto tr110;
+		case 13: goto tr114;
+		case 32: goto tr114;
+		case 34: goto tr115;
+		case 39: goto tr115;
+		case 96: goto tr114;
 	}
 	if ( (*p) > 10 ) {
 		if ( 60 <= (*p) && (*p) <= 62 )
-			goto tr110;
+			goto tr114;
 	} else if ( (*p) >= 9 )
-		goto tr110;
+		goto tr114;
 	goto st74;
 st74:
 	if ( ++p == pe )
 		goto _test_eof74;
 case 74:
 	switch( (*p) ) {
-		case 13: goto tr112;
-		case 32: goto tr112;
-		case 34: goto tr112;
-		case 39: goto tr112;
-		case 96: goto tr112;
+		case 13: goto tr116;
+		case 32: goto tr116;
+		case 34: goto tr116;
+		case 39: goto tr116;
+		case 96: goto tr116;
 	}
 	if ( (*p) > 10 ) {
 		if ( 60 <= (*p) && (*p) <= 62 )
-			goto tr112;
+			goto tr116;
 	} else if ( (*p) >= 9 )
-		goto tr112;
+		goto tr116;
 	goto st74;
-tr113:
+tr117:
 #line 64 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         p--;
         {( state->cs) = ( state->stack)[--( state->top)];goto _again;}
     }}
 	goto st75;
-tr114:
+tr118:
 	( state->cs) = 75;
-#line 434 "ext/ragel/base_lexer.rl"
+#line 460 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_string_dquote);
 
-            ( state->cs) = 51;
+            ( state->cs) = 49;
         }}
 	goto _again;
-tr115:
+tr119:
 	( state->cs) = 75;
-#line 428 "ext/ragel/base_lexer.rl"
+#line 454 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_string_squote);
 
-            ( state->cs) = 49;
+            ( state->cs) = 47;
         }}
 	goto _again;
 st75:
@@ -1633,24 +1683,24 @@ st75:
 case 75:
 #line 1 "NONE"
 	{ts = p;}
-#line 1637 "ext/c/lexer.c"
+#line 1687 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 34: goto tr114;
-		case 39: goto tr115;
+		case 34: goto tr118;
+		case 39: goto tr119;
 	}
-	goto tr113;
-tr116:
-#line 493 "ext/ragel/base_lexer.rl"
+	goto tr117;
+tr120:
+#line 519 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
 	goto st76;
-tr117:
+tr121:
 #line 60 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         advance_line(1);
     }}
 	goto st76;
-tr121:
-#line 458 "ext/ragel/base_lexer.rl"
+tr125:
+#line 484 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             if ( html_p )
             {
@@ -1662,9 +1712,9 @@ tr121:
             }
         }}
 	goto st76;
-tr122:
+tr126:
 	( state->cs) = 76;
-#line 470 "ext/ragel/base_lexer.rl"
+#line 496 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_element_open_end);
 
@@ -1678,38 +1728,38 @@ tr122:
             }
             else
             {
-                ( state->cs) = 34;
+                ( state->cs) = 32;
             }
         }}
 	goto _again;
-tr123:
+tr127:
 #line 60 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         advance_line(1);
     }}
 	goto st76;
-tr124:
-#line 453 "ext/ragel/base_lexer.rl"
+tr128:
+#line 479 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_attribute, data, encoding, ts, te);
         }}
 	goto st76;
-tr125:
-#line 449 "ext/ragel/base_lexer.rl"
+tr129:
+#line 475 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback(id_on_attribute_ns, data, encoding, ts, te - 1);
         }}
 	goto st76;
-tr126:
-#line 493 "ext/ragel/base_lexer.rl"
+tr130:
+#line 519 "ext/ragel/base_lexer.rl"
 	{te = p;p--;}
 	goto st76;
-tr127:
+tr131:
 	( state->cs) = 76;
-#line 488 "ext/ragel/base_lexer.rl"
+#line 514 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_element_end);
-            ( state->cs) = 34;
+            ( state->cs) = 32;
         }}
 	goto _again;
 st76:
@@ -1720,14 +1770,14 @@ st76:
 case 76:
 #line 1 "NONE"
 	{ts = p;}
-#line 1724 "ext/c/lexer.c"
+#line 1774 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 10: goto tr117;
+		case 10: goto tr121;
 		case 13: goto st77;
 		case 45: goto st78;
 		case 47: goto st79;
-		case 61: goto tr121;
-		case 62: goto tr122;
+		case 61: goto tr125;
+		case 62: goto tr126;
 		case 95: goto st78;
 	}
 	if ( (*p) < 65 ) {
@@ -1738,21 +1788,21 @@ case 76:
 			goto st78;
 	} else
 		goto st78;
-	goto tr116;
+	goto tr120;
 st77:
 	if ( ++p == pe )
 		goto _test_eof77;
 case 77:
 	if ( (*p) == 10 )
-		goto tr117;
-	goto tr123;
+		goto tr121;
+	goto tr127;
 st78:
 	if ( ++p == pe )
 		goto _test_eof78;
 case 78:
 	switch( (*p) ) {
 		case 45: goto st78;
-		case 58: goto tr125;
+		case 58: goto tr129;
 		case 95: goto st78;
 	}
 	if ( (*p) < 65 ) {
@@ -1763,17 +1813,17 @@ case 78:
 			goto st78;
 	} else
 		goto st78;
-	goto tr124;
+	goto tr128;
 st79:
 	if ( ++p == pe )
 		goto _test_eof79;
 case 79:
 	if ( (*p) == 62 )
-		goto tr127;
-	goto tr126;
-tr130:
+		goto tr131;
+	goto tr130;
+tr134:
 	( state->cs) = 80;
-#line 530 "ext/ragel/base_lexer.rl"
+#line 556 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_text, data, encoding, ts, te);
 
@@ -1784,12 +1834,12 @@ tr130:
                 lines = 0;
             }
 
-            ( state->cs) = 34;
+            ( state->cs) = 32;
         }}
 	goto _again;
-tr132:
+tr136:
 	( state->cs) = 80;
-#line 544 "ext/ragel/base_lexer.rl"
+#line 570 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback(id_on_text, data, encoding, ts, mark);
 
@@ -1803,12 +1853,12 @@ tr132:
                 lines = 0;
             }
 
-            ( state->cs) = 34;
+            ( state->cs) = 32;
         }}
 	goto _again;
-tr133:
+tr137:
 	( state->cs) = 80;
-#line 530 "ext/ragel/base_lexer.rl"
+#line 556 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback(id_on_text, data, encoding, ts, te);
 
@@ -1819,7 +1869,7 @@ tr133:
                 lines = 0;
             }
 
-            ( state->cs) = 34;
+            ( state->cs) = 32;
         }}
 	goto _again;
 st80:
@@ -1830,11 +1880,11 @@ st80:
 case 80:
 #line 1 "NONE"
 	{ts = p;}
-#line 1834 "ext/c/lexer.c"
+#line 1884 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr129;
-	goto tr128;
-tr128:
+		goto tr133;
+	goto tr132;
+tr132:
 #line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
@@ -1844,70 +1894,70 @@ st81:
 	if ( ++p == pe )
 		goto _test_eof81;
 case 81:
-#line 1848 "ext/c/lexer.c"
+#line 1898 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr131;
-	goto tr128;
-tr131:
+		goto tr135;
+	goto tr132;
+tr135:
 #line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-#line 544 "ext/ragel/base_lexer.rl"
+#line 570 "ext/ragel/base_lexer.rl"
 	{ mark = p; }
 	goto st82;
 st82:
 	if ( ++p == pe )
 		goto _test_eof82;
 case 82:
-#line 1864 "ext/c/lexer.c"
+#line 1914 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 33: goto tr132;
-		case 45: goto tr132;
-		case 60: goto tr131;
-		case 63: goto tr132;
-		case 95: goto tr132;
+		case 33: goto tr136;
+		case 45: goto tr136;
+		case 60: goto tr135;
+		case 63: goto tr136;
+		case 95: goto tr136;
 	}
 	if ( (*p) < 65 ) {
 		if ( 47 <= (*p) && (*p) <= 57 )
-			goto tr132;
+			goto tr136;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr132;
+			goto tr136;
 	} else
-		goto tr132;
-	goto tr128;
-tr129:
+		goto tr136;
+	goto tr132;
+tr133:
 #line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-#line 544 "ext/ragel/base_lexer.rl"
+#line 570 "ext/ragel/base_lexer.rl"
 	{ mark = p; }
 	goto st83;
 st83:
 	if ( ++p == pe )
 		goto _test_eof83;
 case 83:
-#line 1893 "ext/c/lexer.c"
+#line 1943 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 33: goto tr133;
-		case 45: goto tr133;
-		case 60: goto tr131;
-		case 63: goto tr133;
-		case 95: goto tr133;
+		case 33: goto tr137;
+		case 45: goto tr137;
+		case 60: goto tr135;
+		case 63: goto tr137;
+		case 95: goto tr137;
 	}
 	if ( (*p) < 65 ) {
 		if ( 47 <= (*p) && (*p) <= 57 )
-			goto tr133;
+			goto tr137;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr133;
+			goto tr137;
 	} else
-		goto tr133;
-	goto tr128;
-tr27:
-#line 518 "ext/ragel/base_lexer.rl"
+		goto tr137;
+	goto tr132;
+tr24:
+#line 544 "ext/ragel/base_lexer.rl"
 	{{p = ((te))-1;}{
         callback(id_on_text, data, encoding, ts, te);
 
@@ -1919,17 +1969,17 @@ tr27:
         }
     }}
 	goto st84;
-tr34:
+tr31:
 	( state->cs) = 84;
-#line 378 "ext/ragel/base_lexer.rl"
+#line 379 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_element_end);
 
-        ( state->cs) = 34;
+        ( state->cs) = 32;
     }}
 	goto _again;
-tr136:
-#line 518 "ext/ragel/base_lexer.rl"
+tr140:
+#line 544 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback(id_on_text, data, encoding, ts, te);
 
@@ -1949,11 +1999,11 @@ st84:
 case 84:
 #line 1 "NONE"
 	{ts = p;}
-#line 1953 "ext/c/lexer.c"
+#line 2003 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr135;
-	goto tr134;
-tr134:
+		goto tr139;
+	goto tr138;
+tr138:
 #line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
@@ -1963,11 +2013,11 @@ st85:
 	if ( ++p == pe )
 		goto _test_eof85;
 case 85:
-#line 1967 "ext/c/lexer.c"
+#line 2017 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr136;
-	goto tr134;
-tr135:
+		goto tr140;
+	goto tr138;
+tr139:
 #line 1 "NONE"
 	{te = p+1;}
 #line 56 "ext/ragel/base_lexer.rl"
@@ -1979,62 +2029,62 @@ st86:
 	if ( ++p == pe )
 		goto _test_eof86;
 case 86:
-#line 1983 "ext/c/lexer.c"
+#line 2033 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 47: goto st21;
-		case 60: goto tr138;
+		case 47: goto st19;
+		case 60: goto tr142;
 	}
-	goto tr136;
+	goto tr140;
+st19:
+	if ( ++p == pe )
+		goto _test_eof19;
+case 19:
+	if ( (*p) == 115 )
+		goto st20;
+	goto tr24;
+st20:
+	if ( ++p == pe )
+		goto _test_eof20;
+case 20:
+	if ( (*p) == 99 )
+		goto st21;
+	goto tr24;
 st21:
 	if ( ++p == pe )
 		goto _test_eof21;
 case 21:
-	if ( (*p) == 115 )
+	if ( (*p) == 114 )
 		goto st22;
-	goto tr27;
+	goto tr24;
 st22:
 	if ( ++p == pe )
 		goto _test_eof22;
 case 22:
-	if ( (*p) == 99 )
+	if ( (*p) == 105 )
 		goto st23;
-	goto tr27;
+	goto tr24;
 st23:
 	if ( ++p == pe )
 		goto _test_eof23;
 case 23:
-	if ( (*p) == 114 )
+	if ( (*p) == 112 )
 		goto st24;
-	goto tr27;
+	goto tr24;
 st24:
 	if ( ++p == pe )
 		goto _test_eof24;
 case 24:
-	if ( (*p) == 105 )
+	if ( (*p) == 116 )
 		goto st25;
-	goto tr27;
+	goto tr24;
 st25:
 	if ( ++p == pe )
 		goto _test_eof25;
 case 25:
-	if ( (*p) == 112 )
-		goto st26;
-	goto tr27;
-st26:
-	if ( ++p == pe )
-		goto _test_eof26;
-case 26:
-	if ( (*p) == 116 )
-		goto st27;
-	goto tr27;
-st27:
-	if ( ++p == pe )
-		goto _test_eof27;
-case 27:
 	if ( (*p) == 62 )
-		goto tr34;
-	goto tr27;
-tr138:
+		goto tr31;
+	goto tr24;
+tr142:
 #line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
@@ -2044,12 +2094,12 @@ st87:
 	if ( ++p == pe )
 		goto _test_eof87;
 case 87:
-#line 2048 "ext/c/lexer.c"
+#line 2098 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr138;
-	goto tr136;
-tr35:
-#line 518 "ext/ragel/base_lexer.rl"
+		goto tr142;
+	goto tr140;
+tr32:
+#line 544 "ext/ragel/base_lexer.rl"
 	{{p = ((te))-1;}{
         callback(id_on_text, data, encoding, ts, te);
 
@@ -2061,17 +2111,17 @@ tr35:
         }
     }}
 	goto st88;
-tr41:
+tr38:
 	( state->cs) = 88;
-#line 378 "ext/ragel/base_lexer.rl"
+#line 379 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_element_end);
 
-        ( state->cs) = 34;
+        ( state->cs) = 32;
     }}
 	goto _again;
-tr141:
-#line 518 "ext/ragel/base_lexer.rl"
+tr145:
+#line 544 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback(id_on_text, data, encoding, ts, te);
 
@@ -2091,11 +2141,11 @@ st88:
 case 88:
 #line 1 "NONE"
 	{ts = p;}
-#line 2095 "ext/c/lexer.c"
+#line 2145 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr140;
-	goto tr139;
-tr139:
+		goto tr144;
+	goto tr143;
+tr143:
 #line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
@@ -2105,11 +2155,11 @@ st89:
 	if ( ++p == pe )
 		goto _test_eof89;
 case 89:
-#line 2109 "ext/c/lexer.c"
+#line 2159 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr141;
-	goto tr139;
-tr140:
+		goto tr145;
+	goto tr143;
+tr144:
 #line 1 "NONE"
 	{te = p+1;}
 #line 56 "ext/ragel/base_lexer.rl"
@@ -2121,55 +2171,55 @@ st90:
 	if ( ++p == pe )
 		goto _test_eof90;
 case 90:
-#line 2125 "ext/c/lexer.c"
+#line 2175 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 47: goto st28;
-		case 60: goto tr143;
+		case 47: goto st26;
+		case 60: goto tr147;
 	}
-	goto tr141;
+	goto tr145;
+st26:
+	if ( ++p == pe )
+		goto _test_eof26;
+case 26:
+	if ( (*p) == 115 )
+		goto st27;
+	goto tr32;
+st27:
+	if ( ++p == pe )
+		goto _test_eof27;
+case 27:
+	if ( (*p) == 116 )
+		goto st28;
+	goto tr32;
 st28:
 	if ( ++p == pe )
 		goto _test_eof28;
 case 28:
-	if ( (*p) == 115 )
+	if ( (*p) == 121 )
 		goto st29;
-	goto tr35;
+	goto tr32;
 st29:
 	if ( ++p == pe )
 		goto _test_eof29;
 case 29:
-	if ( (*p) == 116 )
+	if ( (*p) == 108 )
 		goto st30;
-	goto tr35;
+	goto tr32;
 st30:
 	if ( ++p == pe )
 		goto _test_eof30;
 case 30:
-	if ( (*p) == 121 )
+	if ( (*p) == 101 )
 		goto st31;
-	goto tr35;
+	goto tr32;
 st31:
 	if ( ++p == pe )
 		goto _test_eof31;
 case 31:
-	if ( (*p) == 108 )
-		goto st32;
-	goto tr35;
-st32:
-	if ( ++p == pe )
-		goto _test_eof32;
-case 32:
-	if ( (*p) == 101 )
-		goto st33;
-	goto tr35;
-st33:
-	if ( ++p == pe )
-		goto _test_eof33;
-case 33:
 	if ( (*p) == 62 )
-		goto tr41;
-	goto tr35;
-tr143:
+		goto tr38;
+	goto tr32;
+tr147:
 #line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
@@ -2179,13 +2229,13 @@ st91:
 	if ( ++p == pe )
 		goto _test_eof91;
 case 91:
-#line 2183 "ext/c/lexer.c"
+#line 2233 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr143;
-	goto tr141;
+		goto tr147;
+	goto tr145;
 	}
-	_test_eof34: ( state->cs) = 34; goto _test_eof; 
-	_test_eof35: ( state->cs) = 35; goto _test_eof; 
+	_test_eof32: ( state->cs) = 32; goto _test_eof; 
+	_test_eof33: ( state->cs) = 33; 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; 
@@ -2195,7 +2245,7 @@ case 91:
 	_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_eof36: ( state->cs) = 36; goto _test_eof; 
+	_test_eof34: ( state->cs) = 34; 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; 
@@ -2203,19 +2253,19 @@ case 91:
 	_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_eof17: ( state->cs) = 17; goto _test_eof; 
-	_test_eof18: ( state->cs) = 18; goto _test_eof; 
+	_test_eof35: ( state->cs) = 35; goto _test_eof; 
+	_test_eof36: ( state->cs) = 36; goto _test_eof; 
 	_test_eof37: ( state->cs) = 37; goto _test_eof; 
 	_test_eof38: ( state->cs) = 38; goto _test_eof; 
 	_test_eof39: ( state->cs) = 39; goto _test_eof; 
 	_test_eof40: ( state->cs) = 40; goto _test_eof; 
+	_test_eof17: ( state->cs) = 17; goto _test_eof; 
 	_test_eof41: ( state->cs) = 41; goto _test_eof; 
 	_test_eof42: ( state->cs) = 42; goto _test_eof; 
-	_test_eof19: ( state->cs) = 19; goto _test_eof; 
 	_test_eof43: ( state->cs) = 43; goto _test_eof; 
+	_test_eof18: ( state->cs) = 18; goto _test_eof; 
 	_test_eof44: ( state->cs) = 44; goto _test_eof; 
 	_test_eof45: ( state->cs) = 45; goto _test_eof; 
-	_test_eof20: ( state->cs) = 20; goto _test_eof; 
 	_test_eof46: ( state->cs) = 46; goto _test_eof; 
 	_test_eof47: ( state->cs) = 47; goto _test_eof; 
 	_test_eof48: ( state->cs) = 48; goto _test_eof; 
@@ -2257,30 +2307,30 @@ case 91:
 	_test_eof84: ( state->cs) = 84; goto _test_eof; 
 	_test_eof85: ( state->cs) = 85; goto _test_eof; 
 	_test_eof86: ( state->cs) = 86; 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; 
 	_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_eof27: ( state->cs) = 27; 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_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_eof32: ( state->cs) = 32; goto _test_eof; 
-	_test_eof33: ( state->cs) = 33; goto _test_eof; 
 	_test_eof91: ( state->cs) = 91; goto _test_eof; 
 
 	_test_eof: {}
 	if ( p == eof )
 	{
 	switch ( ( state->cs) ) {
-	case 35: goto tr44;
+	case 33: goto tr41;
 	case 1: goto tr0;
 	case 2: goto tr0;
 	case 3: goto tr0;
@@ -2290,7 +2340,7 @@ case 91:
 	case 7: goto tr0;
 	case 8: goto tr0;
 	case 9: goto tr0;
-	case 36: goto tr48;
+	case 34: goto tr46;
 	case 10: goto tr0;
 	case 11: goto tr0;
 	case 12: goto tr0;
@@ -2298,63 +2348,62 @@ case 91:
 	case 14: goto tr0;
 	case 15: goto tr0;
 	case 16: goto tr0;
-	case 17: goto tr0;
-	case 18: goto tr0;
-	case 37: goto tr49;
-	case 38: goto tr50;
-	case 39: goto tr50;
-	case 41: goto tr55;
-	case 42: goto tr55;
-	case 19: goto tr23;
-	case 44: goto tr59;
-	case 45: goto tr59;
-	case 20: goto tr25;
-	case 47: goto tr63;
-	case 48: goto tr63;
-	case 50: goto tr67;
-	case 52: goto tr70;
-	case 54: goto tr73;
+	case 35: goto tr47;
+	case 36: goto tr48;
+	case 37: goto tr48;
+	case 39: goto tr53;
+	case 40: goto tr53;
+	case 17: goto tr20;
+	case 42: goto tr57;
+	case 43: goto tr57;
+	case 18: goto tr22;
+	case 45: goto tr61;
+	case 46: goto tr61;
+	case 48: goto tr65;
+	case 50: goto tr68;
+	case 52: goto tr71;
+	case 54: goto tr83;
+	case 55: goto tr84;
 	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 77: goto tr123;
-	case 78: goto tr124;
-	case 79: goto tr126;
-	case 81: goto tr130;
-	case 82: goto tr130;
-	case 83: goto tr130;
-	case 85: goto tr136;
-	case 86: goto tr136;
-	case 21: goto tr27;
-	case 22: goto tr27;
-	case 23: goto tr27;
-	case 24: goto tr27;
-	case 25: goto tr27;
-	case 26: goto tr27;
-	case 27: goto tr27;
-	case 87: goto tr136;
-	case 89: goto tr141;
-	case 90: goto tr141;
-	case 28: goto tr35;
-	case 29: goto tr35;
-	case 30: goto tr35;
-	case 31: goto tr35;
-	case 32: goto tr35;
-	case 33: goto tr35;
-	case 91: goto tr141;
+	case 57: goto tr85;
+	case 58: goto tr85;
+	case 59: goto tr85;
+	case 60: goto tr85;
+	case 61: goto tr85;
+	case 62: goto tr85;
+	case 63: goto tr85;
+	case 64: goto tr85;
+	case 65: goto tr85;
+	case 67: goto tr100;
+	case 68: goto tr102;
+	case 70: goto tr105;
+	case 72: goto tr110;
+	case 74: goto tr116;
+	case 77: goto tr127;
+	case 78: goto tr128;
+	case 79: goto tr130;
+	case 81: goto tr134;
+	case 82: goto tr134;
+	case 83: goto tr134;
+	case 85: goto tr140;
+	case 86: goto tr140;
+	case 19: goto tr24;
+	case 20: goto tr24;
+	case 21: goto tr24;
+	case 22: goto tr24;
+	case 23: goto tr24;
+	case 24: goto tr24;
+	case 25: goto tr24;
+	case 87: goto tr140;
+	case 89: goto tr145;
+	case 90: goto tr145;
+	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 91: goto tr145;
 	}
 	}