oga 1.0.2-java → 1.0.3-java

data/ext/c/lexer.rl

@@ -28,7 +28,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;
 
 %%machine c_lexer;
 
@@ -81,7 +81,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);
@@ -189,7 +189,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);

data/ext/java/org/liboga/xml/Lexer.java

@@ -48,16 +48,17 @@ private static byte[] init__java_lexer_actions_0()
 	   12,    1,   13,    1,   14,    1,   15,    1,   16,    1,   17,    1,
 	   18,    1,   21,    1,   22,    1,   23,    1,   24,    1,   25,    1,
 	   26,    1,   27,    1,   28,    1,   29,    1,   30,    1,   34,    1,
-	   35,    1,   36,    1,   37,    1,   38,    1,   41,    1,   42,    1,
-	   43,    1,   44,    1,   45,    1,   46,    1,   47,    1,   48,    1,
-	   49,    1,   50,    1,   51,    1,   52,    1,   53,    1,   54,    1,
-	   55,    1,   56,    1,   57,    1,   58,    1,   59,    1,   60,    1,
-	   61,    1,   62,    1,   63,    1,   64,    1,   65,    1,   68,    1,
-	   69,    1,   70,    1,   71,    1,   72,    1,   73,    1,   74,    1,
-	   75,    1,   76,    1,   77,    2,    0,    1,    2,    0,   33,    2,
-	    0,   40,    2,    4,    0,    2,    4,   19,    2,    4,   20,    2,
-	    4,   66,    2,    4,   67,    2,   31,    0,    2,   32,    0,    2,
-	   39,    0
+	   35,    1,   36,    1,   37,    1,   38,    1,   41,    1,   43,    1,
+	   44,    1,   47,    1,   48,    1,   49,    1,   50,    1,   51,    1,
+	   52,    1,   53,    1,   54,    1,   55,    1,   56,    1,   57,    1,
+	   58,    1,   59,    1,   60,    1,   61,    1,   62,    1,   63,    1,
+	   64,    1,   65,    1,   66,    1,   67,    1,   68,    1,   69,    1,
+	   70,    1,   73,    1,   74,    1,   75,    1,   76,    1,   77,    1,
+	   78,    1,   79,    1,   80,    1,   81,    1,   82,    2,    0,    1,
+	    2,    0,   33,    2,    0,   40,    2,    0,   42,    2,    4,    0,
+	    2,    4,   19,    2,    4,   20,    2,    4,   45,    2,    4,   46,
+	    2,    4,   71,    2,    4,   72,    2,   31,    0,    2,   32,    0,
+	    2,   39,    0
 	};
 }
 
@@ -73,8 +74,8 @@ private static short[] init__java_lexer_key_offsets_0()
 	   75,   84,   93,   94,   95,   96,   97,   98,   99,  100,  101,  102,
 	  103,  104,  105,  106,  107,  108,  126,  127,  135,  144,  153,  162,
 	  171,  180,  189,  198,  207,  216,  225,  236,  244,  245,  253,  262,
-	  271,  280,  289,  298,  300,  313,  314,  323,  324,  325,  326,  337,
-	  348,  349,  350,  352,  353,  354,  355,  357
+	  271,  280,  284,  285,  291,  298,  300,  313,  314,  323,  324,  325,
+	  326,  337,  348,  349,  350,  352,  353,  354,  355,  357
 	};
 }
 
@@ -107,8 +108,8 @@ private static char[] init__java_lexer_trans_keys_0()
 	   65,   90,   97,  122,   62,   45,   95,   48,   57,   65,   90,   97,
 	  122,   45,   58,   95,   48,   57,   65,   90,   97,  122,   45,   62,
 	   95,   48,   57,   65,   90,   97,  122,   45,   58,   95,   48,   57,
-	   65,   90,   97,  122,   13,   32,   34,   39,   96,    9,   10,   60,
-	   62,   13,   32,   34,   39,   96,    9,   10,   60,   62,   34,   39,
+	   65,   90,   97,  122,   13,   32,    9,   10,   10,   13,   32,   34,
+	   39,    9,   10,   13,   32,   96,    9,   10,   60,   62,   34,   39,
 	   10,   13,   45,   47,   61,   62,   95,   48,   57,   65,   90,   97,
 	  122,   10,   45,   58,   95,   48,   57,   65,   90,   97,  122,   62,
 	   60,   60,   33,   45,   60,   63,   95,   47,   57,   65,   90,   97,
