oga 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 197d219e1e3d722989d7f3a21eaf2139800b5cfa
-  data.tar.gz: ac2bbb8efcb330220afdd86eb7baf8133eca0b70
+  metadata.gz: d7e6862730c7a4e17048c73f5d3656060cdbd1cb
+  data.tar.gz: bd9b3215aeff301a46606b63911f60ffc246aed5
 SHA512:
-  metadata.gz: c9124ebd40992d9f53776d4d1eddf920b782c51bfe563da4b6503a7cfda53b00720a9e600aaf905607cd0ee7882a2451477a27aa5bf89be3d056631fdc4baac8
-  data.tar.gz: da9b064ee0fc949d9b6cf699964bf7c7d0922216fd60f882724a15455c05e745c44d8aee92f6c08bcdf4af9d3e92c6a6abe7ed222705371e26ec5df271c49cba
+  metadata.gz: 531e732ec31ddfd9f2f94d9ba422154607a8901881126cba42ca790e09e06ac3e8992ad5e47dee866c6723c583d2b939bdcb1708cd81bd6844c854f57d9c6c8f
+  data.tar.gz: cb46703bcabaf49ddc23ff568730f01c3120dedb20804c8107f6616713fafeb6825a2e80a13618b5f31b37d41ab8aac960680f4a5f5de16229af1684ca5ea65d

data/README.md

@@ -44,6 +44,26 @@ Parsing an IO handle using the pull parser:
       end
     end
 
+Parse a string of XML using the SAX parser:
+
+    class ElementNames
+      attr_reader :names
+
+      def initialize
+        @names = []
+      end
+
+      def on_element(namespace, name, attrs = {})
+        @names << name
+      end
+    end
+
+    handler = ElementNames.new
+
+    Oga.sax_parse_xml(handler, '<foo><bar></bar></foo>')
+
+    handler.names # => ["foo", "bar"]
+
 Querying a document using XPath:
 
     document = Oga.parse_xml('<people><person>Alice</person></people>')
@@ -71,6 +91,7 @@ Querying a document using a namespace:
 * Support for parsing XML and HTML(5)
   * DOM parsing
   * Stream/pull parsing
+  * SAX parsing
 * Low memory footprint
 * High performance, if something doesn't perform well enough it's a bug
 * Support for XPath 1.0

data/doc/changelog.md

@@ -1,5 +1,113 @@
 # Changelog
 
