oga 1.3.1-java → 2.0.0-java

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

@@ -53,11 +53,13 @@ private static byte[] init__java_lexer_actions_0()
 	   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,   71,    1,   72,    1,   73,    1,   74,    1,   75,    1,
-	   76,    1,   77,    1,   78,    1,   79,    1,   80,    2,    0,    1,
-	    2,    0,   33,    2,    0,   40,    2,    0,   42,    2,    4,    0,
-	    2,    4,   19,    2,    4,   20,    2,    4,   69,    2,    4,   70,
-	    2,   31,    0,    2,   32,    0,    2,   39,    0
+	   68,    1,   69,    1,   70,    1,   71,    1,   72,    1,   73,    1,
+	   74,    1,   75,    1,   76,    1,   79,    1,   80,    1,   81,    1,
+	   82,    1,   83,    1,   84,    1,   85,    1,   86,    1,   87,    1,
+	   88,    2,    0,    1,    2,    0,   33,    2,    0,   40,    2,    0,
+	   42,    2,    4,    0,    2,    4,   19,    2,    4,   20,    2,    4,
+	   77,    2,    4,   78,    2,   31,    0,    2,   32,    0,    2,   39,
+	    0
 	};
 }
 
@@ -73,8 +75,9 @@ private static short[] init__java_lexer_key_offsets_0()
 	   80,   91,  102,  103,  104,  105,  106,  107,  108,  109,  110,  111,
 	  112,  113,  114,  115,  116,  117,  137,  138,  148,  159,  170,  181,
 	  192,  203,  214,  225,  236,  247,  258,  271,  281,  282,  292,  303,
-	  314,  325,  331,  332,  337,  342,  344,  358,  359,  370,  371,  372,
-	  373,  386,  399,  400,  401,  403,  404,  405,  406,  408
+	  314,  325,  331,  332,  337,  342,  344,  358,  359,  370,  371,  385,
+	  386,  396,  397,  398,  399,  412,  425,  426,  427,  429,  430,  431,
+	  432,  434
 	};
 }
 
@@ -114,11 +117,13 @@ private static char[] init__java_lexer_trans_keys_0()
 	  127,   13,   32,   34,   39,    9,   10,   10,   13,   32,   62,    9,
 	   10,   13,   32,   62,    9,   10,   34,   39,   10,   13,   47,   61,
 	   62,   96,    0,   44,   58,   64,   91,   94,  123,  127,   10,   47,
-	   58,   96,    0,   44,   59,   64,   91,   94,  123,  127,   62,   60,
-	   60,   60,   64,   96,    0,   32,   34,   44,   58,   62,   91,   94,
-	  123,  127,   60,   64,   96,    0,   32,   34,   44,   58,   62,   91,
-	   94,  123,  127,   60,   60,   47,   60,   60,   60,   60,   47,   60,
-	   60,    0
+	   58,   96,    0,   44,   59,   64,   91,   94,  123,  127,   62,   10,
+	   13,   47,   61,   62,   96,    0,   44,   59,   64,   91,   94,  123,
+	  127,   10,   47,   96,    0,   44,   59,   64,   91,   94,  123,  127,
+	   62,   60,   60,   60,   64,   96,    0,   32,   34,   44,   58,   62,
+	   91,   94,  123,  127,   60,   64,   96,    0,   32,   34,   44,   58,
+	   62,   91,   94,  123,  127,   60,   60,   47,   60,   60,   60,   60,
+	   47,   60,   60,    0
 	};
 }
 
@@ -134,8 +139,9 @@ 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,    4,    1,    3,    3,    2,    6,    1,    3,    1,    1,    1,
-	    3,    3,    1,    1,    2,    1,    1,    1,    2,    1
+	    3,    4,    1,    3,    3,    2,    6,    1,    3,    1,    6,    1,
+	    2,    1,    1,    1,    3,    3,    1,    1,    2,    1,    1,    1,
+	    2,    1
 	};
 }
 
@@ -151,8 +157,9 @@ private static byte[] init__java_lexer_range_lengths_0()
 	    4,    4,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
 	    0,    0,    0,    0,    0,    4,    0,    4,    4,    4,    4,    4,
 	    4,    4,    4,    4,    4,    4,    4,    4,    0,    4,    4,    4,
-	    4,    1,    0,    1,    1,    0,    4,    0,    4,    0,    0,    0,
-	    5,    5,    0,    0,    0,    0,    0,    0,    0,    0
+	    4,    1,    0,    1,    1,    0,    4,    0,    4,    0,    4,    0,
+	    4,    0,    0,    0,    5,    5,    0,    0,    0,    0,    0,    0,
+	    0,    0
 	};
 }
 