@@ -129,8 +130,8 @@ private static byte[] init__java_lexer_single_lengths_0()
 	    3,    3,    1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
 	    1,    1,    1,    1,    1,   12,    1,    2,    3,    3,    3,    3,
 	    3,    3,    3,    3,    3,    3,    5,    2,    1,    2,    3,    3,
-	    3,    5,    5,    2,    7,    1,    3,    1,    1,    1,    5,    5,
-	    1,    1,    2,    1,    1,    1,    2,    1
+	    3,    2,    1,    4,    3,    2,    7,    1,    3,    1,    1,    1,
+	    5,    5,    1,    1,    2,    1,    1,    1,    2,    1
 	};
 }
 
@@ -146,8 +147,8 @@ private static byte[] init__java_lexer_range_lengths_0()
 	    3,    3,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
 	    0,    0,    0,    0,    0,    3,    0,    3,    3,    3,    3,    3,
 	    3,    3,    3,    3,    3,    3,    3,    3,    0,    3,    3,    3,
-	    3,    2,    2,    0,    3,    0,    3,    0,    0,    0,    3,    3,
-	    0,    0,    0,    0,    0,    0,    0,    0
+	    3,    1,    0,    1,    2,    0,    3,    0,    3,    0,    0,    0,
+	    3,    3,    0,    0,    0,    0,    0,    0,    0,    0
 	};
 }
 
@@ -163,8 +164,8 @@ private static short[] init__java_lexer_index_offsets_0()
 	   99,  106,  113,  115,  117,  119,  121,  123,  125,  127,  129,  131,
 	  133,  135,  137,  139,  141,  143,  159,  161,  167,  174,  181,  188,
 	  195,  202,  209,  216,  223,  230,  237,  246,  252,  254,  260,  267,
-	  274,  281,  289,  297,  300,  311,  313,  320,  322,  324,  326,  335,
-	  344,  346,  348,  351,  353,  355,  357,  360
+	  274,  281,  285,  287,  293,  299,  302,  313,  315,  322,  324,  326,
+	  328,  337,  346,  348,  350,  353,  355,  357,  359,  362
 	};
 }
 
@@ -178,9 +179,9 @@ private static byte[] init__java_lexer_trans_targs_0()
 	   32,    6,    6,   32,    7,    7,   32,    8,    8,   32,    9,    9,
 	   32,   34,   34,   34,   32,   11,   32,   12,   32,   13,   32,   14,
 	   32,   15,   32,   32,   32,   35,   35,   36,   35,   35,   35,   32,
-	   38,   38,   41,   41,   20,   84,   21,   84,   22,   84,   23,   84,
-	   24,   84,   25,   84,   84,   84,   27,   88,   28,   88,   29,   88,
-	   30,   88,   31,   88,   88,   88,   33,   32,    1,   32,   32,   16,
+	   38,   38,   41,   41,   20,   86,   21,   86,   22,   86,   23,   86,
+	   24,   86,   25,   86,   86,   86,   27,   90,   28,   90,   29,   90,
+	   30,   90,   31,   90,   90,   90,   33,   32,    1,   32,   32,   16,
 	   32,   32,   32,   32,   32,   34,   34,   34,   32,   35,   35,   35,
 	   35,   35,   32,   35,   35,   37,   35,   35,   35,   32,   35,   35,
 	   35,   35,   35,   35,   32,   40,   39,   38,   39,   17,   38,   43,
@@ -197,20 +198,20 @@ private static byte[] init__java_lexer_trans_targs_0()
 	   68,   67,   67,   67,   67,   66,   67,   67,   67,   67,   67,   66,
 	   66,   66,   70,   70,   70,   70,   70,    0,   70,   69,   70,   70,
 	   70,   70,   69,   72,   71,   72,   72,   72,   72,   71,   72,   71,
