oga 1.0.2-java → 1.0.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c975aa7eb90663ee1d31e00a082511ada9241128
-  data.tar.gz: 506fd36477791b4615a492d2f504be76abd688d2
+  metadata.gz: 4df6e33c9a4d34b93293ca5edc7a1498615ceb0d
+  data.tar.gz: 82d2a4c041ea36058e2dfa5dc9d54c6bfd8993f0
 SHA512:
-  metadata.gz: 9743465bda3a3e1a048515fb339f315b6b97ed94ae0589cbd9a233f8020386015bd9b81757150ec9b8e94fb826d0e5b05b802bc7cfa484449d45440d4ac3bcde
-  data.tar.gz: 1e90923b83495c3492d9ea2c68512f02f6282b6ccba894d3c9781410969cdf50019f7a654397cedbfd749e05e120ab7e4cb2b6c81d8217f756c1466a60cb723b
+  metadata.gz: 09bb1628f2c61a8fde962b74703044cbad9f3c5e67e10be8bb9dc859a1995d2c5bb875866e91bf270d52ffa31bf6dad41c5b3919ea1eb68abbc2ab755c6ca3c0
+  data.tar.gz: cd75a02e1b431c8f363fee503244b39a9f26988d74df5cb4e9508e390df61128ddd5cbc48e1c78ee5ceba1d6d2242d9a51f15eeba3a3b9c4a67061e4e8b9e709

data/README.md

@@ -28,6 +28,11 @@ Parsing a simple string of XML:
 
     Oga.parse_xml('<people><person>Alice</person></people>')
 
+Parsing XML using strict mode (disables automatic tag insertion):
+
+    Oga.parse_xml('<people>foo</people>', :strict => true) # works fine
+    Oga.parse_xml('<people>foo', :strict => true)          # throws an error
+
 Parsing a simple string of HTML:
 
     Oga.parse_html('<link rel="stylesheet" href="foo.css">')

data/ext/c/lexer.c

@@ -30,7 +30,7 @@ on `ts` and `te`) so the macro ignores this argument.
 ID id_advance_line;
 ID id_html_script_p;
 ID id_html_style_p;
-ID id_html;
+ID id_html_p;
 
 
 #line 34 "ext/c/lexer.rl"
@@ -85,12 +85,13 @@ 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_attribute_pre = 73;
+static const int c_lexer_en_html_attribute_value = 75;
+static const int c_lexer_en_xml_attribute_value = 77;
+static const int c_lexer_en_element_head = 78;
+static const int c_lexer_en_text = 82;
+static const int c_lexer_en_html_script = 86;
+static const int c_lexer_en_html_style = 90;
 static const int c_lexer_en_main = 32;
 
 
@@ -109,7 +110,7 @@ VALUE oga_xml_lexer_advance(VALUE self, VALUE data_block)
     int lines;
 
     /* Whether or not HTML mode is enabled */
-    int html_p = rb_funcall(self, id_html, 0) == Qtrue;
+    int html_p = rb_funcall(self, id_html_p, 0) == Qtrue;
 
     /* Make sure that all data passed back to Ruby has the proper encoding. */
     rb_encoding *encoding = rb_enc_get(data_block);
@@ -157,7 +158,7 @@ VALUE oga_xml_lexer_advance(VALUE self, VALUE data_block)
     lines = state->lines;
 
     
-#line 161 "ext/c/lexer.c"
+#line 162 "ext/c/lexer.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -239,6 +240,8 @@ _again:
 		case 84: goto st84;
 		case 85: goto st85;
 		case 86: goto st86;
+		case 87: goto st87;
+		case 88: goto st88;
 		case 19: goto st19;
 		case 20: goto st20;
 		case 21: goto st21;
@@ -246,17 +249,17 @@ _again:
 		case 23: goto st23;
 		case 24: goto st24;
 		case 25: goto st25;
-		case 87: goto st87;
-		case 88: goto st88;
 		case 89: goto st89;
 		case 90: goto st90;
+		case 91: goto st91;
+		case 92: goto st92;
 		case 26: goto st26;
 		case 27: goto st27;
 		case 28: goto st28;
 		case 29: goto st29;
 		case 30: goto st30;
 		case 31: goto st31;
-		case 91: goto st91;
+		case 93: goto st93;
 	default: break;
 	}
 