+This document contains details of the various releases and their release dates.
+Dates are in the format `yyyy-mm-dd`.
+
+## 0.1.2 - 2014-09-23
+
+### SAX API
+
+A SAX parser/API has been added. This API is useful when even the overhead of
+the pull-parser is too much memory wise. Example:
+
+    class ElementNames
+      attr_reader :names
+
+      def initialize
+        @names = []
+      end
+
+      def on_element(namespace, name, attrs = {})
+        @names << name
+      end
+    end
+
+    handler = ElementNames.new
+
+    Oga.sax_parse_xml(handler, '<foo><bar></bar></foo>')
+
+    handler.names # => ["foo", "bar"]
+
+### Racc Gem
+
+Oga will now always use the Racc gem instead of the version shipped with the
+Ruby standard library.
+
+### Error Reporting
+
+XML parser errors have been made a little bit more user friendly, though they
+can still be quite cryptic.
+
+### Serializing Elements
+
+Elements serialized to XML/HTML will use self-closing tags whenever possible.
+When parsing HTML documents only HTML void elements will use self-closing tags
+(e.g. `<link>` tags). Example:
+
+    Oga.parse_xml('<foo></foo>').to_xml        # => "<foo />"
+    Oga.parse_html('<script></script>').to_xml # => "<script></script>"
+
+### Default Namespaces
+
+Namespaces are no longer removed from the attributes list when an element is
+created.
+
+Default XML namespaces can now be registered using `xmlns="..."`. Previously
+this would be ignored. Example:
+
+    document = Oga.parse_xml('<root xmlns="baz"></root>')
+    root     = document.children[0]
+
+    root.namespace # => Namespace(name: "xmlns" uri: "baz")
+
+### Lexing Incomplete Input
+
+Oga can now lex input such as `</` without entering an infinite loop. Example:
+
+    Oga.parse_xml('</') # => Document(children: NodeSet(Text("</")))
+
+### Absolute XPath Paths
+
+Oga can now parse and evaluate the XPath expression "/" (that is, just "/").
+This will return the root node (usually a Document instance). Example:
+
+    document = Oga.parse_xml('<root></root>')
+
+    document.xpath('/') # => NodeSet(Document(children: NodeSet(Element(name: "root"))))
+
+### Namespace Ordering
+
+Namespaces available to an element are now returned in the correct order.
+Previously outer namespaces would take precedence over inner namespaces, instead
+of it being the other way around. Example:
+
+    document = Oga.parse_xml <<-EOF
+    <root xmlns:foo="bar">
+      <container xmlns:foo="baz">
+        <foo:text>Text!</foo:text>
+      </container>
+    </root>
+    EOF
+
+    foo = document.at_xpath('root/container/foo:text')
+
+    foo.namespace # => Namespace(name: "foo" uri: "baz")
+
+### Parsing Capitalized HTML Void Elements
+
+Oga is now capable of parsing capitalized HTML void elements (e.g. `<BR>`).
+Previously it could only parse lower-cased void elements. Thanks to Tero Tasanen
+for fixing this. Example:
+
+    Oga.parse_html('<BR>') # => Document(children: NodeSet(Element(name: "BR")))
+
+### Node Type Method Removed
+
+The `node_type` method has been removed and its purpose has been moved into
+the `XML::PullParser` class itself. This method was solely used by the pull
+parser to provide shorthands for node classes. As such it doesn't make sense to
+expose this as a method to the outside world as a public method.
+
 ## 0.1.1 - 2014-09-13
 
 This release fixes a problem where element attributes were not separated by

data/ext/c/lexer.c

@@ -181,6 +181,7 @@ _again:
 		case 64: goto st64;
 		case 65: goto st65;
 		case 66: goto st66;
+		case 67: goto st67;
 	default: break;
 	}
 