-	   72,   72,   72,   72,   71,   73,   73,   73,   73,   73,   73,   73,
-	   74,   73,   73,   73,   73,   73,   73,   73,   74,   75,   75,   75,
-	   76,   77,   78,   79,   76,   76,   78,   78,   78,   78,   76,   76,
-	   76,   78,   76,   78,   78,   78,   78,   76,   76,   76,   83,   81,
-	   82,   81,   80,   80,   82,   80,   80,   80,   80,   80,   81,   80,
-	   80,   82,   80,   80,   80,   80,   80,   81,   86,   85,   84,   85,
-	   19,   87,   84,   87,   84,   90,   89,   88,   89,   26,   91,   88,
-	   91,   88,   32,   32,   32,   32,   32,   32,   32,   32,   32,   32,
-	   32,   32,   32,   32,   32,   32,   38,   41,   84,   84,   84,   84,
-	   84,   84,   84,   88,   88,   88,   88,   88,   88,   32,   32,   32,
-	   32,   32,   38,   38,   41,   41,   44,   44,   47,   49,   51,   53,
-	   53,   53,   53,   53,   53,   53,   53,   53,   53,   53,   53,   66,
-	   66,   69,   71,   73,   76,   76,   76,   80,   80,   80,   84,   84,
-	   84,   88,   88,   88,    0
+	   72,   72,   72,   72,   71,   74,   73,   73,   73,   73,   73,   75,
+	   75,   75,   75,   75,   76,   75,   75,   75,   75,   75,   76,   77,
+	   77,   77,   78,   79,   80,   81,   78,   78,   80,   80,   80,   80,
+	   78,   78,   78,   80,   78,   80,   80,   80,   80,   78,   78,   78,
+	   85,   83,   84,   83,   82,   82,   84,   82,   82,   82,   82,   82,
+	   83,   82,   82,   84,   82,   82,   82,   82,   82,   83,   88,   87,
+	   86,   87,   19,   89,   86,   89,   86,   92,   91,   90,   91,   26,
+	   93,   90,   93,   90,   32,   32,   32,   32,   32,   32,   32,   32,
+	   32,   32,   32,   32,   32,   32,   32,   32,   38,   41,   86,   86,
+	   86,   86,   86,   86,   86,   90,   90,   90,   90,   90,   90,   32,
+	   32,   32,   32,   32,   38,   38,   41,   41,   44,   44,   47,   49,
+	   51,   53,   53,   53,   53,   53,   53,   53,   53,   53,   53,   53,
+	   53,   66,   66,   69,   71,   73,   75,   78,   78,   78,   82,   82,
+	   82,   86,   86,   86,   90,   90,   90,    0
 	};
 }
 