@@ -168,8 +175,9 @@ private static short[] init__java_lexer_index_offsets_0()
 	  101,  109,  117,  119,  121,  123,  125,  127,  129,  131,  133,  135,
 	  137,  139,  141,  143,  145,  147,  164,  166,  173,  181,  189,  197,
 	  205,  213,  221,  229,  237,  245,  253,  263,  270,  272,  279,  287,
-	  295,  303,  309,  311,  316,  321,  324,  335,  337,  345,  347,  349,
-	  351,  360,  369,  371,  373,  376,  378,  380,  382,  385
+	  295,  303,  309,  311,  316,  321,  324,  335,  337,  345,  347,  358,
+	  360,  367,  369,  371,  373,  382,  391,  393,  395,  398,  400,  402,
+	  404,  407
 	};
 }
 
@@ -183,9 +191,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,   32,   32,   36,   32,   32,   32,   32,
-	   35,   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,   16,
+	   35,   38,   38,   41,   41,   20,   90,   21,   90,   22,   90,   23,
+	   90,   24,   90,   25,   90,   90,   90,   27,   94,   28,   94,   29,
+	   94,   30,   94,   31,   94,   94,   94,   33,   32,    1,   32,   16,
 	   32,   32,   32,   32,   32,   32,   34,   34,   34,   32,   32,   32,
 	   32,   32,   32,   32,   35,   32,   32,   37,   32,   32,   32,   32,
 	   35,   32,   32,   35,   32,   32,   32,   32,   35,   40,   39,   38,
@@ -207,17 +215,19 @@ private static byte[] init__java_lexer_trans_targs_0()
 	   71,   71,   72,   74,   73,   73,   73,   73,   73,   73,   73,   75,
 	   75,   75,   75,   76,   75,   75,   75,   75,   76,   77,   77,   77,
 	   78,   79,   81,   78,   78,   78,   78,   78,   78,   78,   80,   78,
-	   78,   78,   78,   78,   78,   78,   78,   78,   80,   78,   78,   85,
-	   83,   84,   83,   84,   83,   83,   83,   83,   83,   83,   83,   82,
-	   84,   83,   83,   83,   83,   83,   83,   83,   82,   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
+	   78,   78,   78,   78,   78,   78,   78,   78,   80,   78,   78,   82,
+	   83,   85,   82,   82,   82,   82,   82,   82,   82,   84,   82,   82,
+	   82,   82,   82,   82,   82,   82,   84,   82,   82,   89,   87,   88,
+	   87,   88,   87,   87,   87,   87,   87,   87,   87,   86,   88,   87,
+	   87,   87,   87,   87,   87,   87,   86,   92,   91,   90,   91,   19,
+	   93,   90,   93,   90,   96,   95,   94,   95,   26,   97,   94,   97,
+	   94,   32,   32,   32,   32,   32,   32,   32,   32,   32,   32,   32,
+	   32,   32,   32,   32,   32,   38,   41,   90,   90,   90,   90,   90,
+	   90,   90,   94,   94,   94,   94,   94,   94,   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,   94,   94,   94,    0
 	};
 }
 