@@ -252,13 +253,13 @@ tr51:
 	cs = 35;
 #line 1 "NONE"
 	{	switch( act ) {
-	case 25:
+	case 26:
 	{{p = ((te))-1;}
         callback_simple("on_xml_decl_start");
         cs = 55;
     }
 	break;
-	case 28:
+	case 29:
 	{{p = ((te))-1;}
         callback_simple("on_proc_ins_start");
         callback("on_proc_ins_name", data, encoding, ts + 2, te);
@@ -291,7 +292,7 @@ st35:
 case 35:
 #line 1 "NONE"
 	{ts = p;}
-#line 295 "ext/c/lexer.c"
+#line 296 "ext/c/lexer.c"
 	if ( (*p) == 60 )
 		goto tr45;
 	goto tr44;
@@ -303,7 +304,7 @@ st36:
 	if ( ++p == pe )
 		goto _test_eof36;
 case 36:
-#line 307 "ext/c/lexer.c"
+#line 308 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 33: goto st1;
 		case 45: goto tr48;
@@ -556,19 +557,19 @@ tr27:
 #line 1 "NONE"
 	{te = p+1;}
 #line 90 "ext/ragel/base_lexer.rl"
-	{act = 28;}
+	{act = 29;}
 	goto st38;
 tr54:
 #line 1 "NONE"
 	{te = p+1;}
 #line 182 "ext/ragel/base_lexer.rl"
-	{act = 25;}
+	{act = 26;}
 	goto st38;
 st38:
 	if ( ++p == pe )
 		goto _test_eof38;
 case 38:
-#line 572 "ext/c/lexer.c"
+#line 573 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 45: goto tr27;
 		case 95: goto tr27;
@@ -644,7 +645,7 @@ st41:
 case 41:
 #line 1 "NONE"
 	{ts = p;}
-#line 648 "ext/c/lexer.c"
+#line 649 "ext/c/lexer.c"
 	if ( (*p) == 63 )
 		goto st42;
 	goto tr55;
@@ -709,7 +710,7 @@ st43:
 case 43:
 #line 1 "NONE"
 	{ts = p;}
-#line 713 "ext/c/lexer.c"
+#line 714 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 9: goto tr59;
 		case 32: goto tr59;
@@ -764,7 +765,7 @@ st44:
 	if ( ++p == pe )
 		goto _test_eof44;
 case 44:
-#line 768 "ext/c/lexer.c"
+#line 769 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 45: goto tr60;
 		case 95: goto tr60;
@@ -1010,7 +1011,7 @@ st55:
 case 55:
 #line 1 "NONE"
 	{ts = p;}
-#line 1014 "ext/c/lexer.c"
+#line 1015 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 34: goto tr77;
 		case 39: goto tr78;
@@ -1035,7 +1036,7 @@ st56:
 	if ( ++p == pe )
 		goto _test_eof56;
 case 56:
-#line 1039 "ext/c/lexer.c"
+#line 1040 "ext/c/lexer.c"
 	if ( (*p) == 34 )
 		goto tr36;
 	goto st29;
@@ -1054,7 +1055,7 @@ st57:
 	if ( ++p == pe )
 		goto _test_eof57;
 case 57:
-#line 1058 "ext/c/lexer.c"
+#line 1059 "ext/c/lexer.c"
 	if ( (*p) == 39 )
 		goto tr36;
 	goto st30;
@@ -1111,7 +1112,7 @@ st60:
 case 60:
 #line 1 "NONE"
 	{ts = p;}
-#line 1115 "ext/c/lexer.c"
+#line 1116 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 45: goto st61;
 		case 95: goto st61;
@@ -1195,7 +1196,7 @@ st62:
 case 62:
 #line 1 "NONE"
 	{ts = p;}
-#line 1199 "ext/c/lexer.c"
+#line 1200 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 9: goto tr87;
 		case 10: goto tr38;
@@ -1266,23 +1267,7 @@ case 34:
 	goto st0;
 tr96:
 	cs = 64;
-#line 1 "NONE"
-	{	switch( act ) {
-	case 0:
-	{{goto st0;}}
-	break;
-	case 23:
-	{{p = ((te))-1;}
-            callback("on_text", data, encoding, ts, te);
-            cs = 35;
-        }
-	break;
-	}
-	}
-	goto _again;
-tr97:
-	cs = 64;
-#line 306 "ext/ragel/base_lexer.rl"
+#line 314 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback("on_text", data, encoding, ts, te);
             cs = 35;
@@ -1290,7 +1275,7 @@ tr97:
 	goto _again;
 tr98:
 	cs = 64;
-#line 296 "ext/ragel/base_lexer.rl"
+#line 304 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback("on_text", data, encoding, ts, mark);
 
@@ -1300,49 +1285,52 @@ tr98:
             cs = 35;
         }}
 	goto _again;
+tr99:
+	cs = 64;
+#line 297 "ext/ragel/base_lexer.rl"
+	{te = p+1;{
+            callback("on_text", data, encoding, ts, te);
+
+            cs = 35;
+        }}
+	goto _again;
 st64:
 #line 1 "NONE"
 	{ts = 0;}
-#line 1 "NONE"
-	{act = 0;}
 	if ( ++p == pe )
 		goto _test_eof64;
 case 64:
 #line 1 "NONE"
 	{ts = p;}
-#line 1314 "ext/c/lexer.c"
+#line 1306 "ext/c/lexer.c"
 	if ( (*p) == 60 )
 		goto tr95;
 	goto tr94;
 tr94:
-#line 1 "NONE"
-	{te = p+1;}
-#line 296 "ext/ragel/base_lexer.rl"
+#line 304 "ext/ragel/base_lexer.rl"
 	{ mark = p; }
-#line 306 "ext/ragel/base_lexer.rl"
-	{act = 23;}
 	goto st65;
 st65:
 	if ( ++p == pe )
 		goto _test_eof65;
 case 65:
-#line 1330 "ext/c/lexer.c"
+#line 1318 "ext/c/lexer.c"
 	if ( (*p) == 60 )
-		goto tr95;
+		goto tr97;
 	goto tr94;
-tr95:
-#line 296 "ext/ragel/base_lexer.rl"
+tr97:
+#line 304 "ext/ragel/base_lexer.rl"
 	{ mark = p; }
 	goto st66;
 st66:
 	if ( ++p == pe )
 		goto _test_eof66;
 case 66:
-#line 1342 "ext/c/lexer.c"
+#line 1330 "ext/c/lexer.c"
 	switch( (*p) ) {
 		case 33: goto tr98;
 		case 45: goto tr98;
-		case 60: goto tr95;
+		case 60: goto tr97;
 		case 63: goto tr98;
 		case 95: goto tr98;
 	}
@@ -1355,6 +1343,31 @@ case 66:
 	} else
 		goto tr98;
 	goto tr94;