@@ -220,43 +221,43 @@ private static final byte _java_lexer_trans_targs[] = init__java_lexer_trans_tar
 private static short[] init__java_lexer_trans_actions_0()
 {
 	return new short [] {
-	    0,    0,    0,    0,  133,  117,  133,    0,    0,  133,    0,    0,
-	  133,    0,    0,  133,    0,    0,  133,    0,    0,  133,    0,    0,
-	  133,    1,    1,    1,  133,    0,  133,    0,  133,    0,  133,    0,
-	  133,    0,  133,  119,  133,  158,  158,    0,  158,  158,  158,  133,
-	    9,   13,   15,   19,    0,  109,    0,  109,    0,  109,    0,  109,
-	    0,  109,    0,  109,  105,  109,    0,  115,    0,  115,    0,  115,
-	    0,  115,    0,  115,  111,  115,    7,  125,    0,  121,  123,    0,
-	  121,  121,  121,  121,  131,    1,    1,    1,  127,  158,  158,  158,
-	  158,  158,  135,  158,  158,    0,  158,  158,  158,  129,  158,  158,
-	  155,  158,  158,  158,  129,  146,    1,   11,    1,    0,   11,  146,
+	    0,    0,    0,    0,  137,  121,  137,    0,    0,  137,    0,    0,
+	  137,    0,    0,  137,    0,    0,  137,    0,    0,  137,    0,    0,
+	  137,    1,    1,    1,  137,    0,  137,    0,  137,    0,  137,    0,
+	  137,    0,  137,  123,  137,  171,  171,    0,  171,  171,  171,  137,
+	    9,   13,   15,   19,    0,  113,    0,  113,    0,  113,    0,  113,
+	    0,  113,    0,  113,  109,  113,    0,  119,    0,  119,    0,  119,
+	    0,  119,    0,  119,  115,  119,    7,  129,    0,  125,  127,    0,
+	  125,  125,  125,  125,  135,    1,    1,    1,  131,  171,  171,  171,
+	  171,  171,  139,  171,  171,    0,  171,  171,  171,  133,  171,  171,
+	  168,  171,  171,  171,  133,  153,    1,   11,    1,    0,   11,  153,
 	    1,   17,    1,    0,   17,    1,    1,   23,    1,   21,   23,   25,
 	    1,   27,    1,   29,    1,   31,    1,   33,    1,   35,    1,   47,
-	   45,    0,   47,   41,   39,  152,   43,    0,    0,   37,  152,  152,
-	  152,  152,    0,   45,   51,  152,  152,  152,  152,  152,   53,  152,
-	    0,  152,  152,  152,  152,   49,  152,    0,  152,  152,  152,  152,
-	   49,  152,    0,  152,  152,  152,  152,   49,  152,    0,  152,  152,
-	  152,  152,   49,  152,  149,  152,  152,  152,  152,   49,  152,    0,
-	  152,  152,  152,  152,   49,  152,    0,  152,  152,  152,  152,   49,
-	  152,    0,  152,  152,  152,  152,   49,  152,    0,  152,  152,  152,
-	  152,   49,  152,  149,  152,  152,  152,  152,   49,  164,  161,    1,
-	    1,    1,    1,    1,    1,  140,    0,    0,    0,    0,    0,   57,
+	   45,    0,   47,   41,   39,  159,   43,    0,    0,   37,  159,  159,
+	  159,  159,    0,   45,   51,  159,  159,  159,  159,  159,   53,  159,
+	    0,  159,  159,  159,  159,   49,  159,    0,  159,  159,  159,  159,
+	   49,  159,    0,  159,  159,  159,  159,   49,  159,    0,  159,  159,
+	  159,  159,   49,  159,  156,  159,  159,  159,  159,   49,  159,    0,
+	  159,  159,  159,  159,   49,  159,    0,  159,  159,  159,  159,   49,
+	  159,    0,  159,  159,  159,  159,   49,  159,    0,  159,  159,  159,
+	  159,   49,  159,  156,  159,  159,  159,  159,   49,  177,  174,    1,
+	    1,    1,    1,    1,    1,  144,    0,    0,    0,    0,    0,   57,
 	   55,   59,    0,    0,    0,    0,    0,    0,    0,   61,    0,    0,
-	    0,    0,   63,    1,  167,    1,    1,    1,    1,  143,    0,   65,
-	    0,    0,    0,    0,   67,   71,   71,   69,   69,   71,   71,   71,
-	    0,   73,   73,   73,   73,   73,   73,   73,    0,   77,   75,   79,
-	   81,    0,    0,    0,   85,   87,    0,    0,    0,    0,   91,   81,
-	   93,    0,   83,    0,    0,    0,    0,   95,   89,   97,  137,    1,
-	  137,    1,  101,  101,  137,  101,  101,  101,  101,  101,    1,   99,
-	   99,  137,   99,   99,   99,   99,   99,    1,  146,    1,  107,    1,
-	    0,    1,  107,    1,  107,  146,    1,  113,    1,    0,    1,  113,
-	    1,  113,  133,  133,  133,  133,  133,  133,  133,  133,  133,  133,
-	  133,  133,  133,  133,  133,  133,   13,   19,  109,  109,  109,  109,
-	  109,  109,  109,  115,  115,  115,  115,  115,  115,  131,  127,  135,
-	  129,  129,   11,   11,   17,   17,   23,   23,   27,   31,   35,   51,
-	   53,   49,   49,   49,   49,   49,   49,   49,   49,   49,   49,   57,
-	   59,   63,   67,   73,   93,   95,   97,  103,  103,  103,  107,  107,
-	  107,  113,  113,  113,    0
+	    0,    0,   63,    1,  180,    1,    1,    1,    1,  147,    0,   65,
+	    0,    0,    0,    0,   67,    1,  150,  150,   69,  150,   71,   75,
+	   75,   73,   73,   75,  165,   77,   77,   77,   77,   77,  162,   81,
+	   79,   83,   85,    0,    0,    0,   89,   91,    0,    0,    0,    0,
+	   95,   85,   97,    0,   87,    0,    0,    0,    0,   99,   93,  101,
+	  141,    1,  141,    1,  105,  105,  141,  105,  105,  105,  105,  105,
+	    1,  103,  103,  141,  103,  103,  103,  103,  103,    1,  153,    1,
+	  111,    1,    0,    1,  111,    1,  111,  153,    1,  117,    1,    0,
+	    1,  117,    1,  117,  137,  137,  137,  137,  137,  137,  137,  137,
+	  137,  137,  137,  137,  137,  137,  137,  137,   13,   19,  113,  113,
+	  113,  113,  113,  113,  113,  119,  119,  119,  119,  119,  119,  135,
+	  131,  139,  133,  133,   11,   11,   17,   17,   23,   23,   27,   31,
+	   35,   51,   53,   49,   49,   49,   49,   49,   49,   49,   49,   49,
+	   49,   57,   59,   63,   67,   71,   77,   97,   99,  101,  107,  107,
+	  107,  111,  111,  111,  117,  117,  117,    0
 	};
 }
 