@@ -267,10 +270,10 @@ _resume:
 	{
 tr0:
 	( state->cs) = 32;
-#line 530 "ext/ragel/base_lexer.rl"
+#line 549 "ext/ragel/base_lexer.rl"
 	{{p = ((te))-1;}{
         p--;
-        ( state->cs) = 80;
+        ( state->cs) = 82;
     }}
 	goto _again;
 tr4:
@@ -293,18 +296,18 @@ tr17:
 	goto _again;
 tr39:
 	( state->cs) = 32;
-#line 530 "ext/ragel/base_lexer.rl"
+#line 549 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         p--;
-        ( state->cs) = 80;
+        ( state->cs) = 82;
     }}
 	goto _again;
 tr41:
 	( state->cs) = 32;
-#line 530 "ext/ragel/base_lexer.rl"
+#line 549 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         p--;
-        ( state->cs) = 80;
+        ( state->cs) = 82;
     }}
 	goto _again;
 tr43:
@@ -342,13 +345,13 @@ tr47:
 	( state->cs) = 32;
 #line 1 "NONE"
 	{	switch( ( state->act) ) {
-	case 52:
+	case 54:
 	{{p = ((te))-1;}
         callback_simple(id_on_xml_decl_start);
         ( state->cs) = 66;
     }
 	break;
-	case 55:
+	case 57:
 	{{p = ((te))-1;}
         callback_simple(id_on_proc_ins_start);
         callback(id_on_proc_ins_name, data, encoding, ts + 2, te);
@@ -377,7 +380,7 @@ st32:
 case 32:
 #line 1 "NONE"
 	{ts = p;}
-#line 381 "ext/c/lexer.c"
+#line 384 "ext/c/lexer.c"
 	if ( (*p) == 60 )
 		goto tr40;
 	goto tr39;
@@ -389,7 +392,7 @@ st33:
 	if ( ++p == pe )
 		goto _test_eof33;
 case 33:
-#line 393 "ext/c/lexer.c"
+#line 396 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 33: goto st1;
 		case 45: goto tr43;
@@ -499,7 +502,7 @@ st34:
 	if ( ++p == pe )
 		goto _test_eof34;
 case 34:
-#line 503 "ext/c/lexer.c"
+#line 506 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 13: goto tr11;
 		case 32: goto tr11;
@@ -571,19 +574,19 @@ tr18:
 #line 1 "NONE"
 	{te = p+1;}
 #line 165 "ext/ragel/base_lexer.rl"
-	{( state->act) = 55;}
+	{( state->act) = 57;}
 	goto st35;
 tr50:
 #line 1 "NONE"
 	{te = p+1;}
 #line 319 "ext/ragel/base_lexer.rl"
-	{( state->act) = 52;}
+	{( state->act) = 54;}
 	goto st35;
 st35:
 	if ( ++p == pe )
 		goto _test_eof35;
 case 35:
-#line 587 "ext/c/lexer.c"
+#line 590 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 45: goto tr18;
 		case 95: goto tr18;
@@ -676,7 +679,7 @@ st38:
 case 38:
 #line 1 "NONE"
 	{ts = p;}
-#line 680 "ext/c/lexer.c"
+#line 683 "ext/c/lexer.c"
 	if ( (*p) == 45 )
 		goto tr52;
 	goto tr51;
@@ -690,7 +693,7 @@ st39:
 	if ( ++p == pe )
 		goto _test_eof39;
 case 39:
-#line 694 "ext/c/lexer.c"
+#line 697 "ext/c/lexer.c"
 	if ( (*p) == 45 )
 		goto tr53;
 	goto tr51;
@@ -706,7 +709,7 @@ st40:
 	if ( ++p == pe )
 		goto _test_eof40;
 case 40:
-#line 710 "ext/c/lexer.c"
+#line 713 "ext/c/lexer.c"
 	if ( (*p) == 45 )
 		goto st17;
 	goto tr53;
@@ -760,7 +763,7 @@ st41:
 case 41:
 #line 1 "NONE"
 	{ts = p;}
-#line 764 "ext/c/lexer.c"
+#line 767 "ext/c/lexer.c"
 	if ( (*p) == 93 )
 		goto tr56;
 	goto tr55;
@@ -774,7 +777,7 @@ st42:
 	if ( ++p == pe )
 		goto _test_eof42;
 case 42:
-#line 778 "ext/c/lexer.c"
+#line 781 "ext/c/lexer.c"
 	if ( (*p) == 93 )
 		goto tr57;
 	goto tr55;
@@ -790,7 +793,7 @@ st43:
 	if ( ++p == pe )
 		goto _test_eof43;
 case 43:
-#line 794 "ext/c/lexer.c"
+#line 797 "ext/c/lexer.c"
 	if ( (*p) == 93 )
 		goto st18;
 	goto tr57;
@@ -831,7 +834,7 @@ st44:
 case 44:
 #line 1 "NONE"
 	{ts = p;}
-#line 835 "ext/c/lexer.c"
+#line 838 "ext/c/lexer.c"
 	if ( (*p) == 63 )
 		goto tr60;
 	goto tr59;
@@ -845,7 +848,7 @@ st45:
 	if ( ++p == pe )
 		goto _test_eof45;
 case 45:
-#line 849 "ext/c/lexer.c"
+#line 852 "ext/c/lexer.c"
 	if ( (*p) == 63 )
 		goto tr61;
 	goto tr59;
@@ -859,7 +862,7 @@ st46:
 	if ( ++p == pe )
 		goto _test_eof46;
 case 46:
-#line 863 "ext/c/lexer.c"
+#line 866 "ext/c/lexer.c"
 	if ( (*p) == 62 )
 		goto tr62;
 	goto tr61;
@@ -892,7 +895,7 @@ st47:
 case 47:
 #line 1 "NONE"
 	{ts = p;}
-#line 896 "ext/c/lexer.c"
+#line 899 "ext/c/lexer.c"
 	if ( (*p) == 39 )
 		goto tr64;
 	goto tr63;
@@ -906,7 +909,7 @@ st48:
 	if ( ++p == pe )
 		goto _test_eof48;
 case 48:
-#line 910 "ext/c/lexer.c"
+#line 913 "ext/c/lexer.c"
 	if ( (*p) == 39 )
 		goto tr65;
 	goto tr63;
@@ -939,7 +942,7 @@ st49:
 case 49:
 #line 1 "NONE"
 	{ts = p;}
-#line 943 "ext/c/lexer.c"
+#line 946 "ext/c/lexer.c"
 	if ( (*p) == 34 )
 		goto tr67;
 	goto tr66;
@@ -953,7 +956,7 @@ st50:
 	if ( ++p == pe )
 		goto _test_eof50;
 case 50:
-#line 957 "ext/c/lexer.c"
+#line 960 "ext/c/lexer.c"
 	if ( (*p) == 34 )
 		goto tr68;
 	goto tr66;
@@ -983,7 +986,7 @@ st51:
 case 51:
 #line 1 "NONE"
 	{ts = p;}
-#line 987 "ext/c/lexer.c"
+#line 990 "ext/c/lexer.c"
 	if ( (*p) == 93 )
 		goto tr70;
 	goto tr69;
@@ -997,7 +1000,7 @@ st52:
 	if ( ++p == pe )
 		goto _test_eof52;
 case 52:
-#line 1001 "ext/c/lexer.c"
+#line 1004 "ext/c/lexer.c"
 	if ( (*p) == 93 )
 		goto tr71;
 	goto tr69;
@@ -1076,7 +1079,7 @@ st53:
 case 53:
 #line 1 "NONE"
 	{ts = p;}
-#line 1080 "ext/c/lexer.c"
+#line 1083 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 9: goto tr72;
 		case 10: goto tr74;
@@ -1126,7 +1129,7 @@ st55:
 	if ( ++p == pe )
 		goto _test_eof55;
 case 55:
-#line 1130 "ext/c/lexer.c"
+#line 1133 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 45: goto tr78;
 		case 95: goto tr78;
@@ -1393,7 +1396,7 @@ st66:
 case 66:
 #line 1 "NONE"
 	{ts = p;}
-#line 1397 "ext/c/lexer.c"
+#line 1400 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 34: goto tr96;
 		case 39: goto tr97;
@@ -1420,7 +1423,7 @@ st67:
 	if ( ++p == pe )
 		goto _test_eof67;
 case 67:
-#line 1424 "ext/c/lexer.c"
+#line 1427 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 45: goto st67;
 		case 95: goto st67;
@@ -1444,7 +1447,7 @@ st68:
 	if ( ++p == pe )
 		goto _test_eof68;
 case 68:
-#line 1448 "ext/c/lexer.c"
+#line 1451 "ext/c/lexer.c"
 	if ( (*p) == 62 )
 		goto tr103;
 	goto tr102;
@@ -1453,7 +1456,7 @@ tr105:
 #line 394 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_element_name, data, encoding, ts, te);
-            ( state->cs) = 76;
+            ( state->cs) = 78;
         }}
 	goto _again;
 tr106:
@@ -1470,7 +1473,7 @@ st69:
 case 69:
 #line 1 "NONE"
 	{ts = p;}
-#line 1474 "ext/c/lexer.c"
+#line 1477 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 45: goto st70;
 		case 95: goto st70;
@@ -1546,7 +1549,7 @@ st71:
 case 71:
 #line 1 "NONE"
 	{ts = p;}
-#line 1550 "ext/c/lexer.c"
+#line 1553 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 45: goto tr108;
 		case 62: goto tr109;
@@ -1571,7 +1574,7 @@ st72:
 	if ( ++p == pe )
 		goto _test_eof72;
 case 72:
-#line 1575 "ext/c/lexer.c"
+#line 1578 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 45: goto st72;
 		case 58: goto tr112;
@@ -1586,30 +1589,40 @@ case 72:
 	} else
 		goto st72;
 	goto tr110;