+tr95:
+#line 304 "ext/ragel/base_lexer.rl"
+	{ mark = p; }
+	goto st67;
+st67:
+	if ( ++p == pe )
+		goto _test_eof67;
+case 67:
+#line 1355 "ext/c/lexer.c"
+	switch( (*p) ) {
+		case 33: goto tr99;
+		case 45: goto tr99;
+		case 60: goto tr97;
+		case 63: goto tr99;
+		case 95: goto tr99;
+	}
+	if ( (*p) < 65 ) {
+		if ( 47 <= (*p) && (*p) <= 57 )
+			goto tr99;
+	} else if ( (*p) > 90 ) {
+		if ( 97 <= (*p) && (*p) <= 122 )
+			goto tr99;
+	} else
+		goto tr99;
+	goto tr94;
 	}
 	_test_eof35: cs = 35; goto _test_eof; 
 	_test_eof36: cs = 36; goto _test_eof; 
@@ -1422,6 +1435,7 @@ case 66:
 	_test_eof64: cs = 64; goto _test_eof; 
 	_test_eof65: cs = 65; goto _test_eof; 
 	_test_eof66: cs = 66; goto _test_eof; 
+	_test_eof67: cs = 67; goto _test_eof; 
 
 	_test_eof: {}
 	if ( p == eof )
@@ -1477,7 +1491,8 @@ case 66:
 	case 61: goto tr85;
 	case 63: goto tr92;
 	case 65: goto tr96;
-	case 66: goto tr97;
+	case 66: goto tr96;
+	case 67: goto tr96;
 	}
 	}
 

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

@@ -43,15 +43,14 @@ public class Lexer extends RubyObject
 private static byte[] init__java_lexer_actions_0()
 {
 	return new byte [] {
-	    0,    1,    0,    1,    1,    1,    3,    1,    4,    1,    5,    1,
-	    6,    1,    7,    1,   10,    1,   11,    1,   12,    1,   13,    1,
-	   14,    1,   15,    1,   16,    1,   17,    1,   18,    1,   19,    1,
-	   20,    1,   21,    1,   22,    1,   23,    1,   24,    1,   25,    1,
-	   26,    1,   27,    1,   28,    1,   29,    1,   30,    1,   32,    1,
-	   33,    1,   34,    1,   37,    1,   38,    1,   39,    1,   40,    1,
-	   41,    1,   42,    1,   43,    1,   44,    1,   45,    1,   46,    2,
-	    1,    2,    2,    4,    8,    2,    4,    9,    2,    4,   35,    2,
-	    4,   36,    3,    4,    0,   31
+	    0,    1,    0,    1,    1,    1,    2,    1,    3,    1,    4,    1,
+	    5,    1,    6,    1,    9,    1,   10,    1,   11,    1,   12,    1,
+	   13,    1,   14,    1,   15,    1,   16,    1,   17,    1,   18,    1,
+	   19,    1,   20,    1,   21,    1,   22,    1,   23,    1,   24,    1,
+	   25,    1,   26,    1,   27,    1,   28,    1,   29,    1,   30,    1,
+	   31,    1,   32,    1,   35,    1,   36,    1,   37,    1,   38,    1,
+	   39,    1,   40,    1,   41,    1,   42,    1,   43,    1,   44,    2,
+	    3,    7,    2,    3,    8,    2,    3,   33,    2,    3,   34
 	};
 }
 