@@ -272,8 +273,8 @@ private static short[] init__java_lexer_to_state_actions_0()
 	    0,    0,    3,    0,    0,    3,    0,    0,    3,    0,    0,    3,
 	    0,    3,    0,    3,    0,    3,    0,    0,    0,    0,    0,    0,
 	    0,    0,    0,    0,    0,    0,    3,    0,    0,    3,    0,    3,
-	    0,    3,    0,    3,    3,    0,    0,    0,    3,    0,    0,    0,
-	    3,    0,    0,    0,    3,    0,    0,    0
+	    0,    3,    0,    3,    0,    3,    3,    0,    0,    0,    3,    0,
+	    0,    0,    3,    0,    0,    0,    3,    0,    0,    0
 	};
 }
 
@@ -289,8 +290,8 @@ private static short[] init__java_lexer_from_state_actions_0()
 	    0,    0,    5,    0,    0,    5,    0,    0,    5,    0,    0,    5,
 	    0,    5,    0,    5,    0,    5,    0,    0,    0,    0,    0,    0,
 	    0,    0,    0,    0,    0,    0,    5,    0,    0,    5,    0,    5,
-	    0,    5,    0,    5,    5,    0,    0,    0,    5,    0,    0,    0,
-	    5,    0,    0,    0,    5,    0,    0,    0
+	    0,    5,    0,    5,    0,    5,    5,    0,    0,    0,    5,    0,
+	    0,    0,    5,    0,    0,    0,    5,    0,    0,    0
 	};
 }
 
@@ -300,14 +301,14 @@ private static final short _java_lexer_from_state_actions[] = init__java_lexer_f
 private static short[] init__java_lexer_eof_trans_0()
 {
 	return new short [] {
-	    0,  378,  378,  378,  378,  378,  378,  378,  378,  378,  378,  378,
-	  378,  378,  378,  378,  378,  379,  380,  387,  387,  387,  387,  387,
-	  387,  387,  393,  393,  393,  393,  393,  393,    0,  394,  395,  396,
-	  398,  398,    0,  400,  400,    0,  402,  402,    0,  404,  404,    0,
-	  405,    0,  406,    0,  407,    0,  408,  409,  419,  419,  419,  419,
-	  419,  419,  419,  419,  419,  419,    0,  420,  421,    0,  422,    0,
-	  423,    0,  424,    0,    0,  425,  426,  427,    0,  430,  430,  430,
-	    0,  433,  433,  433,    0,  436,  436,  436
+	    0,  380,  380,  380,  380,  380,  380,  380,  380,  380,  380,  380,
+	  380,  380,  380,  380,  380,  381,  382,  389,  389,  389,  389,  389,
+	  389,  389,  395,  395,  395,  395,  395,  395,    0,  396,  397,  398,
+	  400,  400,    0,  402,  402,    0,  404,  404,    0,  406,  406,    0,
+	  407,    0,  408,    0,  409,    0,  410,  411,  421,  421,  421,  421,
+	  421,  421,  421,  421,  421,  421,    0,  422,  423,    0,  424,    0,
+	  425,    0,  426,    0,  427,    0,    0,  428,  429,  430,    0,  433,
+	  433,  433,    0,  436,  436,  436,    0,  439,  439,  439
 	};
 }
 
