oga 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0377d24ecf7ad22488c342e769083cd45be29033
-  data.tar.gz: 108998ff40fdbba079743849264773998d2a2543
+  metadata.gz: 8c12b25a1de8aefc56af27b416df64100198d776
+  data.tar.gz: f2b5d83c0ab750a1005ef99997e3d38b2c938c26
 SHA512:
-  metadata.gz: 109d74d22335a88fc180279ea7c81c65a2f3b6e33f319722c71baa806d92bf215fac9d9d22b5e3e14f92cb4b9fa62d8b279156af20bef747ca5fb0d77f4a9f9b
-  data.tar.gz: 088710d99712c155c789afae19c6dccf20a1482395280a566d9e884a9c47fdaf2dbe49ee201b890c6c98f9788f7c0f7d5b92f557b5bfd640920830f1161e0b7b
+  metadata.gz: d457b69ca2daa6d529c83f02c8681b7dff2b16e5a31cfca58932c7b778075f2698e24ec15e288739a7485c197396848f1e1894e4e7ecc15f4db0b5a772afe7de
+  data.tar.gz: 4c8c0af22947d873c19ffb5594d986f0c3080c0eb0bc6533628c5274da62b379f884a6c6e1c84e1b3e6886234cb7457988a8b6b26125e44527ebb720fb6b7f50

data/ext/c/lexer.c

@@ -21,15 +21,19 @@ on `ts` and `te`) so the macro ignores this argument.
 #define advance_line(amount) \
     rb_funcall(self, id_advance_line, 1, INT2NUM(amount));
 
-#define literal_html_element_p() \
-    rb_funcall(self, id_literal_html_element_p, 0) == Qtrue
+#define html_script_p() \
+    rb_funcall(self, id_html_script_p, 0) == Qtrue
+
+#define html_style_p() \
+    rb_funcall(self, id_html_style_p, 0) == Qtrue
 
 ID id_advance_line;
-ID id_literal_html_element_p;
+ID id_html_script_p;
+ID id_html_style_p;
 ID id_html;
 
 