@@ -227,45 +237,47 @@ 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,  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,  137,  137,    0,  137,  137,  137,  137,
-	  165,    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,  127,    0,
-	  135,  135,  135,  135,  135,  125,    1,    1,    1,  131,  139,  139,
-	  139,  139,  139,  139,  165,  133,  133,    0,  133,  133,  133,  133,
-	  165,  133,  133,  162,  133,  133,  133,  133,  165,  153,    1,   11,
-	    1,    0,   11,  153,    1,   17,    1,    0,   17,    1,    1,   23,
+	    0,    0,    0,    0,  153,  137,  153,    0,    0,  153,    0,    0,
+	  153,    0,    0,  153,    0,    0,  153,    0,    0,  153,    0,    0,
+	  153,    1,    1,    1,  153,    0,  153,    0,  153,    0,  153,    0,
+	  153,    0,  153,  139,  153,  153,  153,    0,  153,  153,  153,  153,
+	  181,    9,   13,   15,   19,    0,  129,    0,  129,    0,  129,    0,
+	  129,    0,  129,    0,  129,  125,  129,    0,  135,    0,  135,    0,
+	  135,    0,  135,    0,  135,  131,  135,    7,  145,    0,  143,    0,
+	  151,  151,  151,  151,  151,  141,    1,    1,    1,  147,  155,  155,
+	  155,  155,  155,  155,  181,  149,  149,    0,  149,  149,  149,  149,
+	  181,  149,  149,  178,  149,  149,  149,  149,  181,  169,    1,   11,
+	    1,    0,   11,  169,    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,    0,   43,    0,
-	    0,   37,    0,    0,    0,    0,    0,  159,   45,   51,   53,   53,
-	   53,   53,   53,   53,  159,   49,    0,   49,   49,   49,   49,   49,
-	  159,   49,    0,   49,   49,   49,   49,   49,  159,   49,    0,   49,
-	   49,   49,   49,   49,  159,   49,    0,   49,   49,   49,   49,   49,
-	  159,   49,  156,   49,   49,   49,   49,   49,  159,   49,    0,   49,
-	   49,   49,   49,   49,  159,   49,    0,   49,   49,   49,   49,   49,
-	  159,   49,    0,   49,   49,   49,   49,   49,  159,   49,    0,   49,
-	   49,   49,   49,   49,  159,   49,  156,   49,   49,   49,   49,   49,
-	  159,  171,  168,  144,    1,  144,  144,  144,  144,  144,    1,   57,
+	    0,   37,    0,    0,    0,    0,    0,  175,   45,   51,   53,   53,
+	   53,   53,   53,   53,  175,   49,    0,   49,   49,   49,   49,   49,
+	  175,   49,    0,   49,   49,   49,   49,   49,  175,   49,    0,   49,
+	   49,   49,   49,   49,  175,   49,    0,   49,   49,   49,   49,   49,
+	  175,   49,  172,   49,   49,   49,   49,   49,  175,   49,    0,   49,
+	   49,   49,   49,   49,  175,   49,    0,   49,   49,   49,   49,   49,
+	  175,   49,    0,   49,   49,   49,   49,   49,  175,   49,    0,   49,
+	   49,   49,   49,   49,  175,   49,  172,   49,   49,   49,   49,   49,
+	  175,  187,  184,  160,    1,  160,  160,  160,  160,  160,    1,   57,
 	   57,   57,   57,   57,   57,    0,   55,   59,    0,    0,    0,    0,
-	    0,    0,    0,   63,   61,   63,   63,   63,   63,   63,    0,  147,
-	  174,  147,  147,  147,  147,  147,    1,   67,   65,   67,   67,   67,
-	   67,   67,    0,    1,  150,   69,   69,  150,   71,  150,   73,   75,
+	    0,    0,    0,   63,   61,   63,   63,   63,   63,   63,    0,  163,
+	  190,  163,  163,  163,  163,  163,    1,   67,   65,   67,   67,   67,
+	   67,   67,    0,    1,  166,   69,   69,  166,   71,  166,   73,   75,
 	   75,   75,   75,    0,   77,   77,   77,   77,    0,   81,   79,   83,
 	   85,    0,    0,   89,   91,   95,   95,   95,   95,   95,    0,   85,
-	   97,   99,   87,   99,   99,   99,   99,   99,    0,   93,  101,  141,
-	    1,  141,    1,  141,    1,    1,    1,    1,    1,    1,    1,  105,
-	  141,    1,    1,    1,    1,    1,    1,    1,  103,  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,   73,   77,   97,   99,  101,  107,  107,  107,
-	  111,  111,  111,  117,  117,  117,    0
+	   97,   99,   87,   99,   99,   99,   99,   99,    0,   93,  101,  103,
+	    0,    0,  105,  107,  111,  111,  111,  111,  111,    0,  103,  113,
+	  115,  115,  115,  115,  115,  115,    0,  109,  117,  157,    1,  157,
+	    1,  157,    1,    1,    1,    1,    1,    1,    1,  121,  157,    1,
+	    1,    1,    1,    1,    1,    1,  119,  169,    1,  127,    1,    0,
+	    1,  127,    1,  127,  169,    1,  133,    1,    0,    1,  133,    1,
+	  133,  153,  153,  153,  153,  153,  153,  153,  153,  153,  153,  153,
+	  153,  153,  153,  153,  153,   13,   19,  129,  129,  129,  129,  129,
+	  129,  129,  135,  135,  135,  135,  135,  135,  151,  147,  155,  149,
+	  149,   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,   77,   97,   99,  101,  113,  115,  117,  123,  123,
+	  123,  127,  127,  127,  133,  133,  133,    0
 	};
 }
 
@@ -282,7 +294,8 @@ private static short[] init__java_lexer_to_state_actions_0()
 	    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,    0,    3,    3,    0,    0,    0,    3,    0,