@@ -328,12 +329,13 @@ static final int java_lexer_en_doctype = 53;
 static final int java_lexer_en_xml_decl = 66;
 static final int java_lexer_en_element_name = 69;
 static final int java_lexer_en_element_close = 71;
-static final int java_lexer_en_html_attribute_value = 73;
-static final int java_lexer_en_xml_attribute_value = 75;
-static final int java_lexer_en_element_head = 76;
-static final int java_lexer_en_text = 80;
-static final int java_lexer_en_html_script = 84;
-static final int java_lexer_en_html_style = 88;
+static final int java_lexer_en_attribute_pre = 73;
+static final int java_lexer_en_html_attribute_value = 75;
+static final int java_lexer_en_xml_attribute_value = 77;
+static final int java_lexer_en_element_head = 78;
+static final int java_lexer_en_text = 82;
+static final int java_lexer_en_html_script = 86;
+static final int java_lexer_en_html_style = 90;
 static final int java_lexer_en_main = 32;
 
 
@@ -391,7 +393,7 @@ static final int java_lexer_en_main = 32;
     @JRubyMethod
     public IRubyObject advance_native(ThreadContext context, RubyString rb_str)
     {
-        Boolean html_p = this.callMethod(context, "html").isTrue();
+        Boolean html_p = this.callMethod(context, "html?").isTrue();
 
         Encoding encoding = rb_str.getEncoding();
 
@@ -435,7 +437,7 @@ static final int java_lexer_en_main = 32;
         String id_on_xml_decl_start   = "on_xml_decl_start";
 
         
-// line 439 "ext/java/org/liboga/xml/Lexer.java"
+// line 441 "ext/java/org/liboga/xml/Lexer.java"
 	{
 	int _klen;
 	int _trans = 0;
@@ -464,7 +466,7 @@ case 1:
 // line 1 "NONE"
 	{ts = p;}
 	break;
-// line 468 "ext/java/org/liboga/xml/Lexer.java"
+// line 470 "ext/java/org/liboga/xml/Lexer.java"
 		}
 	}
 
@@ -534,7 +536,7 @@ case 3:
     }
 	break;
 	case 1:
-// line 570 "ext/ragel/base_lexer.rl"
+// line 589 "ext/ragel/base_lexer.rl"
 	{ mark = p; }
 	break;
 	case 4:
@@ -824,7 +826,7 @@ case 3:
 // line 394 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_element_name, data, encoding, ts, te);
-            ( this.cs) = 76;
+            ( this.cs) = 78;
         }}
 	break;
 	case 38:
@@ -855,89 +857,131 @@ case 3:
     }}
 	break;
 	case 42:
-// line 431 "ext/ragel/base_lexer.rl"
+// line 432 "ext/ragel/base_lexer.rl"
+	{te = p+1;}
+	break;
+	case 43:
+// line 434 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             p--;
-            ( this.cs) = 75;
+
+            if ( lines > 0 )
+            {
+                advance_line(lines);
+
+                lines = 0;
+            }
+
+            if ( html_p )
+            {
+                ( this.cs) = 75;
+            }
+            else
+            {
+                ( this.cs) = 77;
+            }
         }}
 	break;
-	case 43:
+	case 44:
+// line 432 "ext/ragel/base_lexer.rl"
+	{te = p;p--;}
+	break;
+	case 45:
+// line 464 "ext/ragel/base_lexer.rl"
+	{( this.act) = 35;}
+	break;
+	case 46:
+// line 64 "ext/ragel/base_lexer.rl"
+	{( this.act) = 36;}
+	break;
+	case 47:
+// line 457 "ext/ragel/base_lexer.rl"
+	{te = p+1;{
+            p--;
+            ( this.cs) = 77;
+        }}
+	break;
+	case 48:
 // line 64 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         p--;
         {( this.cs) = ( this.stack)[--( this.top)];_goto_targ = 2; if (true) continue _goto;}
     }}
 	break;