-tr114:
-#line 64 "ext/ragel/base_lexer.rl"
-	{te = p+1;{
-        p--;
-        {( state->cs) = ( state->stack)[--( state->top)];goto _again;}
-    }}
-	goto st73;
-tr115:
+tr113:
 	( state->cs) = 73;
-#line 431 "ext/ragel/base_lexer.rl"
+#line 434 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             p--;
-            ( state->cs) = 75;
-        }}
-	goto _again;
-tr116:
-#line 438 "ext/ragel/base_lexer.rl"
-	{te = p;p--;{
-            callback_simple(id_on_string_squote);
 
-            callback(id_on_string_body, data, encoding, ts, te);
+            if ( lines > 0 )
+            {
+                advance_line(lines);
 
-            callback_simple(id_on_string_squote);
+                lines = 0;
+            }
+
+            if ( html_p )
+            {
+                ( state->cs) = 75;
+            }
+            else
+            {
+                ( state->cs) = 77;
+            }
         }}
+	goto _again;
+tr114:
+#line 56 "ext/ragel/base_lexer.rl"
+	{
+        if ( (*p) == '\n' ) lines++;
+    }
+#line 432 "ext/ragel/base_lexer.rl"
+	{te = p+1;}
+	goto st73;
+tr116:
+#line 432 "ext/ragel/base_lexer.rl"
+	{te = p;p--;}
 	goto st73;
 st73:
 #line 1 "NONE"