-	    0,    0,    3,    0,    0,    0,    3,    0,    0,    0
+	    0,    0,    3,    0,    0,    0,    3,    0,    0,    0,    3,    0,
+	    0,    0
 	};
 }
 
@@ -299,7 +312,8 @@ private static short[] init__java_lexer_from_state_actions_0()
 	    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,    0,    5,    5,    0,    0,    0,    5,    0,
-	    0,    0,    5,    0,    0,    0,    5,    0,    0,    0
+	    0,    0,    5,    0,    0,    0,    5,    0,    0,    0,    5,    0,
+	    0,    0
 	};
 }
 
@@ -309,14 +323,15 @@ 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,  403,  403,  403,  403,  403,  403,  403,  403,  403,  403,  403,
-	  403,  403,  403,  403,  403,  404,  405,  412,  412,  412,  412,  412,
-	  412,  412,  418,  418,  418,  418,  418,  418,    0,  419,  420,  421,
-	  423,  423,    0,  425,  425,    0,  427,  427,    0,  429,  429,    0,
-	  430,    0,  431,    0,  432,    0,  433,  434,  444,  444,  444,  444,
-	  444,  444,  444,  444,  444,  444,    0,  445,  446,    0,  447,    0,
-	  448,    0,  449,    0,  450,    0,    0,  451,  452,  453,    0,  456,
-	  456,  456,    0,  459,  459,  459,    0,  462,  462,  462
+	    0,  425,  425,  425,  425,  425,  425,  425,  425,  425,  425,  425,
+	  425,  425,  425,  425,  425,  426,  427,  434,  434,  434,  434,  434,
+	  434,  434,  440,  440,  440,  440,  440,  440,    0,  441,  442,  443,
+	  445,  445,    0,  447,  447,    0,  449,  449,    0,  451,  451,    0,
+	  452,    0,  453,    0,  454,    0,  455,  456,  466,  466,  466,  466,
+	  466,  466,  466,  466,  466,  466,    0,  467,  468,    0,  469,    0,
+	  470,    0,  471,    0,  472,    0,    0,  473,  474,  475,    0,  476,
+	  477,  478,    0,  481,  481,  481,    0,  484,  484,  484,    0,  487,
+	  487,  487
 	};
 }
 
@@ -341,9 +356,10 @@ static final int java_lexer_en_attribute_pre = 73;
 static final int java_lexer_en_unquoted_attribute_value = 75;
 static final int java_lexer_en_quoted_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_html_element_head = 82;
+static final int java_lexer_en_text = 86;
+static final int java_lexer_en_html_script = 90;
+static final int java_lexer_en_html_style = 94;
 static final int java_lexer_en_main = 32;
 
 
@@ -445,7 +461,7 @@ static final int java_lexer_en_main = 32;
         String id_on_xml_decl_start   = "on_xml_decl_start";
 
         
-// line 449 "ext/java/org/liboga/xml/Lexer.java"
+// line 465 "ext/java/org/liboga/xml/Lexer.java"
 	{
 	int _klen;
 	int _trans = 0;
@@ -474,7 +490,7 @@ case 1:
 // line 1 "NONE"
 	{ts = p;}
 	break;
-// line 478 "ext/java/org/liboga/xml/Lexer.java"
+// line 494 "ext/java/org/liboga/xml/Lexer.java"
 		}
 	}
 
@@ -538,13 +554,13 @@ case 3:
 			switch ( _java_lexer_actions[_acts++] )
 			{
 	case 0:
-// line 58 "ext/ragel/base_lexer.rl"
+// line 61 "ext/ragel/base_lexer.rl"
 	{
         if ( data[p] == '\n' ) lines++;
     }
 	break;
 	case 1:
-// line 605 "ext/ragel/base_lexer.rl"
+// line 658 "ext/ragel/base_lexer.rl"
 	{ mark = p; }
 	break;
 	case 4:
@@ -552,7 +568,7 @@ case 3:
 	{te = p+1;}
 	break;
 	case 5:
-// line 104 "ext/ragel/base_lexer.rl"
+// line 107 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_comment_end);
 
@@ -560,7 +576,7 @@ case 3:
         }}
 	break;
 	case 6:
-// line 93 "ext/ragel/base_lexer.rl"
+// line 96 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_comment_body, data, encoding, ts, te);
 
@@ -573,7 +589,7 @@ case 3:
         }}
 	break;
 	case 7:
-// line 93 "ext/ragel/base_lexer.rl"
+// line 96 "ext/ragel/base_lexer.rl"
 	{{p = ((te))-1;}{
             callback(id_on_comment_body, data, encoding, ts, te);
 
@@ -586,7 +602,7 @@ case 3:
         }}
 	break;
 	case 8:
-// line 143 "ext/ragel/base_lexer.rl"
+// line 146 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_cdata_end);
 
@@ -594,7 +610,7 @@ case 3:
         }}
 	break;
 	case 9:
-// line 132 "ext/ragel/base_lexer.rl"
+// line 135 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_cdata_body, data, encoding, ts, te);
 
@@ -607,7 +623,7 @@ case 3:
         }}
 	break;
 	case 10:
-// line 132 "ext/ragel/base_lexer.rl"
+// line 135 "ext/ragel/base_lexer.rl"
 	{{p = ((te))-1;}{
             callback(id_on_cdata_body, data, encoding, ts, te);
 
@@ -620,7 +636,7 @@ case 3:
         }}
 	break;
 	case 11:
-// line 186 "ext/ragel/base_lexer.rl"
+// line 189 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_proc_ins_end);
 
@@ -628,7 +644,7 @@ case 3:
         }}
 	break;
 	case 12:
-// line 175 "ext/ragel/base_lexer.rl"
+// line 178 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_proc_ins_body, data, encoding, ts, te);
 
@@ -641,7 +657,7 @@ case 3:
         }}
 	break;
 	case 13:
-// line 228 "ext/ragel/base_lexer.rl"
+// line 231 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_string_squote);
 
@@ -649,7 +665,7 @@ case 3:
         }}
 	break;
 	case 14:
-// line 202 "ext/ragel/base_lexer.rl"
+// line 205 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback(id_on_string_body, data, encoding, ts, te);
 
@@ -662,7 +678,7 @@ case 3:
     }}
 	break;
 	case 15:
-// line 238 "ext/ragel/base_lexer.rl"
+// line 241 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_string_dquote);
 
@@ -670,7 +686,7 @@ case 3:
         }}
 	break;
 	case 16:
-// line 202 "ext/ragel/base_lexer.rl"
+// line 205 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback(id_on_string_body, data, encoding, ts, te);
 
@@ -683,11 +699,11 @@ case 3:
     }}
 	break;
 	case 17:
-// line 283 "ext/ragel/base_lexer.rl"
+// line 286 "ext/ragel/base_lexer.rl"
 	{te = p+1;{ ( this.cs) = 53; }}
 	break;
 	case 18:
-// line 272 "ext/ragel/base_lexer.rl"
+// line 275 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_doctype_inline, data, encoding, ts, te);
 
@@ -700,19 +716,19 @@ case 3:
         }}
 	break;
 	case 19:
-// line 289 "ext/ragel/base_lexer.rl"
+// line 292 "ext/ragel/base_lexer.rl"
 	{( this.act) = 13;}
 	break;
 	case 20:
-// line 300 "ext/ragel/base_lexer.rl"
+// line 303 "ext/ragel/base_lexer.rl"
 	{( this.act) = 17;}
 	break;
 	case 21:
-// line 294 "ext/ragel/base_lexer.rl"
+// line 297 "ext/ragel/base_lexer.rl"
 	{te = p+1;{ ( this.cs) = 51; }}
 	break;
 	case 22:
-// line 213 "ext/ragel/base_lexer.rl"
+// line 216 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_string_squote);
 
@@ -720,7 +736,7 @@ case 3:
     }}
 	break;
 	case 23:
-// line 219 "ext/ragel/base_lexer.rl"
+// line 222 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_string_dquote);
 
@@ -728,30 +744,30 @@ case 3:
     }}
 	break;
 	case 24:
-// line 304 "ext/ragel/base_lexer.rl"
+// line 307 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_doctype_end);
             ( this.cs) = 32;
         }}
 	break;
 	case 25:
-// line 62 "ext/ragel/base_lexer.rl"
+// line 65 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         advance_line(1);
     }}
 	break;
 	case 26:
-// line 311 "ext/ragel/base_lexer.rl"
+// line 314 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
 	break;
 	case 27:
-// line 300 "ext/ragel/base_lexer.rl"
+// line 303 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_doctype_name, data, encoding, ts, te);
         }}
 	break;
 	case 28:
-// line 62 "ext/ragel/base_lexer.rl"
+// line 65 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         advance_line(1);
     }}
@@ -773,7 +789,7 @@ case 3:
 	}
 	break;
 	case 30:
-// line 328 "ext/ragel/base_lexer.rl"
+// line 331 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             if ( lines > 0 )
             {
@@ -788,7 +804,7 @@ case 3:
         }}
 	break;
 	case 31:
-// line 213 "ext/ragel/base_lexer.rl"
+// line 216 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_string_squote);
 
@@ -796,7 +812,7 @@ case 3:
     }}
 	break;
 	case 32:
-// line 219 "ext/ragel/base_lexer.rl"
+// line 222 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_string_dquote);
 
@@ -804,11 +820,11 @@ case 3:
     }}
 	break;
 	case 33:
-// line 356 "ext/ragel/base_lexer.rl"
+// line 359 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
 	break;
 	case 34:
-// line 342 "ext/ragel/base_lexer.rl"
+// line 345 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             if ( lines > 0 )
             {
@@ -821,28 +837,39 @@ case 3:
         }}
 	break;
 	case 35:
-// line 356 "ext/ragel/base_lexer.rl"
+// line 359 "ext/ragel/base_lexer.rl"
 	{te = p;p--;}
 	break;
 	case 36:
-// line 392 "ext/ragel/base_lexer.rl"
+// line 395 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
-            callback(id_on_element_ns, data, encoding, ts, te - 1);
+            if ( !html_p )
+            {
+                callback(id_on_element_ns, data, encoding, ts, te - 1);
+            }
         }}
 	break;
 	case 37:
-// line 396 "ext/ragel/base_lexer.rl"
+// line 402 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_element_name, data, encoding, ts, te);
-            ( this.cs) = 78;
+
+            if ( html_p )
+            {
+                ( this.cs) = 82;
+            }
+            else
+            {
+                ( this.cs) = 78;
+            }
         }}
 	break;
 	case 38:
-// line 406 "ext/ragel/base_lexer.rl"
+// line 420 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
 	break;
 	case 39:
-// line 410 "ext/ragel/base_lexer.rl"
+// line 424 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             if ( lines > 0 )
             {
@@ -855,21 +882,21 @@ case 3:
         }}
 	break;
 	case 40:
-// line 421 "ext/ragel/base_lexer.rl"
+// line 435 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
 	break;
 	case 41:
-// line 377 "ext/ragel/base_lexer.rl"
+// line 380 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback(id_on_element_end, data, encoding, ts, te);
     }}
 	break;
 	case 42:
-// line 427 "ext/ragel/base_lexer.rl"
+// line 441 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
 	break;
 	case 43:
-// line 429 "ext/ragel/base_lexer.rl"
+// line 443 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             p--;
 
@@ -884,7 +911,7 @@ case 3:
         }}
 	break;
 	case 44:
-// line 442 "ext/ragel/base_lexer.rl"
+// line 456 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             p--;
 
@@ -907,18 +934,18 @@ case 3:
         }}
 	break;
 	case 45:
-// line 427 "ext/ragel/base_lexer.rl"
+// line 441 "ext/ragel/base_lexer.rl"
 	{te = p;p--;}
 	break;
 	case 46:
-// line 66 "ext/ragel/base_lexer.rl"
+// line 69 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         p--;
         {( this.cs) = ( this.stack)[--( this.top)];_goto_targ = 2; if (true) continue _goto;}
     }}
 	break;
 	case 47:
-// line 480 "ext/ragel/base_lexer.rl"
+// line 494 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback_simple(id_on_string_squote);
 
@@ -928,7 +955,7 @@ case 3:
         }}
 	break;
 	case 48:
-// line 496 "ext/ragel/base_lexer.rl"
+// line 510 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_string_squote);
 
@@ -936,7 +963,7 @@ case 3:
         }}
 	break;
 	case 49:
-// line 502 "ext/ragel/base_lexer.rl"
+// line 516 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_string_dquote);
 
@@ -944,42 +971,89 @@ case 3:
         }}
 	break;
 	case 50:
-// line 66 "ext/ragel/base_lexer.rl"
+// line 69 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         p--;
         {( this.cs) = ( this.stack)[--( this.top)];_goto_targ = 2; if (true) continue _goto;}
     }}
 	break;
 	case 51:
-// line 62 "ext/ragel/base_lexer.rl"
+// line 65 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         advance_line(1);
     }}
 	break;
 	case 52:
-// line 517 "ext/ragel/base_lexer.rl"
+// line 556 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback(id_on_attribute_ns, data, encoding, ts, te - 1);
         }}
 	break;
 	case 53:
-// line 526 "ext/ragel/base_lexer.rl"
+// line 525 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
-            {( this.stack)[( this.top)++] = ( this.cs); ( this.cs) = 73; _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 54:
-// line 531 "ext/ragel/base_lexer.rl"
+// line 566 "ext/ragel/base_lexer.rl"
+	{te = p+1;{
+            callback_simple(id_on_element_open_end);
+
+            ( this.cs) = 32;
+        }}
+	break;
+	case 55:
+// line 546 "ext/ragel/base_lexer.rl"
+	{te = p+1;{
+        callback_simple(id_on_element_end);
+        ( this.cs) = 32;
+    }}
+	break;
+	case 56:
+// line 574 "ext/ragel/base_lexer.rl"
+	{te = p+1;}
+	break;
+	case 57:
+// line 65 "ext/ragel/base_lexer.rl"
+	{te = p;p--;{
+        advance_line(1);
+    }}
+	break;
+	case 58:
+// line 560 "ext/ragel/base_lexer.rl"
+	{te = p;p--;{
+            callback(id_on_attribute, data, encoding, ts, te);
+        }}
+	break;
+	case 59:
+// line 574 "ext/ragel/base_lexer.rl"
+	{te = p;p--;}
+	break;
+	case 60:
+// line 65 "ext/ragel/base_lexer.rl"
+	{te = p+1;{
+        advance_line(1);
+    }}
+	break;
+	case 61:
+// line 525 "ext/ragel/base_lexer.rl"
+	{te = p+1;{
+        {( this.stack)[( this.top)++] = ( this.cs); ( this.cs) = 73; _goto_targ = 2; if (true) continue _goto;}
+    }}
+	break;
+	case 62:
+// line 588 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple(id_on_element_open_end);
 
             if ( html_script_p() )
             {
-                ( this.cs) = 86;
+                ( this.cs) = 90;
             }
             else if ( html_style_p() )
             {
-                ( this.cs) = 90;
+                ( this.cs) = 94;
             }
             else
             {
@@ -987,35 +1061,35 @@ case 3:
             }
         }}
 	break;
-	case 55:
-// line 549 "ext/ragel/base_lexer.rl"
+	case 63:
+// line 546 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
-            callback_simple(id_on_element_end);
-            ( this.cs) = 32;
-        }}
+        callback_simple(id_on_element_end);
+        ( this.cs) = 32;
+    }}
 	break;
-	case 56:
-// line 554 "ext/ragel/base_lexer.rl"
+	case 64:
+// line 607 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
 	break;
-	case 57:
-// line 62 "ext/ragel/base_lexer.rl"
+	case 65:
+// line 65 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         advance_line(1);
     }}
 	break;
-	case 58:
-// line 521 "ext/ragel/base_lexer.rl"
+	case 66:
+// line 582 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_attribute, data, encoding, ts, te);
         }}
 	break;
-	case 59:
-// line 554 "ext/ragel/base_lexer.rl"
+	case 67:
+// line 607 "ext/ragel/base_lexer.rl"
 	{te = p;p--;}
 	break;
-	case 60:
-// line 591 "ext/ragel/base_lexer.rl"
+	case 68:
+// line 644 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback(id_on_text, data, encoding, ts, te);
 
@@ -1029,8 +1103,8 @@ case 3:
             ( this.cs) = 32;
         }}
 	break;
-	case 61:
-// line 605 "ext/ragel/base_lexer.rl"
+	case 69:
+// line 658 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback(id_on_text, data, encoding, ts, mark);
 
@@ -1047,8 +1121,8 @@ case 3:
             ( this.cs) = 32;
         }}
 	break;
-	case 62:
-// line 591 "ext/ragel/base_lexer.rl"
+	case 70:
+// line 644 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback(id_on_text, data, encoding, ts, te);
 
@@ -1062,16 +1136,16 @@ case 3:
             ( this.cs) = 32;
         }}
 	break;
-	case 63:
-// line 381 "ext/ragel/base_lexer.rl"
+	case 71:
+// line 384 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_element_end);
 
         ( this.cs) = 32;
     }}
 	break;
-	case 64:
-// line 579 "ext/ragel/base_lexer.rl"
+	case 72:
+// line 632 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback(id_on_text, data, encoding, ts, te);
 
@@ -1083,8 +1157,8 @@ case 3:
         }
     }}
 	break;
-	case 65:
-// line 579 "ext/ragel/base_lexer.rl"
+	case 73:
+// line 632 "ext/ragel/base_lexer.rl"
 	{{p = ((te))-1;}{
         callback(id_on_text, data, encoding, ts, te);
 
@@ -1096,16 +1170,16 @@ case 3:
         }
     }}
 	break;