@@ -66,7 +65,7 @@ private static short[] init__java_lexer_key_offsets_0()
 	   51,   60,   61,   62,   62,   63,   64,   65,   66,   67,   68,   69,
 	   70,   81,   83,   91,  100,  109,  110,  111,  127,  135,  144,  153,
 	  162,  171,  180,  189,  198,  207,  216,  225,  236,  237,  238,  246,
-	  247,  255,  264,  281,  290,  291,  292
+	  247,  255,  264,  281,  290,  291,  292,  303
 	};
 }
 
@@ -101,7 +100,8 @@ private static char[] init__java_lexer_trans_keys_0()
 	    9,   10,   13,   32,   34,   39,   45,   47,   61,   62,   95,   48,
 	   57,   65,   90,   97,  122,   45,   58,   95,   48,   57,   65,   90,
 	   97,  122,   60,   60,   33,   45,   60,   63,   95,   47,   57,   65,
-	   90,   97,  122,    0
+	   90,   97,  122,   33,   45,   60,   63,   95,   47,   57,   65,   90,
+	   97,  122,    0
 	};
 }
 
@@ -116,7 +116,7 @@ private static byte[] init__java_lexer_single_lengths_0()
 	    3,    1,    1,    0,    1,    1,    1,    1,    1,    1,    1,    1,
 	    5,    2,    2,    3,    3,    1,    1,   10,    2,    3,    3,    3,
 	    3,    3,    3,    3,    3,    3,    3,    5,    1,    1,    2,    1,
-	    2,    3,   11,    3,    1,    1,    5
+	    2,    3,   11,    3,    1,    1,    5,    5
 	};
 }
 
@@ -131,7 +131,7 @@ private static byte[] init__java_lexer_range_lengths_0()
 	    3,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
 	    3,    0,    3,    3,    3,    0,    0,    3,    3,    3,    3,    3,
 	    3,    3,    3,    3,    3,    3,    3,    3,    0,    0,    3,    0,
-	    3,    3,    3,    3,    0,    0,    3
+	    3,    3,    3,    3,    0,    0,    3,    3
 	};
 }
 
@@ -146,7 +146,7 @@ private static short[] init__java_lexer_index_offsets_0()
 	   68,   75,   77,   79,   80,   82,   84,   86,   88,   90,   92,   94,
 	   96,  105,  108,  114,  121,  128,  130,  132,  146,  152,  159,  166,
 	  173,  180,  187,  194,  201,  208,  215,  222,  231,  233,  235,  241,
-	  243,  249,  256,  271,  278,  280,  282
+	  243,  249,  256,  271,  278,  280,  282,  291
 	};
 }
 
@@ -179,8 +179,9 @@ private static byte[] init__java_lexer_indicies_0()
 	   82,   83,   81,   84,   84,   84,   84,   84,   39,   84,   86,   84,
 	   84,   84,   84,   85,   87,   38,   88,   87,   40,   42,   89,   90,
 	   87,   91,   89,   89,   89,   89,   39,   89,   93,   89,   89,   89,
-	   89,   92,   95,   94,   95,   94,   98,   98,   95,   98,   98,   98,
-	   98,   98,   94,    0
+	   89,   92,   95,   94,   97,   94,   98,   98,   97,   98,   98,   98,
+	   98,   98,   94,   99,   99,   97,   99,   99,   99,   99,   99,   94,
+	    0
 	};
 }
 
@@ -197,8 +198,8 @@ private static byte[] init__java_lexer_trans_targs_0()
 	   35,   24,   35,   35,   35,   40,   38,   41,   42,   41,   41,   43,
 	   44,   43,   45,   50,   27,   43,   43,   46,   47,   48,   49,   44,
 	   51,   52,   53,   54,   55,   56,   57,   58,   59,   55,   55,   55,