@@ -1619,112 +1632,178 @@ st73:
 case 73:
 #line 1 "NONE"
 	{ts = p;}
-#line 1623 "ext/c/lexer.c"
+#line 1636 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 13: goto tr114;
+		case 13: goto tr115;
 		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 tr114;
-	} else if ( (*p) >= 9 )
+	if ( 9 <= (*p) && (*p) <= 10 )
 		goto tr114;
+	goto tr113;
+tr115:
+#line 56 "ext/ragel/base_lexer.rl"
+	{
+        if ( (*p) == '\n' ) lines++;
+    }
 	goto st74;
 st74:
 	if ( ++p == pe )
 		goto _test_eof74;
 case 74:
+#line 1654 "ext/c/lexer.c"
+	if ( (*p) == 10 )
+		goto tr114;
+	goto tr116;
+tr118:
+#line 64 "ext/ragel/base_lexer.rl"
+	{te = p+1;{
+        p--;
+        {( state->cs) = ( state->stack)[--( state->top)];goto _again;}
+    }}
+	goto st75;
+tr119:
+	( state->cs) = 75;
+#line 457 "ext/ragel/base_lexer.rl"
+	{te = p+1;{
+            p--;
+            ( state->cs) = 77;
+        }}
+	goto _again;
+tr120:
+#line 1 "NONE"
+	{	switch( ( state->act) ) {
+	case 35:
+	{{p = ((te))-1;}
+            callback_simple(id_on_string_squote);
+
+            callback(id_on_string_body, data, encoding, ts, te);
+
+            callback_simple(id_on_string_squote);
+        }
+	break;
+	case 36:
+	{{p = ((te))-1;}
+        p--;
+        {( state->cs) = ( state->stack)[--( state->top)];goto _again;}
+    }
+	break;
+	}
+	}
+	goto st75;
+st75:
+#line 1 "NONE"
+	{ts = 0;}
+	if ( ++p == pe )
+		goto _test_eof75;
+case 75:
+#line 1 "NONE"
+	{ts = p;}
+#line 1702 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 13: goto tr116;
-		case 32: goto tr116;
-		case 34: goto tr116;
-		case 39: goto tr116;
-		case 96: goto tr116;
+		case 13: goto tr118;
+		case 32: goto tr118;
+		case 34: goto tr119;
+		case 39: goto tr119;
+	}
+	if ( 9 <= (*p) && (*p) <= 10 )
+		goto tr118;
+	goto tr117;
+tr117:
+#line 1 "NONE"
+	{te = p+1;}
+#line 64 "ext/ragel/base_lexer.rl"
+	{( state->act) = 36;}
+	goto st76;
+tr121:
+#line 1 "NONE"
+	{te = p+1;}
+#line 464 "ext/ragel/base_lexer.rl"
+	{( state->act) = 35;}
+	goto st76;
+st76:
+	if ( ++p == pe )
+		goto _test_eof76;
+case 76:
+#line 1728 "ext/c/lexer.c"
+	switch( (*p) ) {
+		case 13: goto tr120;
+		case 32: goto tr120;
+		case 96: goto tr120;
 	}
 	if ( (*p) > 10 ) {
 		if ( 60 <= (*p) && (*p) <= 62 )
-			goto tr116;
+			goto tr120;
 	} else if ( (*p) >= 9 )