-#line 30 "ext/c/lexer.rl"
+#line 34 "ext/c/lexer.rl"
 
 /**
  * Calls a method defined in the Ruby side of the lexer. The String value is
@@ -66,29 +70,30 @@ void liboga_xml_lexer_callback_simple(VALUE self, VALUE name)
 }
 
 
-#line 70 "ext/c/lexer.c"
-static const int c_lexer_start = 22;
-static const int c_lexer_first_final = 22;
+#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_error = 0;
 
-static const int c_lexer_en_comment_body = 28;
-static const int c_lexer_en_cdata_body = 31;
-static const int c_lexer_en_proc_ins_body = 34;
-static const int c_lexer_en_string_squote = 37;
-static const int c_lexer_en_string_dquote = 39;
-static const int c_lexer_en_doctype_inline = 41;
-static const int c_lexer_en_doctype = 43;
-static const int c_lexer_en_xml_decl = 55;
-static const int c_lexer_en_element_name = 58;
-static const int c_lexer_en_html_attribute_value = 60;
-static const int c_lexer_en_xml_attribute_value = 62;
-static const int c_lexer_en_element_head = 63;
-static const int c_lexer_en_text = 66;
-static const int c_lexer_en_literal_html_element = 70;
-static const int c_lexer_en_main = 22;
-
-
-#line 66 "ext/c/lexer.rl"
+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_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;
+
+
+#line 70 "ext/c/lexer.rl"
 
 /**
  * Lexes the String specifies as the method argument. Token values have the
@@ -152,7 +157,7 @@ VALUE oga_xml_lexer_advance(VALUE self, VALUE data_block)
     lines = state->lines;
 
     
-#line 156 "ext/c/lexer.c"
+#line 161 "ext/c/lexer.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -160,8 +165,8 @@ VALUE oga_xml_lexer_advance(VALUE self, VALUE data_block)
 
 _again:
 	switch ( ( state->cs) ) {
-		case 22: goto st22;
-		case 23: goto st23;
+		case 34: goto st34;
+		case 35: goto st35;
 		case 1: goto st1;
 		case 2: goto st2;
 		case 3: goto st3;
@@ -171,7 +176,7 @@ _again:
 		case 7: goto st7;
 		case 8: goto st8;
 		case 9: goto st9;
-		case 24: goto st24;
+		case 36: goto st36;
 		case 10: goto st10;
 		case 11: goto st11;
 		case 12: goto st12;
@@ -181,30 +186,17 @@ _again:
 		case 16: goto st16;
 		case 17: goto st17;
 		case 18: goto st18;
-		case 25: goto st25;
-		case 26: goto st26;
-		case 27: goto st27;
-		case 28: goto st28;
-		case 29: goto st29;
-		case 30: goto st30;
-		case 19: goto st19;
-		case 31: goto st31;
-		case 32: goto st32;
-		case 33: goto st33;
-		case 20: goto st20;
-		case 34: goto st34;
-		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 41: goto st41;
 		case 42: goto st42;
+		case 19: goto st19;
 		case 43: goto st43;
-		case 0: goto st0;
 		case 44: goto st44;
 		case 45: goto st45;
+		case 20: goto st20;
 		case 46: goto st46;
 		case 47: goto st47;
 		case 48: goto st48;
@@ -215,6 +207,7 @@ _again:
 		case 53: goto st53;
 		case 54: goto st54;
 		case 55: goto st55;
+		case 0: goto st0;
 		case 56: goto st56;
 		case 57: goto st57;
 		case 58: goto st58;
@@ -225,7 +218,6 @@ _again:
 		case 63: goto st63;
 		case 64: goto st64;
 		case 65: goto st65;
-		case 21: goto st21;
 		case 66: goto st66;
 		case 67: goto st67;
 		case 68: goto st68;
@@ -243,6 +235,28 @@ _again:
 		case 80: goto st80;
 		case 81: goto st81;
 		case 82: goto st82;
+		case 83: goto st83;
+		case 84: goto st84;
+		case 85: goto st85;
+		case 86: goto st86;
+		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 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;
 	}
 
@@ -252,138 +266,146 @@ _resume:
 	switch ( ( state->cs) )
 	{
 tr0:
-	( state->cs) = 22;
-#line 471 "ext/ragel/base_lexer.rl"
+	( state->cs) = 34;
+#line 505 "ext/ragel/base_lexer.rl"
 	{{p = ((te))-1;}{
         p--;
-        ( state->cs) = 66;
+        ( state->cs) = 80;
     }}
 	goto _again;
 tr4:
-	( state->cs) = 22;
-#line 74 "ext/ragel/base_lexer.rl"
+	( state->cs) = 34;
+#line 84 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_comment_start);
 
-        ( state->cs) = 28;
+        ( state->cs) = 40;
     }}
 	goto _again;
 tr17:
-	( state->cs) = 22;
-#line 113 "ext/ragel/base_lexer.rl"
+	( state->cs) = 34;
+#line 123 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_cdata_start);
 
-        ( state->cs) = 31;
+        ( state->cs) = 43;
     }}
 	goto _again;
 tr20:
-#line 357 "ext/ragel/base_lexer.rl"
+#line 375 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_element_end);
     }}
-	goto st22;
-tr29:
-	( state->cs) = 22;
-#line 471 "ext/ragel/base_lexer.rl"
+	goto st34;
+tr42:
+	( state->cs) = 34;
+#line 505 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         p--;
-        ( state->cs) = 66;
+        ( state->cs) = 80;
     }}
 	goto _again;
-tr31:
-	( state->cs) = 22;
-#line 471 "ext/ragel/base_lexer.rl"
+tr44:
+	( state->cs) = 34;
+#line 505 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         p--;
-        ( state->cs) = 66;
+        ( state->cs) = 80;
     }}
 	goto _again;
-tr33:
-	( state->cs) = 22;
-#line 351 "ext/ragel/base_lexer.rl"
+tr46:
+	( state->cs) = 34;
+#line 369 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_element_start);
         p--;
-        ( state->cs) = 58;
+        ( state->cs) = 71;
     }}
 	goto _again;
-tr35:
-	( state->cs) = 22;
-#line 245 "ext/ragel/base_lexer.rl"
+tr48:
+	( state->cs) = 34;
+#line 255 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback_simple(id_on_doctype_start);
-        ( state->cs) = 43;
+
+        if ( lines > 0 )
+        {
+            advance_line(lines);
+
+            lines = 0;
+        }
+
+        ( state->cs) = 55;
     }}
 	goto _again;
-tr36:
-	( state->cs) = 22;
+tr49:
+	( state->cs) = 34;
 #line 1 "NONE"
 	{	switch( ( state->act) ) {
-	case 45:
+	case 48:
 	{{p = ((te))-1;}
         callback_simple(id_on_xml_decl_start);
-        ( state->cs) = 55;
+        ( state->cs) = 68;
     }
 	break;
-	case 48:
+	case 51:
 	{{p = ((te))-1;}
         callback_simple(id_on_proc_ins_start);
         callback(id_on_proc_ins_name, data, encoding, ts + 2, te);
 
-        ( state->cs) = 34;
+        ( state->cs) = 46;
     }
 	break;
 	}
 	}
 	goto _again;
-tr37:
-	( state->cs) = 22;
-#line 155 "ext/ragel/base_lexer.rl"
+tr50:
+	( state->cs) = 34;
+#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) = 34;
+        ( state->cs) = 46;
     }}
 	goto _again;
-st22:
+st34:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof22;
-case 22:
+		goto _test_eof34;
+case 34:
 #line 1 "NONE"
 	{ts = p;}
-#line 359 "ext/c/lexer.c"
+#line 381 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr30;
-	goto tr29;
-tr30:
+		goto tr43;
+	goto tr42;
+tr43:
 #line 1 "NONE"
 	{te = p+1;}
-	goto st23;
-st23:
+	goto st35;
+st35:
 	if ( ++p == pe )
-		goto _test_eof23;
-case 23:
-#line 371 "ext/c/lexer.c"
+		goto _test_eof35;
+case 35:
+#line 393 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 33: goto st1;
-		case 45: goto tr33;
+		case 45: goto tr46;
 		case 47: goto st16;
 		case 63: goto st18;
-		case 95: goto tr33;
+		case 95: goto tr46;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr33;
+			goto tr46;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr33;
+			goto tr46;
 	} else
-		goto tr33;
-	goto tr31;
+		goto tr46;
+	goto tr44;
 st1:
 	if ( ++p == pe )
 		goto _test_eof1;
@@ -461,19 +483,30 @@ st9:
 		goto _test_eof9;
 case 9:
 	switch( (*p) ) {
-		case 9: goto st24;
-		case 32: goto st24;
+		case 13: goto tr11;
+		case 32: goto tr11;
 	}
+	if ( 9 <= (*p) && (*p) <= 10 )
+		goto tr11;
 	goto tr0;
-st24:
+tr11:
+#line 56 "ext/ragel/base_lexer.rl"
+	{
+        if ( (*p) == '\n' ) lines++;
+    }
+	goto st36;
+st36:
 	if ( ++p == pe )
-		goto _test_eof24;
-case 24:
+		goto _test_eof36;
+case 36:
+#line 503 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 9: goto st24;
-		case 32: goto st24;
+		case 13: goto tr11;
+		case 32: goto tr11;
 	}
-	goto tr35;
+	if ( 9 <= (*p) && (*p) <= 10 )
+		goto tr11;
+	goto tr48;
 st10:
 	if ( ++p == pe )
 		goto _test_eof10;
@@ -559,7 +592,7 @@ case 18:
 	switch( (*p) ) {
 		case 45: goto tr21;
 		case 95: goto tr21;
-		case 120: goto st26;
+		case 120: goto st38;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
@@ -573,20 +606,20 @@ case 18:
 tr21:
 #line 1 "NONE"
 	{te = p+1;}
-#line 155 "ext/ragel/base_lexer.rl"
-	{( state->act) = 48;}
-	goto st25;
-tr39:
+#line 165 "ext/ragel/base_lexer.rl"
+	{( state->act) = 51;}
+	goto st37;
+tr52:
 #line 1 "NONE"
 	{te = p+1;}
-#line 301 "ext/ragel/base_lexer.rl"
-	{( state->act) = 45;}
-	goto st25;
-st25:
+#line 319 "ext/ragel/base_lexer.rl"
+	{( state->act) = 48;}
+	goto st37;
+st37:
 	if ( ++p == pe )
-		goto _test_eof25;
-case 25:
-#line 590 "ext/c/lexer.c"
+		goto _test_eof37;
+case 37:
+#line 623 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 45: goto tr21;
 		case 95: goto tr21;
@@ -599,15 +632,15 @@ case 25:
 			goto tr21;
 	} else
 		goto tr21;
-	goto tr36;
-st26:
+	goto tr49;
+st38:
 	if ( ++p == pe )
-		goto _test_eof26;
-case 26:
+		goto _test_eof38;
+case 38:
 	switch( (*p) ) {
 		case 45: goto tr21;
 		case 95: goto tr21;
-		case 109: goto st27;
+		case 109: goto st39;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
@@ -617,15 +650,15 @@ case 26:
 			goto tr21;
 	} else
 		goto tr21;
-	goto tr37;
-st27:
+	goto tr50;
+st39:
 	if ( ++p == pe )
-		goto _test_eof27;
-case 27:
+		goto _test_eof39;
+case 39:
 	switch( (*p) ) {
 		case 45: goto tr21;
 		case 95: goto tr21;
-		case 108: goto tr39;
+		case 108: goto tr52;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
@@ -635,9 +668,9 @@ case 27:
 			goto tr21;
 	} else
 		goto tr21;
-	goto tr37;
+	goto tr50;
 tr23:
-#line 81 "ext/ragel/base_lexer.rl"
+#line 91 "ext/ragel/base_lexer.rl"
 	{{p = ((te))-1;}{
             callback(id_on_comment_body, data, encoding, ts, te);
 
@@ -648,18 +681,18 @@ tr23:
                 lines = 0;
             }
         }}
-	goto st28;
+	goto st40;
 tr24:
-	( state->cs) = 28;
-#line 92 "ext/ragel/base_lexer.rl"
+	( state->cs) = 40;
+#line 102 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_comment_end);
 
-            ( state->cs) = 22;
+            ( state->cs) = 34;
         }}
 	goto _again;
-tr42:
-#line 81 "ext/ragel/base_lexer.rl"
+tr55:
+#line 91 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_comment_body, data, encoding, ts, te);
 
@@ -670,49 +703,49 @@ tr42:
                 lines = 0;
             }
         }}
-	goto st28;
-st28:
+	goto st40;
+st40:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof28;
-case 28:
+		goto _test_eof40;
+case 40:
 #line 1 "NONE"
 	{ts = p;}
-#line 683 "ext/c/lexer.c"
+#line 716 "ext/c/lexer.c"
 	if ( (*p) == 45 )
-		goto tr41;
-	goto tr40;
-tr40:
-#line 51 "ext/ragel/base_lexer.rl"
+		goto tr54;
+	goto tr53;
+tr53:
+#line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st29;
-st29:
+	goto st41;
+st41:
 	if ( ++p == pe )
-		goto _test_eof29;
-case 29:
-#line 697 "ext/c/lexer.c"
+		goto _test_eof41;
+case 41:
+#line 730 "ext/c/lexer.c"
 	if ( (*p) == 45 )
-		goto tr42;
-	goto tr40;
-tr41:
+		goto tr55;
+	goto tr53;
+tr54:
 #line 1 "NONE"
 	{te = p+1;}
-#line 51 "ext/ragel/base_lexer.rl"
+#line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st30;
-st30:
+	goto st42;
+st42:
 	if ( ++p == pe )
-		goto _test_eof30;
-case 30:
-#line 713 "ext/c/lexer.c"
+		goto _test_eof42;
+case 42:
+#line 746 "ext/c/lexer.c"
 	if ( (*p) == 45 )
 		goto st19;
-	goto tr42;
+	goto tr55;
 st19:
 	if ( ++p == pe )
 		goto _test_eof19;
@@ -721,7 +754,7 @@ case 19:
 		goto tr24;
 	goto tr23;
 tr25:
-#line 120 "ext/ragel/base_lexer.rl"
+#line 130 "ext/ragel/base_lexer.rl"
 	{{p = ((te))-1;}{
             callback(id_on_cdata_body, data, encoding, ts, te);
 
@@ -732,18 +765,18 @@ tr25:
                 lines = 0;
             }
         }}
-	goto st31;
+	goto st43;
 tr26:
-	( state->cs) = 31;
-#line 131 "ext/ragel/base_lexer.rl"
+	( state->cs) = 43;
+#line 141 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_cdata_end);
 
-            ( state->cs) = 22;
+            ( state->cs) = 34;
         }}
 	goto _again;
-tr46:
-#line 120 "ext/ragel/base_lexer.rl"
+tr59:
+#line 130 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_cdata_body, data, encoding, ts, te);
 
@@ -754,49 +787,49 @@ tr46:
                 lines = 0;
             }
         }}
-	goto st31;
-st31:
+	goto st43;
+st43:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof31;
-case 31:
+		goto _test_eof43;
+case 43:
 #line 1 "NONE"
 	{ts = p;}
-#line 767 "ext/c/lexer.c"
+#line 800 "ext/c/lexer.c"
 	if ( (*p) == 93 )
-		goto tr45;
-	goto tr44;
-tr44:
-#line 51 "ext/ragel/base_lexer.rl"
+		goto tr58;
+	goto tr57;
+tr57:
+#line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st32;
-st32:
+	goto st44;
+st44:
 	if ( ++p == pe )
-		goto _test_eof32;
-case 32:
-#line 781 "ext/c/lexer.c"
+		goto _test_eof44;
+case 44:
+#line 814 "ext/c/lexer.c"
 	if ( (*p) == 93 )
-		goto tr46;
-	goto tr44;
-tr45:
+		goto tr59;
+	goto tr57;
+tr58:
 #line 1 "NONE"
 	{te = p+1;}
-#line 51 "ext/ragel/base_lexer.rl"
+#line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st33;
-st33:
+	goto st45;
+st45:
 	if ( ++p == pe )
-		goto _test_eof33;
-case 33:
-#line 797 "ext/c/lexer.c"
+		goto _test_eof45;
+case 45:
+#line 830 "ext/c/lexer.c"
 	if ( (*p) == 93 )
 		goto st20;
-	goto tr46;
+	goto tr59;
 st20:
 	if ( ++p == pe )
 		goto _test_eof20;
@@ -804,8 +837,8 @@ case 20:
 	if ( (*p) == 62 )
 		goto tr26;
 	goto tr25;
-tr50:
-#line 163 "ext/ragel/base_lexer.rl"
+tr63:
+#line 173 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_proc_ins_body, data, encoding, ts, te);
 
@@ -816,66 +849,66 @@ tr50:
                 lines = 0;
             }
         }}
-	goto st34;
-tr51:
-	( state->cs) = 34;
-#line 174 "ext/ragel/base_lexer.rl"
+	goto st46;
+tr64:
+	( state->cs) = 46;
+#line 184 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_proc_ins_end);
 
-            ( state->cs) = 22;
+            ( state->cs) = 34;
         }}
 	goto _again;
-st34:
+st46:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof34;
-case 34:
+		goto _test_eof46;
+case 46:
 #line 1 "NONE"
 	{ts = p;}
-#line 838 "ext/c/lexer.c"
+#line 871 "ext/c/lexer.c"
 	if ( (*p) == 63 )
-		goto tr49;
-	goto tr48;
-tr48:
-#line 51 "ext/ragel/base_lexer.rl"
+		goto tr62;
+	goto tr61;
+tr61:
+#line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st35;
-st35:
+	goto st47;
+st47:
 	if ( ++p == pe )
-		goto _test_eof35;
-case 35:
-#line 852 "ext/c/lexer.c"
+		goto _test_eof47;
+case 47:
+#line 885 "ext/c/lexer.c"
 	if ( (*p) == 63 )
-		goto tr50;
-	goto tr48;
-tr49:
-#line 51 "ext/ragel/base_lexer.rl"
+		goto tr63;
+	goto tr61;
+tr62:
+#line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st36;
-st36:
+	goto st48;
+st48:
 	if ( ++p == pe )
-		goto _test_eof36;
-case 36:
-#line 866 "ext/c/lexer.c"
+		goto _test_eof48;
+case 48:
+#line 899 "ext/c/lexer.c"
 	if ( (*p) == 62 )
-		goto tr51;
-	goto tr50;
-tr53:
-#line 216 "ext/ragel/base_lexer.rl"
+		goto tr64;
+	goto tr63;
+tr66:
+#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 st37;
-tr54:
-#line 190 "ext/ragel/base_lexer.rl"
+	goto st49;
+tr67:
+#line 200 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback(id_on_string_body, data, encoding, ts, te);
 
@@ -886,43 +919,43 @@ tr54:
             lines = 0;
         }
     }}
-	goto st37;
-st37:
+	goto st49;
+st49:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof37;
-case 37:
+		goto _test_eof49;
+case 49:
 #line 1 "NONE"
 	{ts = p;}
-#line 899 "ext/c/lexer.c"
+#line 932 "ext/c/lexer.c"
 	if ( (*p) == 39 )
-		goto tr53;
-	goto tr52;
-tr52:
-#line 51 "ext/ragel/base_lexer.rl"
+		goto tr66;
+	goto tr65;
+tr65:
+#line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st38;
-st38:
+	goto st50;
+st50:
 	if ( ++p == pe )
-		goto _test_eof38;
-case 38:
-#line 913 "ext/c/lexer.c"
+		goto _test_eof50;
+case 50:
+#line 946 "ext/c/lexer.c"
 	if ( (*p) == 39 )
-		goto tr54;
-	goto tr52;
-tr56:
-#line 226 "ext/ragel/base_lexer.rl"
+		goto tr67;
+	goto tr65;
+tr69:
+#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 st39;
-tr57:
-#line 190 "ext/ragel/base_lexer.rl"
+	goto st51;
+tr70:
+#line 200 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback(id_on_string_body, data, encoding, ts, te);
 
@@ -933,40 +966,40 @@ tr57:
             lines = 0;
         }
     }}
-	goto st39;
-st39:
+	goto st51;
+st51:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof39;
-case 39:
+		goto _test_eof51;
+case 51:
 #line 1 "NONE"
 	{ts = p;}
-#line 946 "ext/c/lexer.c"
+#line 979 "ext/c/lexer.c"
 	if ( (*p) == 34 )
-		goto tr56;
-	goto tr55;
-tr55:
-#line 51 "ext/ragel/base_lexer.rl"
+		goto tr69;
+	goto tr68;
+tr68:
+#line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st40;
-st40:
+	goto st52;
+st52:
 	if ( ++p == pe )
-		goto _test_eof40;
-case 40:
-#line 960 "ext/c/lexer.c"
+		goto _test_eof52;
+case 52:
+#line 993 "ext/c/lexer.c"
 	if ( (*p) == 34 )
-		goto tr57;
-	goto tr55;
-tr59:
-	( state->cs) = 41;
-#line 263 "ext/ragel/base_lexer.rl"
-	{te = p+1;{ ( state->cs) = 43; }}
+		goto tr70;
+	goto tr68;
+tr72:
+	( state->cs) = 53;
+#line 281 "ext/ragel/base_lexer.rl"
+	{te = p+1;{ ( state->cs) = 55; }}
 	goto _again;
-tr60:
-#line 252 "ext/ragel/base_lexer.rl"
+tr73:
+#line 270 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_doctype_inline, data, encoding, ts, te);
 
@@ -977,67 +1010,79 @@ tr60:
                 lines = 0;
             }
         }}
-	goto st41;
-st41:
+	goto st53;
+st53:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof41;
-case 41:
+		goto _test_eof53;
+case 53:
 #line 1 "NONE"
 	{ts = p;}
-#line 990 "ext/c/lexer.c"
+#line 1023 "ext/c/lexer.c"
 	if ( (*p) == 93 )
-		goto tr59;
-	goto tr58;
-tr58:
-#line 51 "ext/ragel/base_lexer.rl"
+		goto tr72;
+	goto tr71;
+tr71:
+#line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st42;
-st42:
+	goto st54;
+st54:
 	if ( ++p == pe )
-		goto _test_eof42;
-case 42:
-#line 1004 "ext/c/lexer.c"
+		goto _test_eof54;
+case 54:
+#line 1037 "ext/c/lexer.c"
 	if ( (*p) == 93 )
-		goto tr60;
-	goto tr58;
-tr61:
-#line 282 "ext/ragel/base_lexer.rl"
+		goto tr73;
+	goto tr71;
+tr74:
+#line 309 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
-	goto st43;
-tr62:
-#line 207 "ext/ragel/base_lexer.rl"
+	goto st55;
+tr76:
+#line 60 "ext/ragel/base_lexer.rl"
+	{te = p+1;{
+        advance_line(1);
+    }}
+	goto st55;
+tr78:
+#line 217 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_string_dquote);
 
-        {( state->stack)[( state->top)++] = 43; goto st39;}
+        {( state->stack)[( state->top)++] = 55; goto st51;}
     }}
-	goto st43;
-tr63:
-#line 201 "ext/ragel/base_lexer.rl"
+	goto st55;
+tr79:
+#line 211 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_string_squote);
 
-        {( state->stack)[( state->top)++] = 43; goto st37;}
+        {( state->stack)[( state->top)++] = 55; goto st49;}
     }}
-	goto st43;
-tr65:
-	( state->cs) = 43;
-#line 288 "ext/ragel/base_lexer.rl"
+	goto st55;
+tr81:
+	( state->cs) = 55;
+#line 302 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_doctype_end);
-            ( state->cs) = 22;
+            ( state->cs) = 34;
         }}
 	goto _again;
-tr68:
-	( state->cs) = 43;
-#line 274 "ext/ragel/base_lexer.rl"
-	{te = p+1;{ ( state->cs) = 41; }}
+tr84:
+	( state->cs) = 55;
+#line 292 "ext/ragel/base_lexer.rl"
+	{te = p+1;{ ( state->cs) = 53; }}
 	goto _again;
-tr69:
+tr85:
+#line 60 "ext/ragel/base_lexer.rl"
+	{te = p;p--;{
+        advance_line(1);
+    }}
+	goto st55;
+tr86:
 #line 1 "NONE"
 	{	switch( ( state->act) ) {
 	case 13:
@@ -1045,297 +1090,306 @@ tr69:
             callback(id_on_doctype_type, data, encoding, ts, te);
         }
 	break;
-	case 18:
+	case 17:
 	{{p = ((te))-1;}
             callback(id_on_doctype_name, data, encoding, ts, te);
         }
 	break;
 	}
 	}
-	goto st43;
-tr70:
-#line 284 "ext/ragel/base_lexer.rl"
+	goto st55;
+tr87:
+#line 298 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_doctype_name, data, encoding, ts, te);
         }}
-	goto st43;
-st43:
+	goto st55;
+st55:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof43;
-case 43:
+		goto _test_eof55;
+case 55:
 #line 1 "NONE"
 	{ts = p;}
-#line 1071 "ext/c/lexer.c"
+#line 1116 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 9: goto tr61;
-		case 32: goto tr61;
-		case 34: goto tr62;
-		case 39: goto tr63;
-		case 45: goto tr64;
-		case 62: goto tr65;
-		case 80: goto st45;
-		case 83: goto st50;
-		case 91: goto tr68;
-		case 95: goto tr64;
+		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;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr64;
+			goto tr80;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr64;
+			goto tr80;
 	} else
-		goto tr64;
+		goto tr80;
 	goto st0;
 st0:
 ( state->cs) = 0;
 	goto _out;
-tr64:
+st56:
+	if ( ++p == pe )
+		goto _test_eof56;
+case 56:
+	if ( (*p) == 10 )
+		goto tr76;
+	goto tr85;
+tr80:
 #line 1 "NONE"
 	{te = p+1;}
-#line 284 "ext/ragel/base_lexer.rl"
-	{( state->act) = 18;}
-	goto st44;
-tr75:
+#line 298 "ext/ragel/base_lexer.rl"
+	{( state->act) = 17;}
+	goto st57;
+tr92:
 #line 1 "NONE"
 	{te = p+1;}
-#line 269 "ext/ragel/base_lexer.rl"
+#line 287 "ext/ragel/base_lexer.rl"
 	{( state->act) = 13;}
-	goto st44;
-st44:
+	goto st57;
+st57:
 	if ( ++p == pe )
-		goto _test_eof44;
-case 44:
-#line 1112 "ext/c/lexer.c"
+		goto _test_eof57;
+case 57:
+#line 1166 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 45: goto tr64;
-		case 95: goto tr64;
+		case 45: goto tr80;
+		case 95: goto tr80;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr64;
+			goto tr80;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr64;
+			goto tr80;
 	} else
-		goto tr64;
-	goto tr69;
-st45:
+		goto tr80;
+	goto tr86;
+st58:
 	if ( ++p == pe )
-		goto _test_eof45;
-case 45:
+		goto _test_eof58;
+case 58:
 	switch( (*p) ) {
-		case 45: goto tr64;
-		case 85: goto st46;
-		case 95: goto tr64;
+		case 45: goto tr80;
+		case 85: goto st59;
+		case 95: goto tr80;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr64;
+			goto tr80;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr64;
+			goto tr80;
 	} else
-		goto tr64;
-	goto tr70;
-st46:
+		goto tr80;
+	goto tr87;
+st59:
 	if ( ++p == pe )
-		goto _test_eof46;
-case 46:
+		goto _test_eof59;
+case 59:
 	switch( (*p) ) {
-		case 45: goto tr64;
-		case 66: goto st47;
-		case 95: goto tr64;
+		case 45: goto tr80;
+		case 66: goto st60;
+		case 95: goto tr80;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr64;
+			goto tr80;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr64;
+			goto tr80;
 	} else
-		goto tr64;
-	goto tr70;
-st47:
+		goto tr80;
+	goto tr87;
+st60:
 	if ( ++p == pe )
-		goto _test_eof47;
-case 47:
+		goto _test_eof60;
+case 60:
 	switch( (*p) ) {
-		case 45: goto tr64;
-		case 76: goto st48;
-		case 95: goto tr64;
+		case 45: goto tr80;
+		case 76: goto st61;
+		case 95: goto tr80;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr64;
+			goto tr80;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr64;
+			goto tr80;
 	} else
-		goto tr64;
-	goto tr70;
-st48:
+		goto tr80;
+	goto tr87;
+st61:
 	if ( ++p == pe )
-		goto _test_eof48;
-case 48:
+		goto _test_eof61;
+case 61:
 	switch( (*p) ) {
-		case 45: goto tr64;
-		case 73: goto st49;
-		case 95: goto tr64;
+		case 45: goto tr80;
+		case 73: goto st62;
+		case 95: goto tr80;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr64;
+			goto tr80;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr64;
+			goto tr80;
 	} else
-		goto tr64;
-	goto tr70;
-st49:
+		goto tr80;
+	goto tr87;
+st62:
 	if ( ++p == pe )
-		goto _test_eof49;
-case 49:
+		goto _test_eof62;
+case 62:
 	switch( (*p) ) {
-		case 45: goto tr64;
-		case 67: goto tr75;
-		case 95: goto tr64;
+		case 45: goto tr80;
+		case 67: goto tr92;
+		case 95: goto tr80;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr64;
+			goto tr80;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr64;
+			goto tr80;
 	} else
-		goto tr64;
-	goto tr70;
-st50:
+		goto tr80;
+	goto tr87;
+st63:
 	if ( ++p == pe )
-		goto _test_eof50;
-case 50:
+		goto _test_eof63;
+case 63:
 	switch( (*p) ) {
-		case 45: goto tr64;
-		case 89: goto st51;
-		case 95: goto tr64;
+		case 45: goto tr80;
+		case 89: goto st64;
+		case 95: goto tr80;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr64;
+			goto tr80;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr64;
+			goto tr80;
 	} else
-		goto tr64;
-	goto tr70;
-st51:
+		goto tr80;
+	goto tr87;
+st64:
 	if ( ++p == pe )
-		goto _test_eof51;
-case 51:
+		goto _test_eof64;
+case 64:
 	switch( (*p) ) {
-		case 45: goto tr64;
-		case 83: goto st52;
-		case 95: goto tr64;
+		case 45: goto tr80;
+		case 83: goto st65;
+		case 95: goto tr80;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr64;
+			goto tr80;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr64;
+			goto tr80;
 	} else
-		goto tr64;
-	goto tr70;
-st52:
+		goto tr80;
+	goto tr87;
+st65:
 	if ( ++p == pe )
-		goto _test_eof52;
-case 52:
+		goto _test_eof65;
+case 65:
 	switch( (*p) ) {
-		case 45: goto tr64;
-		case 84: goto st53;
-		case 95: goto tr64;
+		case 45: goto tr80;
+		case 84: goto st66;
+		case 95: goto tr80;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr64;
+			goto tr80;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr64;
+			goto tr80;
 	} else
-		goto tr64;
-	goto tr70;
-st53:
+		goto tr80;
+	goto tr87;
+st66:
 	if ( ++p == pe )
-		goto _test_eof53;
-case 53:
+		goto _test_eof66;
+case 66:
 	switch( (*p) ) {
-		case 45: goto tr64;
-		case 69: goto st54;
-		case 95: goto tr64;
+		case 45: goto tr80;
+		case 69: goto st67;
+		case 95: goto tr80;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr64;
+			goto tr80;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr64;
+			goto tr80;
 	} else
-		goto tr64;
-	goto tr70;
-st54:
+		goto tr80;
+	goto tr87;
+st67:
 	if ( ++p == pe )
-		goto _test_eof54;
-case 54:
+		goto _test_eof67;
+case 67:
 	switch( (*p) ) {
-		case 45: goto tr64;
-		case 77: goto tr75;
-		case 95: goto tr64;
+		case 45: goto tr80;
+		case 77: goto tr92;
+		case 95: goto tr80;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr64;
+			goto tr80;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr64;
+			goto tr80;
 	} else
-		goto tr64;
-	goto tr70;
-tr80:
-#line 51 "ext/ragel/base_lexer.rl"
+		goto tr80;
+	goto tr87;
+tr97:
+#line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-#line 336 "ext/ragel/base_lexer.rl"
+#line 354 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
-	goto st55;
-tr81:
-#line 207 "ext/ragel/base_lexer.rl"
+	goto st68;
+tr98:
+#line 217 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_string_dquote);
 
-        {( state->stack)[( state->top)++] = 55; goto st39;}
+        {( state->stack)[( state->top)++] = 68; goto st51;}
     }}
-#line 51 "ext/ragel/base_lexer.rl"
+#line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st55;
-tr82:
-#line 201 "ext/ragel/base_lexer.rl"
+	goto st68;
+tr99:
+#line 211 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_string_squote);
 
-        {( state->stack)[( state->top)++] = 55; goto st37;}
+        {( state->stack)[( state->top)++] = 68; goto st49;}
     }}
-#line 51 "ext/ragel/base_lexer.rl"
+#line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st55;
-tr85:
-#line 322 "ext/ragel/base_lexer.rl"
+	goto st68;
+tr102:
+#line 340 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             if ( lines > 0 )
             {
@@ -1346,14 +1400,14 @@ tr85:
 
             callback(id_on_attribute, data, encoding, ts, te);
         }}
-	goto st55;
-tr87:
-#line 336 "ext/ragel/base_lexer.rl"
+	goto st68;
+tr104:
+#line 354 "ext/ragel/base_lexer.rl"
 	{te = p;p--;}
-	goto st55;
-tr88:
-	( state->cs) = 55;
-#line 308 "ext/ragel/base_lexer.rl"
+	goto st68;
+tr105:
+	( state->cs) = 68;
+#line 326 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             if ( lines > 0 )
             {
@@ -1364,144 +1418,143 @@ tr88:
 
             callback_simple(id_on_xml_decl_end);
 
-            ( state->cs) = 22;
+            ( state->cs) = 34;
         }}
 	goto _again;
-st55:
+st68:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof55;
-case 55:
+		goto _test_eof68;
+case 68:
 #line 1 "NONE"
 	{ts = p;}
-#line 1379 "ext/c/lexer.c"
+#line 1433 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 34: goto tr81;
-		case 39: goto tr82;
-		case 45: goto tr83;
-		case 63: goto tr84;
-		case 95: goto tr83;
+		case 34: goto tr98;
+		case 39: goto tr99;
+		case 45: goto tr100;
+		case 63: goto tr101;
+		case 95: goto tr100;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto tr83;
+			goto tr100;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr83;
+			goto tr100;
 	} else
-		goto tr83;
-	goto tr80;
-tr83:
-#line 51 "ext/ragel/base_lexer.rl"
+		goto tr100;
+	goto tr97;
+tr100:
+#line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st56;
-st56:
+	goto st69;
+st69:
 	if ( ++p == pe )
-		goto _test_eof56;
-case 56:
-#line 1406 "ext/c/lexer.c"
+		goto _test_eof69;
+case 69:
+#line 1460 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 45: goto st56;
-		case 95: goto st56;
+		case 45: goto st69;
+		case 95: goto st69;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st56;
+			goto st69;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto st56;
+			goto st69;
 	} else
-		goto st56;
-	goto tr85;
-tr84:
-#line 51 "ext/ragel/base_lexer.rl"
+		goto st69;
+	goto tr102;
+tr101:
+#line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st57;
-st57:
+	goto st70;
+st70:
 	if ( ++p == pe )
-		goto _test_eof57;
-case 57:
-#line 1430 "ext/c/lexer.c"
+		goto _test_eof70;
+case 70:
+#line 1484 "ext/c/lexer.c"
 	if ( (*p) == 62 )
-		goto tr88;
-	goto tr87;
-tr90:
-	( state->cs) = 58;
-#line 367 "ext/ragel/base_lexer.rl"
+		goto tr105;
+	goto tr104;
+tr107:
+	( state->cs) = 71;
+#line 391 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_element_name, data, encoding, ts, te);
-            ( state->cs) = 63;
+            ( state->cs) = 76;
         }}
 	goto _again;
-tr91:
-#line 363 "ext/ragel/base_lexer.rl"
+tr108:
+#line 387 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback(id_on_element_ns, data, encoding, ts, te - 1);
         }}
-	goto st58;
-st58:
+	goto st71;
+st71:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof58;
-case 58:
+		goto _test_eof71;
+case 71:
 #line 1 "NONE"
 	{ts = p;}
-#line 1456 "ext/c/lexer.c"
+#line 1510 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 45: goto st59;
-		case 95: goto st59;
+		case 45: goto st72;
+		case 95: goto st72;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st59;
+			goto st72;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto st59;
+			goto st72;
 	} else
-		goto st59;
+		goto st72;
 	goto st0;
-st59:
+st72:
 	if ( ++p == pe )
-		goto _test_eof59;
-case 59:
+		goto _test_eof72;
+case 72:
 	switch( (*p) ) {
-		case 45: goto st59;
-		case 58: goto tr91;
-		case 95: goto st59;
+		case 45: goto st72;
+		case 58: goto tr108;
+		case 95: goto st72;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st59;
+			goto st72;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto st59;
+			goto st72;
 	} else
-		goto st59;
-	goto tr90;
-tr93:
-	( state->cs) = 60;
-#line 373 "ext/ragel/base_lexer.rl"
+		goto st72;
+	goto tr107;
+tr110:
+#line 64 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         p--;
-        ( state->cs) = 63;
+        {( state->cs) = ( state->stack)[--( state->top)];goto _again;}
     }}
-	goto _again;
-tr94:
-	( state->cs) = 60;
-#line 387 "ext/ragel/base_lexer.rl"
+	goto st73;
+tr111:
+	( state->cs) = 73;
+#line 406 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             p--;
-            ( state->cs) = 62;
+            ( state->cs) = 75;
         }}
 	goto _again;
-tr95:
-#line 394 "ext/ragel/base_lexer.rl"
+tr112:
+#line 413 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback_simple(id_on_string_squote);
 
@@ -1509,214 +1562,220 @@ tr95:
 
             callback_simple(id_on_string_squote);
         }}
-	goto st60;
-st60:
+	goto st73;
+st73:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof60;
-case 60:
+		goto _test_eof73;
+case 73:
 #line 1 "NONE"
 	{ts = p;}
-#line 1522 "ext/c/lexer.c"
+#line 1575 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 13: goto tr93;
-		case 32: goto tr93;
-		case 34: goto tr94;
-		case 39: goto tr94;
-		case 96: goto tr93;
+		case 13: goto tr110;
+		case 32: goto tr110;
+		case 34: goto tr111;
+		case 39: goto tr111;
+		case 96: goto tr110;
 	}
 	if ( (*p) > 10 ) {
 		if ( 60 <= (*p) && (*p) <= 62 )
-			goto tr93;
+			goto tr110;
 	} else if ( (*p) >= 9 )
-		goto tr93;
-	goto st61;
-st61:
+		goto tr110;
+	goto st74;
+st74:
 	if ( ++p == pe )
-		goto _test_eof61;
-case 61:
+		goto _test_eof74;
+case 74:
 	switch( (*p) ) {
-		case 13: goto tr95;
-		case 32: goto tr95;
-		case 34: goto tr95;
-		case 39: goto tr95;
-		case 96: goto tr95;
+		case 13: goto tr112;
+		case 32: goto tr112;
+		case 34: goto tr112;
+		case 39: goto tr112;
+		case 96: goto tr112;
 	}
 	if ( (*p) > 10 ) {
 		if ( 60 <= (*p) && (*p) <= 62 )
-			goto tr95;
+			goto tr112;
 	} else if ( (*p) >= 9 )
-		goto tr95;
-	goto st61;
-tr96:
-	( state->cs) = 62;
-#line 373 "ext/ragel/base_lexer.rl"
+		goto tr112;
+	goto st74;
+tr113:
+#line 64 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         p--;
-        ( state->cs) = 63;
+        {( state->cs) = ( state->stack)[--( state->top)];goto _again;}
     }}
-	goto _again;
-tr97:
-#line 207 "ext/ragel/base_lexer.rl"
+	goto st75;
+tr114:
+	( state->cs) = 75;
+#line 435 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
-        callback_simple(id_on_string_dquote);
+            callback_simple(id_on_string_dquote);
 
-        {( state->stack)[( state->top)++] = 62; goto st39;}
-    }}
-	goto st62;
-tr98:
-#line 201 "ext/ragel/base_lexer.rl"
+            ( state->cs) = 51;
+        }}
+	goto _again;
+tr115:
+	( state->cs) = 75;
+#line 429 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
-        callback_simple(id_on_string_squote);
+            callback_simple(id_on_string_squote);
 
-        {( state->stack)[( state->top)++] = 62; goto st37;}
-    }}
-	goto st62;
-st62:
+            ( state->cs) = 49;
+        }}
+	goto _again;
+st75:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof62;
-case 62:
+		goto _test_eof75;
+case 75:
 #line 1 "NONE"
 	{ts = p;}
-#line 1585 "ext/c/lexer.c"
+#line 1639 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 34: goto tr97;
-		case 39: goto tr98;
+		case 34: goto tr114;
+		case 39: goto tr115;
 	}
-	goto tr96;
-tr27:
-	( state->cs) = 63;
-#line 457 "ext/ragel/base_lexer.rl"
-	{te = p+1;{
-            callback_simple(id_on_element_end);
-            ( state->cs) = 22;
-        }}
-	goto _again;
-tr99:
-#line 415 "ext/ragel/base_lexer.rl"
+	goto tr113;
+tr116:
+#line 494 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
-	goto st63;
-tr100:
-#line 417 "ext/ragel/base_lexer.rl"
+	goto st76;
+tr117:
+#line 60 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
-            callback_simple(id_advance_line);
-        }}
-	goto st63;
-tr104:
-	( state->cs) = 63;
-#line 431 "ext/ragel/base_lexer.rl"
+        advance_line(1);
+    }}
+	goto st76;
+tr121:
+#line 459 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             if ( html_p )
             {
-                ( state->cs) = 60;
+                {( state->stack)[( state->top)++] = 76; goto st73;}
             }
             else
             {
-                ( state->cs) = 62;
+                {( state->stack)[( state->top)++] = 76; goto st75;}
             }
         }}
-	goto _again;
-tr105:
-	( state->cs) = 63;
-#line 443 "ext/ragel/base_lexer.rl"
+	goto st76;
+tr122:
+	( state->cs) = 76;
+#line 471 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_element_open_end);
 
-            if ( literal_html_element_p() )
+            if ( html_script_p() )
+            {
+                ( state->cs) = 84;
+            }
+            else if ( html_style_p() )
             {
-                ( state->cs) = 70;
+                ( state->cs) = 88;
             }
             else
             {
-                ( state->cs) = 22;
+                ( state->cs) = 34;
             }
         }}
 	goto _again;
-tr106:
-#line 417 "ext/ragel/base_lexer.rl"
+tr123:
+#line 60 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
-            callback_simple(id_advance_line);
-        }}
-	goto st63;
-tr107:
-#line 426 "ext/ragel/base_lexer.rl"
+        advance_line(1);
+    }}
+	goto st76;
+tr124:
+#line 454 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_attribute, data, encoding, ts, te);
         }}
-	goto st63;
-tr108:
-#line 422 "ext/ragel/base_lexer.rl"
+	goto st76;
+tr125:
+#line 450 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback(id_on_attribute_ns, data, encoding, ts, te - 1);
         }}
-	goto st63;
-st63:
+	goto st76;
+tr126:
+#line 494 "ext/ragel/base_lexer.rl"
+	{te = p;p--;}
+	goto st76;
+tr127:
+	( state->cs) = 76;
+#line 489 "ext/ragel/base_lexer.rl"
+	{te = p+1;{
+            callback_simple(id_on_element_end);
+            ( state->cs) = 34;
+        }}
+	goto _again;
+st76:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof63;
-case 63:
+		goto _test_eof76;
+case 76:
 #line 1 "NONE"
 	{ts = p;}
-#line 1665 "ext/c/lexer.c"
+#line 1726 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 9: goto tr99;
-		case 10: goto tr100;
-		case 13: goto st64;
-		case 32: goto tr99;
-		case 45: goto st65;
-		case 47: goto st21;
-		case 61: goto tr104;
-		case 62: goto tr105;
-		case 95: goto st65;
+		case 10: goto tr117;
+		case 13: goto st77;
+		case 45: goto st78;
+		case 47: goto st79;
+		case 61: goto tr121;
+		case 62: goto tr122;
+		case 95: goto st78;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st65;
+			goto st78;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto st65;
+			goto st78;
 	} else
-		goto st65;
-	goto st0;
-st64:
+		goto st78;
+	goto tr116;
+st77:
 	if ( ++p == pe )
-		goto _test_eof64;
-case 64:
+		goto _test_eof77;
+case 77:
 	if ( (*p) == 10 )
-		goto tr100;
-	goto tr106;
-st65:
+		goto tr117;
+	goto tr123;
+st78:
 	if ( ++p == pe )
-		goto _test_eof65;
-case 65:
+		goto _test_eof78;
+case 78:
 	switch( (*p) ) {
-		case 45: goto st65;
-		case 58: goto tr108;
-		case 95: goto st65;
+		case 45: goto st78;
+		case 58: goto tr125;
+		case 95: goto st78;
 	}
 	if ( (*p) < 65 ) {
 		if ( 48 <= (*p) && (*p) <= 57 )
-			goto st65;
+			goto st78;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto st65;
+			goto st78;
 	} else
-		goto st65;
-	goto tr107;
-st21:
+		goto st78;
+	goto tr124;
+st79:
 	if ( ++p == pe )
-		goto _test_eof21;
-case 21:
+		goto _test_eof79;
+case 79:
 	if ( (*p) == 62 )
-		goto tr27;
-	goto st0;
-tr111:
-	( state->cs) = 66;
-#line 486 "ext/ragel/base_lexer.rl"
+		goto tr127;
+	goto tr126;
+tr130:
+	( state->cs) = 80;
+#line 531 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_text, data, encoding, ts, te);
 
@@ -1727,12 +1786,12 @@ tr111:
                 lines = 0;
             }
 
-            ( state->cs) = 22;
+            ( state->cs) = 34;
         }}
 	goto _again;
-tr113:
-	( state->cs) = 66;
-#line 500 "ext/ragel/base_lexer.rl"
+tr132:
+	( state->cs) = 80;
+#line 545 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback(id_on_text, data, encoding, ts, mark);
 
@@ -1746,12 +1805,12 @@ tr113:
                 lines = 0;
             }
 
-            ( state->cs) = 22;
+            ( state->cs) = 34;
         }}
 	goto _again;
-tr114:
-	( state->cs) = 66;
-#line 486 "ext/ragel/base_lexer.rl"
+tr133:
+	( state->cs) = 80;
+#line 531 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback(id_on_text, data, encoding, ts, te);
 
@@ -1762,360 +1821,373 @@ tr114:
                 lines = 0;
             }
 
-            ( state->cs) = 22;
+            ( state->cs) = 34;
         }}
 	goto _again;
-st66:
+st80:
 #line 1 "NONE"
 	{ts = 0;}
 	if ( ++p == pe )
-		goto _test_eof66;
-case 66:
+		goto _test_eof80;
+case 80:
 #line 1 "NONE"
 	{ts = p;}
-#line 1777 "ext/c/lexer.c"
+#line 1836 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr110;
-	goto tr109;
-tr109:
-#line 51 "ext/ragel/base_lexer.rl"
+		goto tr129;
+	goto tr128;
+tr128:
+#line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st67;
-st67:
+	goto st81;
+st81:
 	if ( ++p == pe )
-		goto _test_eof67;
-case 67:
-#line 1791 "ext/c/lexer.c"
+		goto _test_eof81;
+case 81:
+#line 1850 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr112;
-	goto tr109;
-tr112:
-#line 51 "ext/ragel/base_lexer.rl"
+		goto tr131;
+	goto tr128;
+tr131:
+#line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-#line 500 "ext/ragel/base_lexer.rl"
+#line 545 "ext/ragel/base_lexer.rl"
 	{ mark = p; }
-	goto st68;
-st68:
+	goto st82;
+st82:
 	if ( ++p == pe )
-		goto _test_eof68;
-case 68:
-#line 1807 "ext/c/lexer.c"
+		goto _test_eof82;
+case 82:
+#line 1866 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 33: goto tr113;
-		case 45: goto tr113;
-		case 60: goto tr112;
-		case 63: goto tr113;
-		case 95: goto tr113;
+		case 33: goto tr132;
+		case 45: goto tr132;
+		case 60: goto tr131;
+		case 63: goto tr132;
+		case 95: goto tr132;
 	}
 	if ( (*p) < 65 ) {
 		if ( 47 <= (*p) && (*p) <= 57 )
-			goto tr113;
+			goto tr132;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr113;
+			goto tr132;
 	} else
-		goto tr113;
-	goto tr109;
-tr110:
-#line 51 "ext/ragel/base_lexer.rl"
+		goto tr132;
+	goto tr128;
+tr129:
+#line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-#line 500 "ext/ragel/base_lexer.rl"
+#line 545 "ext/ragel/base_lexer.rl"
 	{ mark = p; }
-	goto st69;
-st69:
+	goto st83;
+st83:
 	if ( ++p == pe )
-		goto _test_eof69;
-case 69:
-#line 1836 "ext/c/lexer.c"
+		goto _test_eof83;
+case 83:
+#line 1895 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 33: goto tr114;
-		case 45: goto tr114;
-		case 60: goto tr112;
-		case 63: goto tr114;
-		case 95: goto tr114;
+		case 33: goto tr133;
+		case 45: goto tr133;
+		case 60: goto tr131;
+		case 63: goto tr133;
+		case 95: goto tr133;
 	}
 	if ( (*p) < 65 ) {
 		if ( 47 <= (*p) && (*p) <= 57 )
-			goto tr114;
+			goto tr133;
 	} else if ( (*p) > 90 ) {
 		if ( 97 <= (*p) && (*p) <= 122 )
-			goto tr114;
+			goto tr133;
 	} else
-		goto tr114;
-	goto tr109;
-tr117:
-#line 1 "NONE"
-	{	switch( ( state->act) ) {
-	case 0:
-	{{goto st0;}}
-	break;
-	case 42:
-	{{p = ((te))-1;}
-            callback(id_on_text, data, encoding, ts, te);
+		goto tr133;
+	goto tr128;
+tr27:
+#line 519 "ext/ragel/base_lexer.rl"
+	{{p = ((te))-1;}{
+        callback(id_on_text, data, encoding, ts, te);
 
-            if ( lines > 0 )
-            {
-                advance_line(lines);
+        if ( lines > 0 )
+        {
+            advance_line(lines);
 
-                lines = 0;
-            }
+            lines = 0;
         }
-	break;
-	}
-	}
-	goto st70;
-tr118:
-#line 524 "ext/ragel/base_lexer.rl"
-	{te = p;p--;{
-            callback(id_on_text, data, encoding, ts, te);
-
-            if ( lines > 0 )
-            {
-                advance_line(lines);
-
-                lines = 0;
-            }
-        }}
-	goto st70;
-tr127:
-	( state->cs) = 70;
-#line 535 "ext/ragel/base_lexer.rl"
+    }}
+	goto st84;
+tr34:
+	( state->cs) = 84;
+#line 379 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
-            callback(id_on_text, data, encoding, ts, mark);
-
-            p    = mark - 1;
-            mark = 0;
+        callback_simple(id_on_element_end);
 
-            if ( lines > 0 )
-            {
-                advance_line(lines);
+        ( state->cs) = 34;
+    }}
+	goto _again;
+tr136:
+#line 519 "ext/ragel/base_lexer.rl"
+	{te = p;p--;{
+        callback(id_on_text, data, encoding, ts, te);
 
-                lines = 0;
-            }
+        if ( lines > 0 )
+        {
+            advance_line(lines);
 
-            ( state->cs) = 22;
-        }}
-	goto _again;
-st70:
+            lines = 0;
+        }
+    }}
+	goto st84;
+st84:
 #line 1 "NONE"
 	{ts = 0;}
-#line 1 "NONE"
-	{( state->act) = 0;}
 	if ( ++p == pe )
-		goto _test_eof70;
-case 70:
+		goto _test_eof84;
+case 84:
 #line 1 "NONE"
 	{ts = p;}
-#line 1916 "ext/c/lexer.c"
+#line 1955 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr116;
-	goto tr115;
-tr115:
-#line 1 "NONE"
-	{te = p+1;}
-#line 51 "ext/ragel/base_lexer.rl"
+		goto tr135;
+	goto tr134;
+tr134:
+#line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-#line 524 "ext/ragel/base_lexer.rl"
-	{( state->act) = 42;}
-	goto st71;
-st71:
+	goto st85;
+st85:
 	if ( ++p == pe )
-		goto _test_eof71;
-case 71:
-#line 1934 "ext/c/lexer.c"
+		goto _test_eof85;
+case 85:
+#line 1969 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr116;
-	goto tr115;
-tr116:
-#line 51 "ext/ragel/base_lexer.rl"
+		goto tr136;
+	goto tr134;
+tr135:
+#line 1 "NONE"
+	{te = p+1;}
+#line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-#line 535 "ext/ragel/base_lexer.rl"
-	{ mark = p; }
-	goto st72;
-st72:
+	goto st86;
+st86:
 	if ( ++p == pe )
-		goto _test_eof72;
-case 72:
-#line 1950 "ext/c/lexer.c"
+		goto _test_eof86;
+case 86:
+#line 1985 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 47: goto tr119;
-		case 60: goto tr116;
+		case 47: goto st21;
+		case 60: goto tr138;
 	}
-	goto tr115;
-tr119:
-#line 51 "ext/ragel/base_lexer.rl"
-	{
-        if ( (*p) == '\n' ) lines++;
-    }
-	goto st73;
-st73:
+	goto tr136;
+st21:
 	if ( ++p == pe )
-		goto _test_eof73;
-case 73:
-#line 1966 "ext/c/lexer.c"
-	switch( (*p) ) {
-		case 60: goto tr116;
-		case 115: goto tr120;
-	}
-	goto tr115;
-tr120:
-#line 51 "ext/ragel/base_lexer.rl"
-	{
-        if ( (*p) == '\n' ) lines++;
-    }
-	goto st74;
-st74:
+		goto _test_eof21;
+case 21:
+	if ( (*p) == 115 )
+		goto st22;
+	goto tr27;
+st22:
 	if ( ++p == pe )
-		goto _test_eof74;
-case 74:
-#line 1982 "ext/c/lexer.c"
-	switch( (*p) ) {
-		case 60: goto tr116;
-		case 99: goto tr121;
-		case 116: goto tr122;
-	}
-	goto tr115;
-tr121:
-#line 51 "ext/ragel/base_lexer.rl"
-	{
-        if ( (*p) == '\n' ) lines++;
-    }
-	goto st75;
-st75:
+		goto _test_eof22;
+case 22:
+	if ( (*p) == 99 )
+		goto st23;
+	goto tr27;
+st23:
 	if ( ++p == pe )
-		goto _test_eof75;
-case 75:
-#line 1999 "ext/c/lexer.c"
-	switch( (*p) ) {
-		case 60: goto tr116;
-		case 114: goto tr123;
-	}
-	goto tr115;
-tr123:
-#line 51 "ext/ragel/base_lexer.rl"
-	{
-        if ( (*p) == '\n' ) lines++;
-    }
-	goto st76;
-st76:
+		goto _test_eof23;
+case 23:
+	if ( (*p) == 114 )
+		goto st24;
+	goto tr27;
+st24:
 	if ( ++p == pe )
-		goto _test_eof76;
-case 76:
-#line 2015 "ext/c/lexer.c"
-	switch( (*p) ) {
-		case 60: goto tr116;
-		case 105: goto tr124;
-	}
-	goto tr115;
-tr124:
-#line 51 "ext/ragel/base_lexer.rl"
-	{
-        if ( (*p) == '\n' ) lines++;
-    }
-	goto st77;
-st77:
+		goto _test_eof24;
+case 24:
+	if ( (*p) == 105 )
+		goto st25;
+	goto tr27;
+st25:
 	if ( ++p == pe )
-		goto _test_eof77;
-case 77:
-#line 2031 "ext/c/lexer.c"
-	switch( (*p) ) {
-		case 60: goto tr116;
-		case 112: goto tr125;
-	}
-	goto tr115;
-tr125:
-#line 51 "ext/ragel/base_lexer.rl"
-	{
-        if ( (*p) == '\n' ) lines++;
-    }
-	goto st78;
-st78:
+		goto _test_eof25;
+case 25:
+	if ( (*p) == 112 )
+		goto st26;
+	goto tr27;
+st26:
 	if ( ++p == pe )
-		goto _test_eof78;
-case 78:
-#line 2047 "ext/c/lexer.c"
-	switch( (*p) ) {
-		case 60: goto tr116;
-		case 116: goto tr126;
-	}
-	goto tr115;
-tr126:
-#line 51 "ext/ragel/base_lexer.rl"
+		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:
+#line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st79;
-st79:
+	goto st87;
+st87:
 	if ( ++p == pe )
-		goto _test_eof79;
-case 79:
-#line 2063 "ext/c/lexer.c"
-	switch( (*p) ) {
-		case 60: goto tr116;
-		case 62: goto tr127;
-	}
-	goto tr115;
-tr122:
-#line 51 "ext/ragel/base_lexer.rl"
+		goto _test_eof87;
+case 87:
+#line 2050 "ext/c/lexer.c"
+	if ( (*p) == 60 )
+		goto tr138;
+	goto tr136;
+tr35:
+#line 519 "ext/ragel/base_lexer.rl"
+	{{p = ((te))-1;}{
+        callback(id_on_text, data, encoding, ts, te);
+
+        if ( lines > 0 )
+        {
+            advance_line(lines);
+
+            lines = 0;
+        }
+    }}
+	goto st88;
+tr41:
+	( state->cs) = 88;
+#line 379 "ext/ragel/base_lexer.rl"
+	{te = p+1;{
+        callback_simple(id_on_element_end);
+
+        ( state->cs) = 34;
+    }}
+	goto _again;
+tr141:
+#line 519 "ext/ragel/base_lexer.rl"
+	{te = p;p--;{
+        callback(id_on_text, data, encoding, ts, te);
+
+        if ( lines > 0 )
+        {
+            advance_line(lines);
+
+            lines = 0;
+        }
+    }}
+	goto st88;
+st88:
+#line 1 "NONE"
+	{ts = 0;}
+	if ( ++p == pe )
+		goto _test_eof88;
+case 88:
+#line 1 "NONE"
+	{ts = p;}
+#line 2097 "ext/c/lexer.c"
+	if ( (*p) == 60 )
+		goto tr140;
+	goto tr139;
+tr139:
+#line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st80;
-st80:
+	goto st89;
+st89:
 	if ( ++p == pe )
-		goto _test_eof80;
-case 80:
-#line 2079 "ext/c/lexer.c"
-	switch( (*p) ) {
-		case 60: goto tr116;
-		case 121: goto tr128;
-	}
-	goto tr115;
-tr128:
-#line 51 "ext/ragel/base_lexer.rl"
+		goto _test_eof89;
+case 89:
+#line 2111 "ext/c/lexer.c"
+	if ( (*p) == 60 )
+		goto tr141;
+	goto tr139;
+tr140:
+#line 1 "NONE"
+	{te = p+1;}
+#line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st81;
-st81:
+	goto st90;
+st90:
 	if ( ++p == pe )
-		goto _test_eof81;
-case 81:
-#line 2095 "ext/c/lexer.c"
+		goto _test_eof90;
+case 90:
+#line 2127 "ext/c/lexer.c"
 	switch( (*p) ) {
-		case 60: goto tr116;
-		case 108: goto tr129;
+		case 47: goto st28;
+		case 60: goto tr143;
 	}
-	goto tr115;
-tr129:
-#line 51 "ext/ragel/base_lexer.rl"
+	goto tr141;
+st28:
+	if ( ++p == pe )
+		goto _test_eof28;
+case 28:
+	if ( (*p) == 115 )
+		goto st29;
+	goto tr35;
+st29:
+	if ( ++p == pe )
+		goto _test_eof29;
+case 29:
+	if ( (*p) == 116 )
+		goto st30;
+	goto tr35;
+st30:
+	if ( ++p == pe )
+		goto _test_eof30;
+case 30:
+	if ( (*p) == 121 )
+		goto st31;
+	goto tr35;
+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:
+#line 56 "ext/ragel/base_lexer.rl"
 	{
         if ( (*p) == '\n' ) lines++;
     }
-	goto st82;
-st82:
+	goto st91;
+st91:
 	if ( ++p == pe )
-		goto _test_eof82;
-case 82:
-#line 2111 "ext/c/lexer.c"
-	switch( (*p) ) {
-		case 60: goto tr116;
-		case 101: goto tr126;
-	}
-	goto tr115;
+		goto _test_eof91;
+case 91:
+#line 2185 "ext/c/lexer.c"
+	if ( (*p) == 60 )
+		goto tr143;
+	goto tr141;
 	}
-	_test_eof22: ( state->cs) = 22; goto _test_eof; 
-	_test_eof23: ( state->cs) = 23; goto _test_eof; 
+	_test_eof34: ( state->cs) = 34; goto _test_eof; 
+	_test_eof35: ( state->cs) = 35; 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; 
@@ -2125,7 +2197,7 @@ case 82:
 	_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_eof24: ( state->cs) = 24; goto _test_eof; 
+	_test_eof36: ( state->cs) = 36; 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; 
@@ -2135,29 +2207,17 @@ case 82:
 	_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_eof25: ( state->cs) = 25; 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_eof19: ( state->cs) = 19; 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_eof20: ( state->cs) = 20; 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_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_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_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; 
@@ -2178,7 +2238,6 @@ case 82:
 	_test_eof63: ( state->cs) = 63; goto _test_eof; 
 	_test_eof64: ( state->cs) = 64; goto _test_eof; 
 	_test_eof65: ( state->cs) = 65; goto _test_eof; 
-	_test_eof21: ( state->cs) = 21; goto _test_eof; 
 	_test_eof66: ( state->cs) = 66; goto _test_eof; 
 	_test_eof67: ( state->cs) = 67; goto _test_eof; 
 	_test_eof68: ( state->cs) = 68; goto _test_eof; 
@@ -2196,12 +2255,34 @@ case 82:
 	_test_eof80: ( state->cs) = 80; goto _test_eof; 
 	_test_eof81: ( state->cs) = 81; goto _test_eof; 
 	_test_eof82: ( state->cs) = 82; goto _test_eof; 
+	_test_eof83: ( state->cs) = 83; goto _test_eof; 
+	_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_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_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 23: goto tr31;
+	case 35: goto tr44;
 	case 1: goto tr0;
 	case 2: goto tr0;
 	case 3: goto tr0;
@@ -2211,7 +2292,7 @@ case 82:
 	case 7: goto tr0;
 	case 8: goto tr0;
 	case 9: goto tr0;
-	case 24: goto tr35;
+	case 36: goto tr48;
 	case 10: goto tr0;
 	case 11: goto tr0;
 	case 12: goto tr0;
@@ -2221,59 +2302,68 @@ case 82:
 	case 16: goto tr0;
 	case 17: goto tr0;
 	case 18: goto tr0;
-	case 25: goto tr36;
-	case 26: goto tr37;
-	case 27: goto tr37;
-	case 29: goto tr42;
-	case 30: goto tr42;
+	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 32: goto tr46;
-	case 33: goto tr46;
+	case 44: goto tr59;
+	case 45: goto tr59;
 	case 20: goto tr25;
-	case 35: goto tr50;
-	case 36: goto tr50;
-	case 38: goto tr54;
-	case 40: goto tr57;
-	case 42: goto tr60;
-	case 44: goto tr69;
-	case 45: goto tr70;
-	case 46: goto tr70;
-	case 47: goto tr70;
-	case 48: goto tr70;
-	case 49: goto tr70;
-	case 50: goto tr70;
-	case 51: goto tr70;
+	case 47: goto tr63;
+	case 48: goto tr63;
+	case 50: goto tr67;
 	case 52: goto tr70;
-	case 53: goto tr70;
-	case 54: goto tr70;
+	case 54: goto tr73;
 	case 56: goto tr85;
-	case 57: goto tr87;
-	case 59: goto tr90;
-	case 61: goto tr95;
-	case 64: goto tr106;
-	case 65: goto tr107;
-	case 67: goto tr111;
-	case 68: goto tr111;
-	case 69: goto tr111;
-	case 71: goto tr117;
-	case 72: goto tr118;
-	case 73: goto tr118;
-	case 74: goto tr118;
-	case 75: goto tr118;
-	case 76: goto tr118;
-	case 77: goto tr118;
-	case 78: goto tr118;
-	case 79: goto tr118;
-	case 80: goto tr118;
-	case 81: goto tr118;
-	case 82: goto tr118;
+	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;
 	}
 	}
 
 	_out: {}
 	}
 
-#line 129 "ext/c/lexer.rl"
+#line 133 "ext/c/lexer.rl"
 
     state->lines = lines;
 
@@ -2317,7 +2407,7 @@ VALUE oga_xml_lexer_allocate(VALUE klass)
 }
 
 
-#line 178 "ext/c/lexer.rl"
+#line 182 "ext/c/lexer.rl"
 
 
 void Init_liboga_xml_lexer()
@@ -2326,9 +2416,10 @@ void Init_liboga_xml_lexer()
     VALUE mXML   = rb_const_get(mOga, rb_intern("XML"));
     VALUE cLexer = rb_define_class_under(mXML, "Lexer", rb_cObject);
 
-    id_advance_line           = rb_intern("advance_line");
-    id_literal_html_element_p = rb_intern("literal_html_element?");
-    id_html                   = rb_intern("html");
+    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");
 
     rb_define_method(cLexer, "advance_native", oga_xml_lexer_advance, 1);
     rb_define_method(cLexer, "reset_native", oga_xml_lexer_reset, 0);