-	   61,   60,   60,   62,   31,   63,   34,   62,   62,   62,   65,   66,
-	   64,   64,   64
+	   61,   60,   60,   62,   31,   63,   34,   62,   62,   62,   65,   67,
+	   64,   66,   64,   64
 	};
 }
 
@@ -210,13 +211,13 @@ private static byte[] init__java_lexer_trans_actions_0()
 	return new byte [] {
 	   79,    0,    0,    0,    0,    0,    0,   63,    0,    0,    0,    0,
 	    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,   65,
-	    0,    0,   69,   95,    0,    0,   17,    0,    0,   15,   37,    0,
+	    0,    0,   69,   92,    0,    0,   17,    0,    0,   15,   37,    0,
 	   29,    0,   45,    0,    0,   49,    0,   53,   71,    7,   77,    0,
-	   67,    0,   73,   81,   75,    0,   92,   11,    0,   13,    9,   19,
-	   89,   21,    0,    0,    0,   25,   23,    0,    0,    0,    0,   86,
+	   67,    0,   73,   81,   75,    0,   89,   11,    0,   13,    9,   19,
+	   86,   21,    0,    0,    0,   25,   23,    0,    0,    0,    0,   83,
 	    0,    0,    0,    0,   31,    7,    7,    0,    0,   35,   33,   27,
-	    0,   41,   39,   43,    0,    0,    0,   51,   55,   47,   98,    1,
-	   61,   59,   57
+	    0,   41,   39,   43,    0,    0,    0,   51,   55,   47,    1,    1,
+	   61,    1,   59,   57
 	};
 }
 
@@ -231,7 +232,7 @@ private static byte[] init__java_lexer_to_state_actions_0()
 	    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    3,
 	    0,    0,    0,    0,    0,    3,    0,    3,    0,    0,    0,    0,
 	    0,    0,    0,    0,    0,    0,    0,    3,    0,    0,    0,    0,
-	    3,    0,    3,    0,   83,    0,    0
+	    3,    0,    3,    0,    3,    0,    0,    0
 	};
 }
 
@@ -246,7 +247,7 @@ private static byte[] init__java_lexer_from_state_actions_0()
 	    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    5,
 	    0,    0,    0,    0,    0,    5,    0,    5,    0,    0,    0,    0,
 	    0,    0,    0,    0,    0,    0,    0,    5,    0,    0,    0,    0,
-	    5,    0,    5,    0,    5,    0,    0
+	    5,    0,    5,    0,    5,    0,    0,    0
 	};
 }
 
@@ -261,7 +262,7 @@ private static short[] init__java_lexer_eof_trans_0()
 	    1,    0,    0,    0,    0,   35,   35,    0,    0,    0,    0,    0,
 	   47,   51,   52,   53,   53,    0,   58,    0,   66,   67,   67,   67,
 	   67,   67,   67,   67,   67,   67,   67,    0,   82,   82,   83,   82,
-	    0,   86,    0,   93,    0,   97,   98
+	    0,   86,    0,   93,    0,   97,   97,   97
 	};
 }
 
@@ -344,7 +345,7 @@ static final int java_lexer_en_main = 35;
         int eof  = data.length;
 
         
-// line 348 "ext/java/org/liboga/xml/Lexer.java"
+// line 349 "ext/java/org/liboga/xml/Lexer.java"
 	{
 	int _klen;
 	int _trans = 0;
@@ -369,11 +370,11 @@ case 1:
 	_nacts = (int) _java_lexer_actions[_acts++];
 	while ( _nacts-- > 0 ) {
 		switch ( _java_lexer_actions[_acts++] ) {
-	case 3:
+	case 2:
 // line 1 "NONE"
 	{ts = p;}
 	break;
-// line 377 "ext/java/org/liboga/xml/Lexer.java"
+// line 378 "ext/java/org/liboga/xml/Lexer.java"
 		}
 	}
 
@@ -438,14 +439,14 @@ case 3:
 			switch ( _java_lexer_actions[_acts++] )
 			{
 	case 0:
-// line 296 "ext/ragel/base_lexer.rl"
+// line 304 "ext/ragel/base_lexer.rl"
 	{ mark = p; }
 	break;
-	case 4:
+	case 3:
 // line 1 "NONE"
 	{te = p+1;}
 	break;
-	case 5:
+	case 4:
 // line 100 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback("on_text", data, encoding, mark, ts);
@@ -454,52 +455,52 @@ case 3:
             ( this.cs) = 35;
         }}
 	break;