-		goto tr116;
-	goto st74;
-tr117:
+		goto tr120;
+	goto tr121;
+tr122:
 #line 64 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         p--;
         {( state->cs) = ( state->stack)[--( state->top)];goto _again;}
     }}
-	goto st75;
-tr118:
-	( state->cs) = 75;
-#line 460 "ext/ragel/base_lexer.rl"
+	goto st77;
+tr123:
+	( state->cs) = 77;
+#line 486 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_string_dquote);
 
             ( state->cs) = 49;
         }}
 	goto _again;
-tr119:
-	( state->cs) = 75;
-#line 454 "ext/ragel/base_lexer.rl"
+tr124:
+	( state->cs) = 77;
+#line 480 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_string_squote);
 
             ( state->cs) = 47;
         }}
 	goto _again;
-st75:
+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 1687 "ext/c/lexer.c"
+#line 1773 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 34: goto tr118;
-		case 39: goto tr119;
+		case 34: goto tr123;
+		case 39: goto tr124;
 	}
-	goto tr117;
-tr120:
-#line 519 "ext/ragel/base_lexer.rl"
+	goto tr122;
+tr125:
+#line 538 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
-	goto st76;
-tr121:
+	goto st78;
+tr126:
 #line 60 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         advance_line(1);
     }}
-	goto st76;
-tr125:
-#line 484 "ext/ragel/base_lexer.rl"
+	goto st78;
+tr130:
+#line 510 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
-            if ( html_p )
-            {
-                {( state->stack)[( state->top)++] = 76; goto st73;}
-            }
-            else
-            {
-                {( state->stack)[( state->top)++] = 76; goto st75;}
-            }
+            {( state->stack)[( state->top)++] = 78; goto st73;}
         }}
-	goto st76;
-tr126:
-	( state->cs) = 76;
-#line 496 "ext/ragel/base_lexer.rl"
+	goto st78;
+tr131:
+	( state->cs) = 78;
+#line 515 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_element_open_end);
 
             if ( html_script_p() )
             {
-                ( state->cs) = 84;
+                ( state->cs) = 86;
             }
             else if ( html_style_p() )
             {
-                ( state->cs) = 88;
+                ( state->cs) = 90;
             }
             else
             {
@@ -1732,98 +1811,98 @@ tr126:
             }
         }}
 	goto _again;
-tr127:
+tr132:
 #line 60 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         advance_line(1);
     }}
-	goto st76;
-tr128:
-#line 479 "ext/ragel/base_lexer.rl"
+	goto st78;
+tr133:
+#line 505 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_attribute, data, encoding, ts, te);
         }}
-	goto st76;
-tr129:
-#line 475 "ext/ragel/base_lexer.rl"
+	goto st78;
+tr134:
+#line 501 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback(id_on_attribute_ns, data, encoding, ts, te - 1);
         }}
-	goto st76;
-tr130:
-#line 519 "ext/ragel/base_lexer.rl"
+	goto st78;
+tr135:
+#line 538 "ext/ragel/base_lexer.rl"
 	{te = p;p--;}