-	case 44:
-// line 438 "ext/ragel/base_lexer.rl"
-	{te = p;p--;{
+	case 49:
+// line 1 "NONE"
+	{	switch( ( this.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 45:
-// line 454 "ext/ragel/base_lexer.rl"
+	case 36:
+	{{p = ((te))-1;}
+        p--;
+        {( this.cs) = ( this.stack)[--( this.top)];_goto_targ = 2; if (true) continue _goto;}
+    }
+	break;
+	}
+	}
+	break;
+	case 50:
+// line 480 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_string_squote);
 
             ( this.cs) = 47;
         }}
 	break;
-	case 46:
-// line 460 "ext/ragel/base_lexer.rl"
+	case 51:
+// line 486 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_string_dquote);
 
             ( this.cs) = 49;
         }}
 	break;
-	case 47:
+	case 52:
 // line 64 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         p--;
         {( this.cs) = ( this.stack)[--( this.top)];_goto_targ = 2; if (true) continue _goto;}
     }}
 	break;
-	case 48:
+	case 53:
 // line 60 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         advance_line(1);
     }}
 	break;
-	case 49:
-// line 475 "ext/ragel/base_lexer.rl"
+	case 54:
+// line 501 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback(id_on_attribute_ns, data, encoding, ts, te - 1);
         }}
 	break;
-	case 50:
-// line 484 "ext/ragel/base_lexer.rl"
+	case 55:
+// line 510 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
-            if ( html_p )
-            {
-                {( this.stack)[( this.top)++] = ( this.cs); ( this.cs) = 73; _goto_targ = 2; if (true) continue _goto;}
-            }
-            else
-            {
-                {( this.stack)[( this.top)++] = ( this.cs); ( this.cs) = 75; _goto_targ = 2; if (true) continue _goto;}
-            }
+            {( this.stack)[( this.top)++] = ( this.cs); ( this.cs) = 73; _goto_targ = 2; if (true) continue _goto;}
         }}
 	break;
-	case 51:
-// line 496 "ext/ragel/base_lexer.rl"
+	case 56:
+// line 515 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_element_open_end);
 
             if ( html_script_p() )
             {
-                ( this.cs) = 84;
+                ( this.cs) = 86;
             }
             else if ( html_style_p() )
             {
-                ( this.cs) = 88;
+                ( this.cs) = 90;
             }
             else
             {
@@ -945,35 +989,35 @@ case 3:
             }
         }}
 	break;
-	case 52:
-// line 514 "ext/ragel/base_lexer.rl"
+	case 57:
+// line 533 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_element_end);
             ( this.cs) = 32;
         }}
 	break;
-	case 53:
-// line 519 "ext/ragel/base_lexer.rl"
+	case 58:
+// line 538 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
 	break;
-	case 54:
+	case 59:
 // line 60 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         advance_line(1);
     }}
 	break;
-	case 55:
-// line 479 "ext/ragel/base_lexer.rl"
+	case 60:
+// line 505 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_attribute, data, encoding, ts, te);
         }}
 	break;
-	case 56:
-// line 519 "ext/ragel/base_lexer.rl"
+	case 61:
+// line 538 "ext/ragel/base_lexer.rl"
 	{te = p;p--;}
 	break;
-	case 57:
-// line 556 "ext/ragel/base_lexer.rl"
+	case 62:
+// line 575 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback(id_on_text, data, encoding, ts, te);
 
@@ -987,8 +1031,8 @@ case 3:
             ( this.cs) = 32;
         }}
 	break;
-	case 58:
-// line 570 "ext/ragel/base_lexer.rl"
+	case 63:
+// line 589 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback(id_on_text, data, encoding, ts, mark);
 
@@ -1005,8 +1049,8 @@ case 3:
             ( this.cs) = 32;
         }}
 	break;
-	case 59:
-// line 556 "ext/ragel/base_lexer.rl"
+	case 64:
+// line 575 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_text, data, encoding, ts, te);
 
@@ -1020,7 +1064,7 @@ case 3:
             ( this.cs) = 32;
         }}
 	break;
-	case 60:
+	case 65:
 // line 379 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_element_end);
@@ -1028,8 +1072,8 @@ case 3:
         ( this.cs) = 32;
     }}
 	break;
-	case 61:
-// line 544 "ext/ragel/base_lexer.rl"
+	case 66:
+// line 563 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback(id_on_text, data, encoding, ts, te);
 