-	case 66:
-// line 381 "ext/ragel/base_lexer.rl"
+	case 74:
+// line 384 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_element_end);
 
         ( this.cs) = 32;
     }}
 	break;
-	case 67:
-// line 579 "ext/ragel/base_lexer.rl"
+	case 75:
+// line 632 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback(id_on_text, data, encoding, ts, te);
 
@@ -1117,8 +1191,8 @@ case 3:
         }
     }}
 	break;
-	case 68:
-// line 579 "ext/ragel/base_lexer.rl"
+	case 76:
+// line 632 "ext/ragel/base_lexer.rl"
 	{{p = ((te))-1;}{
         callback(id_on_text, data, encoding, ts, te);
 
@@ -1130,52 +1204,52 @@ case 3:
         }
     }}
 	break;
-	case 69:
-// line 321 "ext/ragel/base_lexer.rl"
-	{( this.act) = 54;}
+	case 77:
+// line 324 "ext/ragel/base_lexer.rl"
+	{( this.act) = 60;}
 	break;
-	case 70:
-// line 167 "ext/ragel/base_lexer.rl"
-	{( this.act) = 57;}
+	case 78:
+// line 170 "ext/ragel/base_lexer.rl"
+	{( this.act) = 63;}
 	break;
-	case 71:
-// line 86 "ext/ragel/base_lexer.rl"
+	case 79:
+// line 89 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_comment_start);
 
         ( this.cs) = 38;
     }}
 	break;
-	case 72:
-// line 125 "ext/ragel/base_lexer.rl"
+	case 80:
+// line 128 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple(id_on_cdata_start);
 
         ( this.cs) = 41;
     }}
 	break;
-	case 73:
-// line 368 "ext/ragel/base_lexer.rl"
+	case 81:
+// line 371 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         p--;
         ( this.cs) = 69;
     }}
 	break;
-	case 74:
-// line 373 "ext/ragel/base_lexer.rl"
+	case 82:
+// line 376 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         ( this.cs) = 71;
     }}
 	break;
-	case 75:
-// line 565 "ext/ragel/base_lexer.rl"
+	case 83:
+// line 618 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         p--;
-        ( this.cs) = 82;
+        ( this.cs) = 86;
     }}
 	break;
-	case 76:
-// line 257 "ext/ragel/base_lexer.rl"
+	case 84:
+// line 260 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback_simple(id_on_doctype_start);
 
@@ -1189,8 +1263,8 @@ case 3:
         ( this.cs) = 53;
     }}
 	break;
-	case 77:
-// line 167 "ext/ragel/base_lexer.rl"
+	case 85:
+// line 170 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback_simple(id_on_proc_ins_start);
         callback(id_on_proc_ins_name, data, encoding, ts + 2, te);
@@ -1198,30 +1272,30 @@ case 3:
         ( this.cs) = 44;
     }}
 	break;
-	case 78:
-// line 565 "ext/ragel/base_lexer.rl"
+	case 86:
+// line 618 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         p--;
-        ( this.cs) = 82;
+        ( this.cs) = 86;
     }}
 	break;
-	case 79:
-// line 565 "ext/ragel/base_lexer.rl"
+	case 87:
+// line 618 "ext/ragel/base_lexer.rl"
 	{{p = ((te))-1;}{
         p--;
-        ( this.cs) = 82;
+        ( this.cs) = 86;
     }}
 	break;
-	case 80:
+	case 88:
 // line 1 "NONE"
 	{	switch( ( this.act) ) {
-	case 54:
+	case 60:
 	{{p = ((te))-1;}
         callback_simple(id_on_xml_decl_start);
         ( this.cs) = 66;
     }
 	break;
-	case 57:
+	case 63:
 	{{p = ((te))-1;}
         callback_simple(id_on_proc_ins_start);
         callback(id_on_proc_ins_name, data, encoding, ts + 2, te);
@@ -1232,7 +1306,7 @@ case 3:
 	}
 	}
 	break;
-// line 1236 "ext/java/org/liboga/xml/Lexer.java"
+// line 1310 "ext/java/org/liboga/xml/Lexer.java"
 			}
 		}
 	}
@@ -1246,7 +1320,7 @@ case 2:
 // line 1 "NONE"
 	{ts = -1;}
 	break;
-// line 1250 "ext/java/org/liboga/xml/Lexer.java"
+// line 1324 "ext/java/org/liboga/xml/Lexer.java"
 		}
 	}