-	goto st76;
-tr131:
-	( state->cs) = 76;
-#line 514 "ext/ragel/base_lexer.rl"
+	goto st78;
+tr136:
+	( state->cs) = 78;
+#line 533 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_element_end);
             ( state->cs) = 32;
         }}
 	goto _again;
-st76:
+st78:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof76;
-case 76:
+		goto _test_eof78;
+case 78:
 #line 1 "NONE"
 	{ts = p;}
-#line 1774 "ext/c/lexer.c"
+#line 1853 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 10: goto tr121;
-		case 13: goto st77;
-		case 45: goto st78;
-		case 47: goto st79;
-		case 61: goto tr125;
-		case 62: goto tr126;
-		case 95: goto st78;
+		case 10: goto tr126;
+		case 13: goto st79;
+		case 45: goto st80;
+		case 47: goto st81;
+		case 61: goto tr130;
+		case 62: goto tr131;
+		case 95: goto st80;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st78;
+			goto st80;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto st78;
+			goto st80;
 	} else
-		goto st78;
-	goto tr120;
-st77:
+		goto st80;
+	goto tr125;
+st79:
 	if ( ++p == pe )
-		goto _test_eof77;
-case 77:
+		goto _test_eof79;
+case 79:
 	if ( (*p) == 10 )
-		goto tr121;
-	goto tr127;
-st78:
+		goto tr126;
+	goto tr132;
+st80:
 	if ( ++p == pe )
-		goto _test_eof78;
-case 78:
+		goto _test_eof80;
+case 80:
 	switch( (*p) ) {
-		case 45: goto st78;
-		case 58: goto tr129;
-		case 95: goto st78;
+		case 45: goto st80;
+		case 58: goto tr134;
+		case 95: goto st80;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st78;
+			goto st80;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto st78;
+			goto st80;
 	} else
-		goto st78;
-	goto tr128;
-st79:
+		goto st80;
+	goto tr133;
+st81:
 	if ( ++p == pe )
-		goto _test_eof79;
-case 79:
+		goto _test_eof81;
+case 81:
 	if ( (*p) == 62 )
-		goto tr131;
-	goto tr130;
-tr134:
-	( state->cs) = 80;
-#line 556 "ext/ragel/base_lexer.rl"
+		goto tr136;
+	goto tr135;
+tr139:
+	( state->cs) = 82;
+#line 575 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_text, data, encoding, ts, te);
 
@@ -1837,9 +1916,9 @@ tr134:
             ( state->cs) = 32;
         }}
 	goto _again;
-tr136:
-	( state->cs) = 80;
-#line 570 "ext/ragel/base_lexer.rl"
+tr141:
+	( state->cs) = 82;
+#line 589 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback(id_on_text, data, encoding, ts, mark);
 
@@ -1856,9 +1935,9 @@ tr136:
             ( state->cs) = 32;
         }}
 	goto _again;
-tr137:
-	( state->cs) = 80;
-#line 556 "ext/ragel/base_lexer.rl"
+tr142:
+	( state->cs) = 82;
+#line 575 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback(id_on_text, data, encoding, ts, te);
 
@@ -1872,92 +1951,92 @@ tr137:
             ( state->cs) = 32;
         }}
 	goto _again;
-st80:
+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 1884 "ext/c/lexer.c"
+#line 1963 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr133;
-	goto tr132;
-tr132:
+		goto tr138;
+	goto tr137;
+tr137:
 #line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st81;
-st81:
+	goto st83;
+st83:
 	if ( ++p == pe )
-		goto _test_eof81;
-case 81:
-#line 1898 "ext/c/lexer.c"
+		goto _test_eof83;
+case 83:
+#line 1977 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr135;
-	goto tr132;
-tr135:
+		goto tr140;
+	goto tr137;
+tr140:
 #line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-#line 570 "ext/ragel/base_lexer.rl"
+#line 589 "ext/ragel/base_lexer.rl"
 	{ mark = p; }
-	goto st82;
-st82:
+	goto st84;
+st84:
 	if ( ++p == pe )
-		goto _test_eof82;
-case 82:
-#line 1914 "ext/c/lexer.c"
+		goto _test_eof84;
+case 84:
+#line 1993 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 33: goto tr136;
-		case 45: goto tr136;
-		case 60: goto tr135;
-		case 63: goto tr136;
-		case 95: goto tr136;
+		case 33: goto tr141;
+		case 45: goto tr141;
+		case 60: goto tr140;
+		case 63: goto tr141;
+		case 95: goto tr141;
 	}
 	if ( (*p) < 65 ) {
 		if ( 47 <= (*p) && (*p) <= 57 )
-			goto tr136;
+			goto tr141;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr136;
+			goto tr141;
 	} else