@@ -1041,8 +1085,8 @@ case 3:
         }
     }}
 	break;
-	case 62:
-// line 544 "ext/ragel/base_lexer.rl"
+	case 67:
+// line 563 "ext/ragel/base_lexer.rl"
 	{{p = ((te))-1;}{
         callback(id_on_text, data, encoding, ts, te);
 
@@ -1054,7 +1098,7 @@ case 3:
         }
     }}
 	break;
-	case 63:
+	case 68:
 // line 379 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_element_end);
@@ -1062,8 +1106,8 @@ case 3:
         ( this.cs) = 32;
     }}
 	break;
-	case 64:
-// line 544 "ext/ragel/base_lexer.rl"
+	case 69:
+// line 563 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback(id_on_text, data, encoding, ts, te);
 
@@ -1075,8 +1119,8 @@ case 3:
         }
     }}
 	break;
-	case 65:
-// line 544 "ext/ragel/base_lexer.rl"
+	case 70:
+// line 563 "ext/ragel/base_lexer.rl"
 	{{p = ((te))-1;}{
         callback(id_on_text, data, encoding, ts, te);
 
@@ -1088,15 +1132,15 @@ case 3:
         }
     }}
 	break;
-	case 66:
+	case 71:
 // line 319 "ext/ragel/base_lexer.rl"
-	{( this.act) = 52;}
+	{( this.act) = 54;}
 	break;
-	case 67:
+	case 72:
 // line 165 "ext/ragel/base_lexer.rl"
-	{( this.act) = 55;}
+	{( this.act) = 57;}
 	break;
-	case 68:
+	case 73:
 // line 84 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_comment_start);
@@ -1104,7 +1148,7 @@ case 3:
         ( this.cs) = 38;
     }}
 	break;
-	case 69:
+	case 74:
 // line 123 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_cdata_start);
@@ -1112,27 +1156,27 @@ case 3:
         ( this.cs) = 41;
     }}
 	break;
-	case 70:
+	case 75:
 // line 366 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         p--;
         ( this.cs) = 69;
     }}
 	break;
-	case 71:
+	case 76:
 // line 371 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         ( this.cs) = 71;
     }}
 	break;
-	case 72:
-// line 530 "ext/ragel/base_lexer.rl"
+	case 77:
+// line 549 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         p--;
-        ( this.cs) = 80;
+        ( this.cs) = 82;
     }}
 	break;
-	case 73:
+	case 78:
 // line 255 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback_simple(id_on_doctype_start);
@@ -1147,7 +1191,7 @@ case 3:
         ( this.cs) = 53;
     }}
 	break;
-	case 74:
+	case 79:
 // line 165 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback_simple(id_on_proc_ins_start);
@@ -1156,30 +1200,30 @@ case 3:
         ( this.cs) = 44;
     }}
 	break;
-	case 75:
-// line 530 "ext/ragel/base_lexer.rl"
+	case 80:
+// line 549 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         p--;
-        ( this.cs) = 80;
+        ( this.cs) = 82;
     }}
 	break;
-	case 76:
-// line 530 "ext/ragel/base_lexer.rl"
+	case 81:
+// line 549 "ext/ragel/base_lexer.rl"
 	{{p = ((te))-1;}{
         p--;
-        ( this.cs) = 80;
+        ( this.cs) = 82;
     }}
 	break;
-	case 77:
+	case 82:
 // line 1 "NONE"
 	{	switch( ( this.act) ) {
-	case 52:
+	case 54:
 	{{p = ((te))-1;}
         callback_simple(id_on_xml_decl_start);
         ( this.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);
@@ -1190,7 +1234,7 @@ case 3:
 	}
 	}
 	break;
-// line 1194 "ext/java/org/liboga/xml/Lexer.java"
+// line 1238 "ext/java/org/liboga/xml/Lexer.java"
 			}
 		}
 	}
@@ -1204,7 +1248,7 @@ case 2:
 // line 1 "NONE"
 	{ts = -1;}
 	break;
-// line 1208 "ext/java/org/liboga/xml/Lexer.java"
+// line 1252 "ext/java/org/liboga/xml/Lexer.java"
 		}
 	}