-	case 6:
+	case 5:
 // line 107 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
 	break;
-	case 7:
+	case 6:
 // line 107 "ext/ragel/base_lexer.rl"
 	{te = p;p--;}
 	break;
-	case 8:
+	case 7:
 // line 148 "ext/ragel/base_lexer.rl"
 	{( this.act) = 3;}
 	break;
-	case 9:
+	case 8:
 // line 165 "ext/ragel/base_lexer.rl"
 	{( this.act) = 7;}
 	break;
-	case 10:
+	case 9:
 // line 154 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback("on_doctype_inline", data, encoding, ts + 1, te - 1);
         }}
 	break;
-	case 11:
+	case 10:
 // line 124 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback("on_string", data, encoding, ts + 1, te - 1);
     }}
 	break;
-	case 12:
+	case 11:
 // line 163 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
 	break;
-	case 13:
+	case 12:
 // line 169 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple("on_doctype_end");
             ( this.cs) = 35;
         }}
 	break;
-	case 14:
+	case 13:
 // line 165 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback("on_doctype_name", data, encoding, ts, te);
         }}
 	break;
-	case 15:
+	case 14:
 // line 1 "NONE"
 	{	switch( ( this.act) ) {
 	case 3:
@@ -515,98 +516,102 @@ case 3:
 	}
 	}
 	break;
-	case 16:
+	case 15:
 // line 189 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple("on_xml_decl_end");
             ( this.cs) = 35;
         }}
 	break;
-	case 17:
+	case 16:
 // line 124 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback("on_string", data, encoding, ts + 1, te - 1);
     }}
 	break;
-	case 18:
+	case 17:
 // line 201 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
 	break;
-	case 19:
+	case 18:
 // line 195 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback("on_attribute", data, encoding, ts, te);
         }}
 	break;
-	case 20:
+	case 19:
 // line 201 "ext/ragel/base_lexer.rl"
 	{te = p;p--;}
 	break;
-	case 21:
+	case 20:
 // line 201 "ext/ragel/base_lexer.rl"
 	{{p = ((te))-1;}}
 	break;
-	case 22:
+	case 21:
 // line 228 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback("on_element_ns", data, encoding, ts, te - 1);
         }}
 	break;
-	case 23:
+	case 22:
 // line 232 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback("on_element_name", data, encoding, ts, te);
             ( this.cs) = 62;
         }}
 	break;
-	case 24:
+	case 23:
 // line 241 "ext/ragel/base_lexer.rl"
 	{te = p+1;}
 	break;
-	case 25:
+	case 24:
 // line 243 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple("advance_line");
         }}
 	break;
-	case 26:
+	case 25:
 // line 248 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback("on_attribute_ns", data, encoding, ts, te - 1);
         }}
 	break;
-	case 27:
+	case 26:
 // line 124 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback("on_string", data, encoding, ts + 1, te - 1);
     }}
 	break;
-	case 28:
+	case 27:
 // line 260 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple("on_element_open_end");
             ( this.cs) = 35;
         }}
 	break;
-	case 29:
+	case 28:
 // line 266 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback_simple("on_element_end");
             ( this.cs) = 35;
         }}
 	break;
-	case 30:
+	case 29:
 // line 252 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback("on_attribute", data, encoding, ts, te);
         }}
 	break;
-	case 31:
-// line 306 "ext/ragel/base_lexer.rl"
-	{( this.act) = 23;}
+	case 30:
+// line 297 "ext/ragel/base_lexer.rl"
+	{te = p+1;{
+            callback("on_text", data, encoding, ts, te);
+
+            ( this.cs) = 35;
+        }}
 	break;