-		goto tr136;
-	goto tr132;
-tr133:
+		goto tr141;
+	goto tr137;
+tr138:
 #line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-#line 570 "ext/ragel/base_lexer.rl"
+#line 589 "ext/ragel/base_lexer.rl"
 	{ mark = p; }
-	goto st83;
-st83:
+	goto st85;
+st85:
 	if ( ++p == pe )
-		goto _test_eof83;
-case 83:
-#line 1943 "ext/c/lexer.c"
+		goto _test_eof85;
+case 85:
+#line 2022 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 33: goto tr137;
-		case 45: goto tr137;
-		case 60: goto tr135;
-		case 63: goto tr137;
-		case 95: goto tr137;
+		case 33: goto tr142;
+		case 45: goto tr142;
+		case 60: goto tr140;
+		case 63: goto tr142;
+		case 95: goto tr142;
 	}
 	if ( (*p) < 65 ) {
 		if ( 47 <= (*p) && (*p) <= 57 )
-			goto tr137;
+			goto tr142;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr137;
+			goto tr142;
 	} else
-		goto tr137;
-	goto tr132;
+		goto tr142;
+	goto tr137;
 tr24:
-#line 544 "ext/ragel/base_lexer.rl"
+#line 563 "ext/ragel/base_lexer.rl"
 	{{p = ((te))-1;}{
         callback(id_on_text, data, encoding, ts, te);
 
@@ -1968,9 +2047,9 @@ tr24:
             lines = 0;
         }
     }}
-	goto st84;
+	goto st86;
 tr31:
-	( state->cs) = 84;
+	( state->cs) = 86;
 #line 379 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_element_end);
@@ -1978,8 +2057,8 @@ tr31:
         ( state->cs) = 32;
     }}
 	goto _again;
-tr140:
-#line 544 "ext/ragel/base_lexer.rl"
+tr145:
+#line 563 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback(id_on_text, data, encoding, ts, te);
 
@@ -1990,51 +2069,51 @@ tr140:
             lines = 0;
         }
     }}
-	goto st84;
-st84:
+	goto st86;
+st86:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof84;
-case 84:
+		goto _test_eof86;
+case 86:
 #line 1 "NONE"
 	{ts = p;}
-#line 2003 "ext/c/lexer.c"
+#line 2082 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr139;
-	goto tr138;
-tr138:
+		goto tr144;
+	goto tr143;
+tr143:
 #line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st85;
-st85:
+	goto st87;
+st87:
 	if ( ++p == pe )
-		goto _test_eof85;
-case 85:
-#line 2017 "ext/c/lexer.c"
+		goto _test_eof87;
+case 87:
+#line 2096 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr140;
-	goto tr138;
-tr139:
+		goto tr145;
+	goto tr143;
+tr144:
 #line 1 "NONE"
 	{te = p+1;}
 #line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st86;
-st86:
+	goto st88;
+st88:
 	if ( ++p == pe )
-		goto _test_eof86;
-case 86:
-#line 2033 "ext/c/lexer.c"
+		goto _test_eof88;
+case 88:
+#line 2112 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 47: goto st19;
-		case 60: goto tr142;
+		case 60: goto tr147;
 	}
-	goto tr140;
+	goto tr145;
 st19:
 	if ( ++p == pe )
 		goto _test_eof19;
@@ -2084,22 +2163,22 @@ case 25:
 	if ( (*p) == 62 )
 		goto tr31;
 	goto tr24;
-tr142:
+tr147:
 #line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st87;
-st87:
+	goto st89;
+st89:
 	if ( ++p == pe )
-		goto _test_eof87;
-case 87:
-#line 2098 "ext/c/lexer.c"
+		goto _test_eof89;
+case 89:
+#line 2177 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr142;
-	goto tr140;
+		goto tr147;
+	goto tr145;
 tr32:
-#line 544 "ext/ragel/base_lexer.rl"
+#line 563 "ext/ragel/base_lexer.rl"
 	{{p = ((te))-1;}{
         callback(id_on_text, data, encoding, ts, te);
 
@@ -2110,9 +2189,9 @@ tr32:
             lines = 0;
         }
     }}
-	goto st88;
+	goto st90;
 tr38:
-	( state->cs) = 88;
+	( state->cs) = 90;
 #line 379 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_element_end);
@@ -2120,8 +2199,8 @@ tr38:
         ( state->cs) = 32;
     }}
 	goto _again;
-tr145:
-#line 544 "ext/ragel/base_lexer.rl"
+tr150:
+#line 563 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback(id_on_text, data, encoding, ts, te);
 
@@ -2132,51 +2211,51 @@ tr145:
             lines = 0;
         }
     }}
-	goto st88;
-st88:
+	goto st90;
+st90:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof88;
-case 88:
+		goto _test_eof90;
+case 90:
 #line 1 "NONE"
 	{ts = p;}
-#line 2145 "ext/c/lexer.c"
+#line 2224 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr144;
-	goto tr143;
-tr143:
+		goto tr149;
+	goto tr148;
+tr148:
 #line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st89;
-st89:
+	goto st91;
+st91:
 	if ( ++p == pe )
-		goto _test_eof89;
-case 89:
-#line 2159 "ext/c/lexer.c"
+		goto _test_eof91;
+case 91:
+#line 2238 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr145;
-	goto tr143;
-tr144:
+		goto tr150;
+	goto tr148;
+tr149:
 #line 1 "NONE"
 	{te = p+1;}
 #line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st90;
-st90:
+	goto st92;
+st92:
 	if ( ++p == pe )
-		goto _test_eof90;
-case 90:
-#line 2175 "ext/c/lexer.c"
+		goto _test_eof92;
+case 92:
+#line 2254 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 47: goto st26;
-		case 60: goto tr147;
+		case 60: goto tr152;
 	}
-	goto tr145;
+	goto tr150;
 st26:
 	if ( ++p == pe )
 		goto _test_eof26;
@@ -2219,20 +2298,20 @@ case 31:
 	if ( (*p) == 62 )
 		goto tr38;
 	goto tr32;
-tr147:
+tr152:
 #line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st91;
-st91:
+	goto st93;
+st93:
 	if ( ++p == pe )
-		goto _test_eof91;
-case 91:
-#line 2233 "ext/c/lexer.c"
+		goto _test_eof93;
+case 93:
+#line 2312 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr147;
-	goto tr145;
+		goto tr152;
+	goto tr150;
 	}
 	_test_eof32: ( state->cs) = 32; goto _test_eof; 
 	_test_eof33: ( state->cs) = 33; goto _test_eof; 
@@ -2307,6 +2386,8 @@ 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_eof87: ( state->cs) = 87; goto _test_eof; 
+	_test_eof88: ( state->cs) = 88; 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; 
@@ -2314,17 +2395,17 @@ case 91:
 	_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_eof87: ( state->cs) = 87; goto _test_eof; 
-	_test_eof88: ( state->cs) = 88; goto _test_eof; 
 	_test_eof89: ( state->cs) = 89; goto _test_eof; 
 	_test_eof90: ( state->cs) = 90; goto _test_eof; 
+	_test_eof91: ( state->cs) = 91; goto _test_eof; 
+	_test_eof92: ( state->cs) = 92; goto _test_eof; 
 	_test_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_eof91: ( state->cs) = 91; goto _test_eof; 
+	_test_eof93: ( state->cs) = 93; goto _test_eof; 
 
 	_test_eof: {}
 	if ( p == eof )
@@ -2379,14 +2460,15 @@ case 91:
 	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 76: goto tr120;
+	case 79: goto tr132;
+	case 80: goto tr133;
+	case 81: goto tr135;
+	case 83: goto tr139;
+	case 84: goto tr139;
+	case 85: goto tr139;
+	case 87: goto tr145;
+	case 88: goto tr145;
 	case 19: goto tr24;
 	case 20: goto tr24;
 	case 21: goto tr24;
@@ -2394,16 +2476,16 @@ case 91:
 	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 91: goto tr150;
+	case 92: goto tr150;
 	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;
+	case 93: goto tr150;
 	}
 	}
 
@@ -2466,7 +2548,7 @@ void Init_liboga_xml_lexer()
     id_advance_line  = rb_intern("advance_line");
     id_html_script_p = rb_intern("html_script?");
     id_html_style_p  = rb_intern("html_style?");
-    id_html          = rb_intern("html");
+    id_html_p        = rb_intern("html?");
 
     rb_define_method(cLexer, "advance_native", oga_xml_lexer_advance, 1);
     rb_define_method(cLexer, "reset_native", oga_xml_lexer_reset, 0);