-	case 32:
-// line 296 "ext/ragel/base_lexer.rl"
+	case 31:
+// line 304 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
             callback("on_text", data, encoding, ts, mark);
 
@@ -616,49 +621,34 @@ case 3:
             ( this.cs) = 35;
         }}
 	break;
-	case 33:
-// line 306 "ext/ragel/base_lexer.rl"
+	case 32:
+// line 314 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
             callback("on_text", data, encoding, ts, te);
             ( this.cs) = 35;
         }}
 	break;
-	case 34:
-// line 1 "NONE"
-	{	switch( ( this.act) ) {
-	case 0:
-	{{( this.cs) = 0; _goto_targ = 2; if (true) continue _goto;}}
-	break;
-	case 23:
-	{{p = ((te))-1;}
-            callback("on_text", data, encoding, ts, te);
-            ( this.cs) = 35;
-        }
-	break;
-	}
-	}
-	break;
-	case 35:
+	case 33:
 // line 182 "ext/ragel/base_lexer.rl"
-	{( this.act) = 25;}
+	{( this.act) = 26;}
 	break;
-	case 36:
+	case 34:
 // line 90 "ext/ragel/base_lexer.rl"
-	{( this.act) = 28;}
+	{( this.act) = 29;}
 	break;
-	case 37:
+	case 35:
 // line 56 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback("on_comment", data, encoding, ts + 4, te - 3);
     }}
 	break;
-	case 38:
+	case 36:
 // line 72 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback("on_cdata", data, encoding, ts + 9, te - 3);
     }}
 	break;
-	case 39:
+	case 37:
 // line 216 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple("on_element_start");
@@ -666,27 +656,27 @@ case 3:
         ( this.cs) = 60;
     }}
 	break;
-	case 40:
+	case 38:
 // line 222 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         callback_simple("on_element_end");
     }}
 	break;
-	case 41:
+	case 39:
 // line 280 "ext/ragel/base_lexer.rl"
 	{te = p+1;{
         p--;
         ( this.cs) = 64;
     }}
 	break;
-	case 42:
+	case 40:
 // line 140 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback_simple("on_doctype_start");
         ( this.cs) = 43;
     }}
 	break;
-	case 43:
+	case 41:
 // line 90 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         callback_simple("on_proc_ins_start");
@@ -697,30 +687,30 @@ case 3:
         ( this.cs) = 41;
     }}
 	break;
-	case 44:
+	case 42:
 // line 280 "ext/ragel/base_lexer.rl"
 	{te = p;p--;{
         p--;
         ( this.cs) = 64;
     }}
 	break;
-	case 45:
+	case 43:
 // line 280 "ext/ragel/base_lexer.rl"
 	{{p = ((te))-1;}{
         p--;
         ( this.cs) = 64;
     }}
 	break;
-	case 46:
+	case 44:
 // line 1 "NONE"
 	{	switch( ( this.act) ) {
-	case 25:
+	case 26:
 	{{p = ((te))-1;}
         callback_simple("on_xml_decl_start");
         ( this.cs) = 55;
     }
 	break;
-	case 28:
+	case 29:
 	{{p = ((te))-1;}
         callback_simple("on_proc_ins_start");
         callback("on_proc_ins_name", data, encoding, ts + 2, te);
@@ -733,7 +723,7 @@ case 3:
 	}
 	}
 	break;
-// line 737 "ext/java/org/liboga/xml/Lexer.java"
+// line 727 "ext/java/org/liboga/xml/Lexer.java"
 			}
 		}
 	}
@@ -747,11 +737,7 @@ case 2:
 // line 1 "NONE"
 	{ts = -1;}
 	break;
-	case 2:
-// line 1 "NONE"
-	{( this.act) = 0;}
-	break;
-// line 755 "ext/java/org/liboga/xml/Lexer.java"
+// line 741 "ext/java/org/liboga/xml/Lexer.java"
 		}
 	}