Merge branch 'maint-r15' into maint

* maint-r15:
  Update release notes
  Fix continuation bug in parse_default_decl_1/2

1 files changed, 200 insertions, 200 deletions

diff --git a/lib/xmerl/src/xmerl_sax_parser_base.erlsrc b/lib/xmerl/src/xmerl_sax_parser_base.erlsrc
index df0970ef14..d38045f2a5 100644
--- a/lib/xmerl/src/xmerl_sax_parser_base.erlsrc
+++ b/lib/xmerl/src/xmerl_sax_parser_base.erlsrc
@@ -155,16 +155,16 @@ parse_xml_decl(?BYTE_ORDER_MARK_2, State) ->
     cf(?BYTE_ORDER_MARK_2, State, fun parse_xml_decl/2);
 parse_xml_decl(?BYTE_ORDER_MARK_REST(Rest), State) ->
     cf(Rest, State, fun parse_xml_decl/2);
-parse_xml_decl(?STRING("<"), State) ->
-    cf(?STRING("<"), State, fun parse_xml_decl/2);
-parse_xml_decl(?STRING("<?"), State) ->
-    cf(?STRING("<?"), State, fun parse_xml_decl/2);
-parse_xml_decl(?STRING("<?x"), State) ->
-    cf(?STRING("<?x"), State, fun parse_xml_decl/2);
-parse_xml_decl(?STRING("<?xm"), State) ->
-    cf(?STRING("<?xm"), State, fun parse_xml_decl/2);
-parse_xml_decl(?STRING("<?xml"), State) ->
-    cf(?STRING("<?xml"), State, fun parse_xml_decl/2);
+parse_xml_decl(?STRING("<") = Bytes, State) ->
+    cf(Bytes, State, fun parse_xml_decl/2);
+parse_xml_decl(?STRING("<?") = Bytes, State) ->
+    cf(Bytes, State, fun parse_xml_decl/2);
+parse_xml_decl(?STRING("<?x") = Bytes, State) ->
+    cf(Bytes, State, fun parse_xml_decl/2);
+parse_xml_decl(?STRING("<?xm") = Bytes, State) ->
+    cf(Bytes, State, fun parse_xml_decl/2);
+parse_xml_decl(?STRING("<?xml") = Bytes, State) ->
+    cf(Bytes, State, fun parse_xml_decl/2);
 parse_xml_decl(?STRING_REST("<?xml", Rest1), State) ->
     parse_xml_decl_1(Rest1, State);
 parse_xml_decl(Bytes, #xmerl_sax_parser_state{encoding=Enc} = State) when is_binary(Bytes) ->
@@ -204,8 +204,8 @@ parse_xml_decl_1(Bytes, State) ->
 %%----------------------------------------------------------------------
 parse_prolog(?STRING_EMPTY, State) ->
     cf(?STRING_EMPTY, State, fun parse_prolog/2);
-parse_prolog(?STRING("<"), State) ->
-    cf(?STRING("<"), State, fun parse_prolog/2);
+parse_prolog(?STRING("<") = Bytes, State) ->
+    cf(Bytes, State, fun parse_prolog/2);
 parse_prolog(?STRING_REST("<?", Rest), State) ->
     {Rest1, State1} = parse_pi(Rest, State),
     parse_prolog(Rest1, State1);
@@ -223,18 +223,18 @@ parse_prolog(Bytes, State) ->
 
 parse_prolog_1(?STRING_EMPTY, State) ->
     cf(?STRING_EMPTY, State, fun parse_prolog_1/2);
-parse_prolog_1(?STRING("D"), State) ->
-    cf(?STRING("D"), State, fun parse_prolog_1/2);
-parse_prolog_1(?STRING("DO"), State) ->
-    cf(?STRING("DO"), State, fun parse_prolog_1/2);
-parse_prolog_1(?STRING("DOC"), State) ->
-    cf(?STRING("DOC"), State, fun parse_prolog_1/2);
-parse_prolog_1(?STRING("DOCT"), State) ->
-    cf(?STRING("DOCT"), State, fun parse_prolog_1/2);
-parse_prolog_1(?STRING("DOCTY"), State) ->
-    cf(?STRING("DOCTY"), State, fun parse_prolog_1/2);
-parse_prolog_1(?STRING("DOCTYP"), State) ->
-    cf(?STRING("DOCTYP"), State, fun parse_prolog_1/2);
+parse_prolog_1(?STRING("D") = Bytes, State) ->
+    cf(Bytes, State, fun parse_prolog_1/2);
+parse_prolog_1(?STRING("DO") = Bytes, State) ->
+    cf(Bytes, State, fun parse_prolog_1/2);
+parse_prolog_1(?STRING("DOC") = Bytes, State) ->
+    cf(Bytes, State, fun parse_prolog_1/2);
+parse_prolog_1(?STRING("DOCT") = Bytes, State) ->
+    cf(Bytes, State, fun parse_prolog_1/2);
+parse_prolog_1(?STRING("DOCTY") = Bytes, State) ->
+    cf(Bytes, State, fun parse_prolog_1/2);
+parse_prolog_1(?STRING("DOCTYP") = Bytes, State) ->
+    cf(Bytes, State, fun parse_prolog_1/2);
 parse_prolog_1(?STRING_REST("DOCTYPE", Rest), State) ->
     {Rest1, State1} = parse_doctype(Rest, State),
     State2 = event_callback(endDTD, State1),
@@ -512,10 +512,10 @@ parse_ns_name(Bytes, State, Prefix, Name) ->
 %%----------------------------------------------------------------------
 parse_pi_data(?STRING_EMPTY, State, Acc) ->
     cf(?STRING_EMPTY, State, Acc, fun parse_pi_data/3);
-parse_pi_data(?STRING("?"), State, Acc) ->
-    cf(?STRING("?"), State, Acc, fun parse_pi_data/3);
-parse_pi_data(?STRING("\r"), State, Acc) ->
-    cf(?STRING("\r"), State, Acc, fun parse_pi_data/3);
+parse_pi_data(?STRING("?") = Bytes, State, Acc) ->
+    cf(Bytes, State, Acc, fun parse_pi_data/3);
+parse_pi_data(?STRING("\r") = Bytes, State, Acc) ->
+    cf(Bytes, State, Acc, fun parse_pi_data/3);
 parse_pi_data(?STRING_REST("?>", Rest), State, Acc) ->
     {lists:reverse(Acc), Rest, State};
 parse_pi_data(?STRING_REST("\n", Rest), #xmerl_sax_parser_state{line_no=N} = State, Acc) ->
@@ -544,23 +544,23 @@ parse_pi_data(Bytes, State, Acc) ->
 %%----------------------------------------------------------------------
 parse_cdata(?STRING_EMPTY, State) -> 
     cf(?STRING_EMPTY, State, fun parse_cdata/2);
-parse_cdata(?STRING("["), State) -> 
-    cf(?STRING("["), State, fun parse_cdata/2);
-parse_cdata(?STRING("[C"), State) -> 
-    cf(?STRING("[C"), State, fun parse_cdata/2);
-parse_cdata(?STRING("[CD"), State) -> 
-    cf(?STRING("[CD"), State, fun parse_cdata/2);
-parse_cdata(?STRING("[CDA"), State) -> 
-    cf(?STRING("[CDA"), State, fun parse_cdata/2);
-parse_cdata(?STRING("[CDAT"), State) -> 
-    cf(?STRING("[CDAT"), State, fun parse_cdata/2);
-parse_cdata(?STRING("[CDATA"), State) -> 
-    cf(?STRING("[CDATA"), State, fun parse_cdata/2);
-parse_cdata(?STRING_REST("[CDATA[", Rest), State) -> 
-    State1 = event_callback(startCDATA, State),	    
+parse_cdata(?STRING("[") = Bytes, State) ->
+    cf(Bytes, State, fun parse_cdata/2);
+parse_cdata(?STRING("[C") = Bytes, State) ->
+    cf(Bytes, State, fun parse_cdata/2);
+parse_cdata(?STRING("[CD") = Bytes, State) ->
+    cf(Bytes, State, fun parse_cdata/2);
+parse_cdata(?STRING("[CDA") = Bytes, State) ->
+    cf(Bytes, State, fun parse_cdata/2);
+parse_cdata(?STRING("[CDAT") = Bytes, State) ->
+    cf(Bytes, State, fun parse_cdata/2);
+parse_cdata(?STRING("[CDATA") = Bytes, State) ->
+    cf(Bytes, State, fun parse_cdata/2);
+parse_cdata(?STRING_REST("[CDATA[", Rest), State) ->
+    State1 = event_callback(startCDATA, State),	   
     parse_cdata(Rest, State1, []);
-parse_cdata(Bytes, State) -> 
-    unicode_incomplete_check([Bytes, State, fun parse_cdata/2], 
+parse_cdata(Bytes, State) ->
+    unicode_incomplete_check([Bytes, State, fun parse_cdata/2],
 			     "expecting comment or CDATA").
 
 
@@ -574,12 +574,12 @@ parse_cdata(Bytes, State) ->
 %%----------------------------------------------------------------------
 parse_cdata(?STRING_EMPTY, State, Acc) -> 
     cf(?STRING_EMPTY, State, Acc, fun parse_cdata/3);
-parse_cdata(?STRING("\r"), State, Acc) -> 
-    cf(?STRING("\r"), State, Acc, fun parse_cdata/3);
-parse_cdata(?STRING("]"), State, Acc) -> 
-    cf(?STRING("]"), State, Acc, fun parse_cdata/3);
-parse_cdata(?STRING("]]"), State, Acc) -> 
-    cf(?STRING("]]"), State, Acc, fun parse_cdata/3);
+parse_cdata(?STRING("\r") = Bytes, State, Acc) -> 
+    cf(Bytes, State, Acc, fun parse_cdata/3);
+parse_cdata(?STRING("]") = Bytes, State, Acc) -> 
+    cf(Bytes, State, Acc, fun parse_cdata/3);
+parse_cdata(?STRING("]]") = Bytes, State, Acc) -> 
+    cf(Bytes, State, Acc, fun parse_cdata/3);
 parse_cdata(?STRING_REST("]]>", Rest), State, Acc) -> 
     State1 = event_callback({characters, lists:reverse(Acc)}, State),   
     State2 = event_callback(endCDATA, State1),	    
@@ -610,12 +610,12 @@ parse_cdata(Bytes, State, Acc) ->
 %%----------------------------------------------------------------------
 parse_comment(?STRING_EMPTY, State, Acc) -> 
     cf(?STRING_EMPTY, State, Acc, fun parse_comment/3);
-parse_comment(?STRING("\r"), State, Acc) -> 
-    cf(?STRING("\r"), State, Acc, fun parse_comment/3);
-parse_comment(?STRING("-"), State, Acc) -> 
-    cf(?STRING("-"), State, Acc, fun parse_comment/3);
-parse_comment(?STRING("--"), State, Acc) -> 
-    cf(?STRING("--"), State, Acc, fun parse_comment/3);
+parse_comment(?STRING("\r") = Bytes, State, Acc) -> 
+    cf(Bytes, State, Acc, fun parse_comment/3);
+parse_comment(?STRING("-") = Bytes, State, Acc) -> 
+    cf(Bytes, State, Acc, fun parse_comment/3);
+parse_comment(?STRING("--") = Bytes, State, Acc) -> 
+    cf(Bytes, State, Acc, fun parse_comment/3);
 parse_comment(?STRING_REST("-->", Rest), State, Acc) -> 
     State1 = event_callback({comment, lists:reverse(Acc)}, State),   
     {Rest, State1};
@@ -713,8 +713,8 @@ parse_stag(Bytes, State) ->
 %%----------------------------------------------------------------------
 parse_attributes(?STRING_EMPTY, State, CurrentTag) ->
     cf(?STRING_EMPTY, State, CurrentTag, fun parse_attributes/3);
-parse_attributes(?STRING("/"), State, CurrentTag) -> 
-    cf(?STRING("/"), State, CurrentTag, fun parse_attributes/3);
+parse_attributes(?STRING("/") = Bytes, State, CurrentTag) -> 
+    cf(Bytes, State, CurrentTag, fun parse_attributes/3);
 parse_attributes(?STRING_REST("/>", Rest), State, {Tag, AttList, NewNsList}) ->
     CompleteNsList =  NewNsList ++ State#xmerl_sax_parser_state.ns,
     {Uri, LocalName, QName, Attributes} = fix_ns(Tag, AttList, CompleteNsList),
@@ -911,20 +911,20 @@ parse_att_value(?STRING_EMPTY, State, undefined, Acc) ->
     {Acc, [], State}; %% stop clause when parsing references
 parse_att_value(?STRING_EMPTY, State, Stop, Acc) ->
     cf(?STRING_EMPTY, State, Stop, Acc, fun parse_att_value/4);
-parse_att_value(?STRING("\r"), State, Stop, Acc) ->
-    cf(?STRING("\r"), State, Stop, Acc, fun parse_att_value/4);
+parse_att_value(?STRING("\r") = Bytes, State, Stop, Acc) ->
+    cf(Bytes, State, Stop, Acc, fun parse_att_value/4);
 parse_att_value(?STRING_REST("\n", Rest), #xmerl_sax_parser_state{line_no=N} = State, Stop, Acc) -> 
     parse_att_value(Rest, 
-		   State#xmerl_sax_parser_state{line_no=N+1}, Stop, [?space |Acc]);
+		    State#xmerl_sax_parser_state{line_no=N+1}, Stop, [?space |Acc]);
 parse_att_value(?STRING_REST("\r\n", Rest), #xmerl_sax_parser_state{line_no=N} = State, Stop, Acc) -> 
     parse_att_value(Rest, 
-		   State#xmerl_sax_parser_state{line_no=N+1}, Stop, [?space |Acc]);
+		    State#xmerl_sax_parser_state{line_no=N+1}, Stop, [?space |Acc]);
 parse_att_value(?STRING_REST("\r", Rest), #xmerl_sax_parser_state{line_no=N} = State, Stop, Acc)  -> 
     parse_att_value(Rest, 
-		   State#xmerl_sax_parser_state{line_no=N+1}, Stop, [?space |Acc]);
+		    State#xmerl_sax_parser_state{line_no=N+1}, Stop, [?space |Acc]);
 parse_att_value(?STRING_REST("\t", Rest), #xmerl_sax_parser_state{line_no=N} = State, Stop, Acc)  -> 
     parse_att_value(Rest, 
-		   State#xmerl_sax_parser_state{line_no=N+1}, Stop, [?space |Acc]);
+		    State#xmerl_sax_parser_state{line_no=N+1}, Stop, [?space |Acc]);
 parse_att_value(?STRING_REST("&", Rest), State, Stop, Acc)  -> 
     {Ref, Rest1, State1} = parse_reference(Rest, State, true),
     case Ref of 
@@ -1046,17 +1046,17 @@ parse_content(?STRING_EMPTY, State, Acc, IgnorableWS) ->
 	Other ->
 	    throw(Other)
     end;
-parse_content(?STRING("\r"), State, Acc, IgnorableWS) ->
-    cf(?STRING("\r"), State, Acc, IgnorableWS, fun parse_content/4);
-parse_content(?STRING("<"), State, Acc, IgnorableWS) ->	
-    cf(?STRING("<"), State, Acc, IgnorableWS, fun parse_content/4);
+parse_content(?STRING("\r") = Bytes, State, Acc, IgnorableWS) ->
+    cf(Bytes, State, Acc, IgnorableWS, fun parse_content/4);
+parse_content(?STRING("<") = Bytes, State, Acc, IgnorableWS) ->	
+    cf(Bytes, State, Acc, IgnorableWS, fun parse_content/4);
 parse_content(?STRING_REST("</", Rest), State, Acc, IgnorableWS) ->
     State1 = send_character_event(length(Acc), IgnorableWS, lists:reverse(Acc), State),
     parse_etag(Rest, State1);
-parse_content(?STRING("<!"), State, _Acc, IgnorableWS) ->
-    cf(?STRING("<!"), State, [], IgnorableWS, fun parse_content/4);
-parse_content(?STRING("<!-"), State, _Acc, IgnorableWS) ->
-    cf(?STRING("<!-"), State, [], IgnorableWS, fun parse_content/4);
+parse_content(?STRING("<!") = Bytes, State, _Acc, IgnorableWS) ->
+    cf(Bytes, State, [], IgnorableWS, fun parse_content/4);
+parse_content(?STRING("<!-") = Bytes, State, _Acc, IgnorableWS) ->
+    cf(Bytes, State, [], IgnorableWS, fun parse_content/4);
 parse_content(?STRING_REST("<!--", Rest), State, Acc, IgnorableWS) ->
     State1 = send_character_event(length(Acc), IgnorableWS, lists:reverse(Acc), State),
     {Rest1, State2} = parse_comment(Rest, State1, []),
@@ -1227,8 +1227,8 @@ whitespace(Bytes, #xmerl_sax_parser_state{encoding=Enc} = State, Acc) when is_bi
 %%----------------------------------------------------------------------
 parse_reference(?STRING_EMPTY, State, HaveToExist) ->
     cf(?STRING_EMPTY, State, HaveToExist, fun parse_reference/3);
-parse_reference(?STRING("#"), State, HaveToExist) -> 
-    cf(?STRING("#"), State, HaveToExist, fun parse_reference/3);
+parse_reference(?STRING("#") = Bytes, State, HaveToExist) -> 
+    cf(Bytes, State, HaveToExist, fun parse_reference/3);
 parse_reference(?STRING_REST("#x", Rest), State, _HaveToExist) ->
     {CharValue, RefString, Rest1, State1} = parse_hex(Rest, State, []),
     if 
@@ -1702,16 +1702,16 @@ parse_external_entity_1(?BYTE_ORDER_MARK_2, State) ->
     cf(?BYTE_ORDER_MARK_2, State, fun parse_external_entity_1/2);
 parse_external_entity_1(?BYTE_ORDER_MARK_REST(Rest), State) ->
     parse_external_entity_1(Rest, State);
-parse_external_entity_1(?STRING("<"), State) ->
-    cf(?STRING("<"), State, fun parse_external_entity_1/2);
-parse_external_entity_1(?STRING("<?"), State) ->
-    cf(?STRING("<?"), State, fun parse_external_entity_1/2);
-parse_external_entity_1(?STRING("<?x"), State) ->
-    cf(?STRING("<?x"), State, fun parse_external_entity_1/2);
-parse_external_entity_1(?STRING("<?xm"), State) ->
-    cf(?STRING("<?xm"), State, fun parse_external_entity_1/2);
-parse_external_entity_1(?STRING("<?xml"), State) ->
-    cf(?STRING("<?xml"), State, fun parse_external_entity_1/2);
+parse_external_entity_1(?STRING("<") = Bytes, State) ->
+    cf(Bytes, State, fun parse_external_entity_1/2);
+parse_external_entity_1(?STRING("<?") = Bytes, State) ->
+    cf(Bytes, State, fun parse_external_entity_1/2);
+parse_external_entity_1(?STRING("<?x") = Bytes, State) ->
+    cf(Bytes, State, fun parse_external_entity_1/2);
+parse_external_entity_1(?STRING("<?xm") = Bytes, State) ->
+    cf(Bytes, State, fun parse_external_entity_1/2);
+parse_external_entity_1(?STRING("<?xml") = Bytes, State) ->
+    cf(Bytes, State, fun parse_external_entity_1/2);
 parse_external_entity_1(?STRING_REST("<?xml", Rest) = Bytes, 
 			#xmerl_sax_parser_state{file_type=Type} = State) ->   
     {Rest1, State1} = 
@@ -1781,29 +1781,29 @@ is_next_char_whitespace(Bytes, State) ->
 %%----------------------------------------------------------------------
 parse_external_id(?STRING_EMPTY, State, OptionalSystemId) ->
     cf(?STRING_EMPTY, State, OptionalSystemId, fun parse_external_id/3);
-parse_external_id(?STRING("S"), State,OptionalSystemId) ->
-    cf(?STRING("S"), State, OptionalSystemId, fun parse_external_id/3);
-parse_external_id(?STRING("SY"), State, OptionalSystemId) ->
-    cf(?STRING("SY"), State, OptionalSystemId, fun parse_external_id/3);
-parse_external_id(?STRING("SYS"), State, OptionalSystemId) ->
-    cf(?STRING("SYS"), State, OptionalSystemId, fun parse_external_id/3);
-parse_external_id(?STRING("SYST"), State, OptionalSystemId) ->
-    cf(?STRING("SYST"), State, OptionalSystemId, fun parse_external_id/3);
-parse_external_id(?STRING("SYSTE"), State, OptionalSystemId) ->
-    cf(?STRING("SYSTE"), State, OptionalSystemId, fun parse_external_id/3);
+parse_external_id(?STRING("S") = Bytes, State,OptionalSystemId) ->
+    cf(Bytes, State, OptionalSystemId, fun parse_external_id/3);
+parse_external_id(?STRING("SY") = Bytes, State, OptionalSystemId) ->
+    cf(Bytes, State, OptionalSystemId, fun parse_external_id/3);
+parse_external_id(?STRING("SYS") = Bytes, State, OptionalSystemId) ->
+    cf(Bytes, State, OptionalSystemId, fun parse_external_id/3);
+parse_external_id(?STRING("SYST") = Bytes, State, OptionalSystemId) ->
+    cf(Bytes, State, OptionalSystemId, fun parse_external_id/3);
+parse_external_id(?STRING("SYSTE") = Bytes, State, OptionalSystemId) ->
+    cf(Bytes, State, OptionalSystemId, fun parse_external_id/3);
 parse_external_id(?STRING_REST("SYSTEM", Rest), State, _) ->
     {SysId, Rest1, State1} = parse_system_id(Rest, State, false),
     {"", SysId, Rest1, State1};
-parse_external_id(?STRING("P"), State, OptionalSystemId) ->
-    cf(?STRING("P"), State, OptionalSystemId, fun parse_external_id/3);
-parse_external_id(?STRING("PU"), State, OptionalSystemId) ->
-    cf(?STRING("PU"), State, OptionalSystemId, fun parse_external_id/3);
-parse_external_id(?STRING("PUB"), State, OptionalSystemId) ->
-    cf(?STRING("PUB"), State, OptionalSystemId, fun parse_external_id/3);
-parse_external_id(?STRING("PUBL"), State, OptionalSystemId) ->
-    cf(?STRING("PUBL"), State, OptionalSystemId, fun parse_external_id/3);
-parse_external_id(?STRING("PUBLI"), State, OptionalSystemId) ->
-    cf(?STRING("PUBLI"), State, OptionalSystemId, fun parse_external_id/3);
+parse_external_id(?STRING("P") = Bytes, State, OptionalSystemId) ->
+    cf(Bytes, State, OptionalSystemId, fun parse_external_id/3);
+parse_external_id(?STRING("PU") = Bytes, State, OptionalSystemId) ->
+    cf(Bytes, State, OptionalSystemId, fun parse_external_id/3);
+parse_external_id(?STRING("PUB") = Bytes, State, OptionalSystemId) ->
+    cf(Bytes, State, OptionalSystemId, fun parse_external_id/3);
+parse_external_id(?STRING("PUBL") = Bytes, State, OptionalSystemId) ->
+    cf(Bytes, State, OptionalSystemId, fun parse_external_id/3);
+parse_external_id(?STRING("PUBLI") = Bytes, State, OptionalSystemId) ->
+    cf(Bytes, State, OptionalSystemId, fun parse_external_id/3);
 parse_external_id(?STRING_REST("PUBLIC", Rest), State, OptionalSystemId) ->
     parse_public_id(Rest, State, OptionalSystemId);
 parse_external_id(Bytes, State, OptionalSystemId) ->
@@ -1923,70 +1923,70 @@ parse_doctype_decl(Bytes, State) ->
 parse_doctype_decl_1(?STRING_EMPTY, State) ->
     cf(?STRING_EMPTY, State, fun parse_doctype_decl_1/2);
 
-parse_doctype_decl_1(?STRING("E"), State) ->
-    cf(?STRING("E"), State, fun parse_doctype_decl_1/2);
-parse_doctype_decl_1(?STRING("EL"), State) ->
-    cf(?STRING("EL"), State, fun parse_doctype_decl_1/2);
-parse_doctype_decl_1(?STRING("ELE"), State) ->
-    cf(?STRING("ELE"), State, fun parse_doctype_decl_1/2);
-parse_doctype_decl_1(?STRING("ELEM"), State) ->
-    cf(?STRING("ELEM"), State, fun parse_doctype_decl_1/2);
-parse_doctype_decl_1(?STRING("ELEME"), State) ->
-    cf(?STRING("ELEME"), State, fun parse_doctype_decl_1/2);
-parse_doctype_decl_1(?STRING("ELEMEN"), State) ->
-    cf(?STRING("ELEMEN"), State, fun parse_doctype_decl_1/2);
+parse_doctype_decl_1(?STRING("E") = Bytes, State) ->
+    cf(Bytes, State, fun parse_doctype_decl_1/2);
+parse_doctype_decl_1(?STRING("EL") = Bytes, State) ->
+    cf(Bytes, State, fun parse_doctype_decl_1/2);
+parse_doctype_decl_1(?STRING("ELE") = Bytes, State) ->
+    cf(Bytes, State, fun parse_doctype_decl_1/2);
+parse_doctype_decl_1(?STRING("ELEM") = Bytes, State) ->
+    cf(Bytes, State, fun parse_doctype_decl_1/2);
+parse_doctype_decl_1(?STRING("ELEME") = Bytes, State) ->
+    cf(Bytes, State, fun parse_doctype_decl_1/2);
+parse_doctype_decl_1(?STRING("ELEMEN") = Bytes, State) ->
+    cf(Bytes, State, fun parse_doctype_decl_1/2);
 parse_doctype_decl_1(?STRING_REST("ELEMENT", Rest), State) ->
     {Rest1, State1} = parse_element_decl(Rest, State),
     parse_doctype_decl(Rest1, State1);
 
-parse_doctype_decl_1(?STRING("A"), State) ->
-    cf(?STRING("A"), State, fun parse_doctype_decl_1/2);
-parse_doctype_decl_1(?STRING("AT"), State) ->
-    cf(?STRING("AT"), State, fun parse_doctype_decl_1/2);
-parse_doctype_decl_1(?STRING("ATT"), State) ->
-    cf(?STRING("ATT"), State, fun parse_doctype_decl_1/2);
-parse_doctype_decl_1(?STRING("ATTL"), State) ->
-    cf(?STRING("ATTL"), State, fun parse_doctype_decl_1/2);
-parse_doctype_decl_1(?STRING("ATTLI"), State) ->
-    cf(?STRING("ATTLI"), State, fun parse_doctype_decl_1/2);
-parse_doctype_decl_1(?STRING("ATTLIS"), State) ->
-    cf(?STRING("ATTLIS"), State, fun parse_doctype_decl_1/2);
+parse_doctype_decl_1(?STRING("A") = Bytes, State) ->
+    cf(Bytes, State, fun parse_doctype_decl_1/2);
+parse_doctype_decl_1(?STRING("AT") = Bytes, State) ->
+    cf(Bytes, State, fun parse_doctype_decl_1/2);
+parse_doctype_decl_1(?STRING("ATT") = Bytes, State) ->
+    cf(Bytes, State, fun parse_doctype_decl_1/2);
+parse_doctype_decl_1(?STRING("ATTL") = Bytes, State) ->
+    cf(Bytes, State, fun parse_doctype_decl_1/2);
+parse_doctype_decl_1(?STRING("ATTLI") = Bytes, State) ->
+    cf(Bytes, State, fun parse_doctype_decl_1/2);
+parse_doctype_decl_1(?STRING("ATTLIS") = Bytes, State) ->
+    cf(Bytes, State, fun parse_doctype_decl_1/2);
 parse_doctype_decl_1(?STRING_REST("ATTLIST", Rest), State) ->
     {Rest1, State1} = parse_att_list_decl(Rest, State),
     parse_doctype_decl(Rest1, State1);
 
 %% E clause not needed here because already taken care of above.
-parse_doctype_decl_1(?STRING("EN"), State) ->
-    cf(?STRING("EN"), State, fun parse_doctype_decl_1/2);
-parse_doctype_decl_1(?STRING("ENT"), State) ->
-    cf(?STRING("ENT"), State, fun parse_doctype_decl_1/2);
-parse_doctype_decl_1(?STRING("ENTI"), State) ->
-    cf(?STRING("ENTI"), State, fun parse_doctype_decl_1/2);
-parse_doctype_decl_1(?STRING("ENTIT"), State) ->
-    cf(?STRING("ENTIT"), State, fun parse_doctype_decl_1/2);
+parse_doctype_decl_1(?STRING("EN") = Bytes, State) ->
+    cf(Bytes, State, fun parse_doctype_decl_1/2);
+parse_doctype_decl_1(?STRING("ENT") = Bytes, State) ->
+    cf(Bytes, State, fun parse_doctype_decl_1/2);
+parse_doctype_decl_1(?STRING("ENTI") = Bytes, State) ->
+    cf(Bytes, State, fun parse_doctype_decl_1/2);
+parse_doctype_decl_1(?STRING("ENTIT") = Bytes, State) ->
+    cf(Bytes, State, fun parse_doctype_decl_1/2);
 parse_doctype_decl_1(?STRING_REST("ENTITY", Rest), State) ->
     {Rest1, State1} = parse_entity_decl(Rest, State),
     parse_doctype_decl(Rest1, State1);
 
-parse_doctype_decl_1(?STRING("N"), State) ->
-    cf(?STRING("N"), State, fun parse_doctype_decl_1/2);
-parse_doctype_decl_1(?STRING("NO"), State) ->
-    cf(?STRING("NO"), State, fun parse_doctype_decl_1/2);
-parse_doctype_decl_1(?STRING("NOT"), State) ->
-    cf(?STRING("NOT"), State, fun parse_doctype_decl_1/2);
-parse_doctype_decl_1(?STRING("NOTA"), State) ->
-    cf(?STRING("NOTA"), State, fun parse_doctype_decl_1/2);
-parse_doctype_decl_1(?STRING("NOTAT"), State) ->
-    cf(?STRING("NOTAT"), State, fun parse_doctype_decl_1/2);
-parse_doctype_decl_1(?STRING("NOTATI"), State) ->
-    cf(?STRING("NOTATI"), State, fun parse_doctype_decl_1/2);
-parse_doctype_decl_1(?STRING("NOTATIO"), State) ->
-    cf(?STRING("NOTATIO"), State, fun parse_doctype_decl_1/2);
+parse_doctype_decl_1(?STRING("N") = Bytes, State) ->
+    cf(Bytes, State, fun parse_doctype_decl_1/2);
+parse_doctype_decl_1(?STRING("NO") = Bytes, State) ->
+    cf(Bytes, State, fun parse_doctype_decl_1/2);
+parse_doctype_decl_1(?STRING("NOT") = Bytes, State) ->
+    cf(Bytes, State, fun parse_doctype_decl_1/2);
+parse_doctype_decl_1(?STRING("NOTA") = Bytes, State) ->
+    cf(Bytes, State, fun parse_doctype_decl_1/2);
+parse_doctype_decl_1(?STRING("NOTAT") = Bytes, State) ->
+    cf(Bytes, State, fun parse_doctype_decl_1/2);
+parse_doctype_decl_1(?STRING("NOTATI") = Bytes, State) ->
+    cf(Bytes, State, fun parse_doctype_decl_1/2);
+parse_doctype_decl_1(?STRING("NOTATIO") = Bytes, State) ->
+    cf(Bytes, State, fun parse_doctype_decl_1/2);
 parse_doctype_decl_1(?STRING_REST("NOTATION", Rest), State) ->
     {Rest1, State1} = parse_notation_decl(Rest, State),
     parse_doctype_decl(Rest1, State1);
-parse_doctype_decl_1(?STRING("-"), State) ->
-    cf(?STRING("-"), State, fun parse_doctype_decl_1/2);
+parse_doctype_decl_1(?STRING("-") = Bytes, State) ->
+    cf(Bytes, State, fun parse_doctype_decl_1/2);
 parse_doctype_decl_1(?STRING_REST("--", Rest), State) ->
     {Rest1, State1} = parse_comment(Rest, State, []),
     parse_doctype_decl(Rest1, State1);
@@ -2264,52 +2264,52 @@ parse_default_decl(Bytes, State) ->
 %%----------------------------------------------------------------------
 parse_default_decl_1(?STRING_EMPTY, State) ->
     cf(?STRING_EMPTY, State, fun parse_default_decl_1/2);
-parse_default_decl_1(?STRING_REST("#", Rest), State) ->
-    case Rest of
-	?STRING("R") ->
-	    cf(Rest, State, fun parse_default_decl_1/2);
-	?STRING("RE") ->
-	    cf(Rest, State, fun parse_default_decl_1/2);
-	?STRING("REQ") ->
-	    cf(Rest, State, fun parse_default_decl_1/2);
-	?STRING("REQU") ->
-	    cf(Rest, State, fun parse_default_decl_1/2);
-	?STRING("REQUI") ->
-	    cf(Rest, State, fun parse_default_decl_1/2);
-	?STRING("REQUIR") ->
-	    cf(Rest, State, fun parse_default_decl_1/2);
-	?STRING("REQUIRE") ->
-	    cf(Rest, State, fun parse_default_decl_1/2);
-	?STRING_REST("REQUIRED", Rest1) ->
+parse_default_decl_1(?STRING_REST("#", _Rest) = Bytes, State) ->
+    case Bytes of
+	?STRING("#R") ->
+	    cf(Bytes, State, fun parse_default_decl_1/2);
+	?STRING("#RE") ->
+	    cf(Bytes, State, fun parse_default_decl_1/2);
+	?STRING("#REQ") ->
+	    cf(Bytes, State, fun parse_default_decl_1/2);
+	?STRING("#REQU") ->
+	    cf(Bytes, State, fun parse_default_decl_1/2);
+	?STRING("#REQUI") ->
+	    cf(Bytes, State, fun parse_default_decl_1/2);
+	?STRING("#REQUIR") ->
+	    cf(Bytes, State, fun parse_default_decl_1/2);
+	?STRING("#REQUIRE") ->
+	    cf(Bytes, State, fun parse_default_decl_1/2);
+	?STRING_REST("#REQUIRED", Rest1) ->
 	    {"#REQUIRED", undefined, Rest1, State};
 
-	?STRING("I") ->
-	    cf(Rest, State, fun parse_default_decl_1/2);
-	?STRING("IM") ->
-	    cf(Rest, State, fun parse_default_decl_1/2);
-	?STRING("IMP") ->
-	    cf(Rest, State, fun parse_default_decl_1/2);
-	?STRING("IMPL") ->
-	    cf(Rest, State, fun parse_default_decl_1/2);
-	?STRING("IMPLI") ->
-	    cf(Rest, State, fun parse_default_decl_1/2);
-	?STRING("IMPLIE") ->
-	    cf(Rest, State, fun parse_default_decl_1/2);
-	?STRING_REST("IMPLIED", Rest1)  ->
+	?STRING("#I") ->
+	    cf(Bytes, State, fun parse_default_decl_1/2);
+	?STRING("#IM") ->
+	    cf(Bytes, State, fun parse_default_decl_1/2);
+	?STRING("#IMP") ->
+	    cf(Bytes, State, fun parse_default_decl_1/2);
+	?STRING("#IMPL") ->
+	    cf(Bytes, State, fun parse_default_decl_1/2);
+	?STRING("#IMPLI") ->
+	    cf(Bytes, State, fun parse_default_decl_1/2);
+	?STRING("#IMPLIE") ->
+	    cf(Bytes, State, fun parse_default_decl_1/2);
+	?STRING_REST("#IMPLIED", Rest1)  ->
 	    {"#IMPLIED", undefined, Rest1, State};
 
-	?STRING("F") ->
-	    cf(Rest, State, fun parse_default_decl_1/2);
-	?STRING("FI") ->
-	    cf(Rest, State, fun parse_default_decl_1/2);
-	?STRING("FIX") ->
-	    cf(Rest, State, fun parse_default_decl_1/2);
-	?STRING("FIXE") ->
-	    cf(Rest, State, fun parse_default_decl_1/2);
-	?STRING_REST("FIXED", Rest1)  ->
+	?STRING("#F") ->
+	    cf(Bytes, State, fun parse_default_decl_1/2);
+	?STRING("#FI") ->
+	    cf(Bytes, State, fun parse_default_decl_1/2);
+	?STRING("#FIX") ->
+	    cf(Bytes, State, fun parse_default_decl_1/2);
+	?STRING("#FIXE") ->
+	    cf(Bytes, State, fun parse_default_decl_1/2);
+	?STRING_REST("#FIXED", Rest1)  ->
 	    parse_fixed(Rest1, State);
 	_  ->
-	    ?fatal_error(State, "REQUIRED, IMPLIED or FIXED expected")
+	    ?fatal_error(State, "REQUIRED, IMPLIED or FIXED expected after #")
     end;
 parse_default_decl_1(?STRING_UNBOUND_REST(C, Rest), State) when C == $'; C == $" ->
     {DefaultValue, Rest1, State1} = parse_att_value(Rest, State, C, []),
@@ -2560,14 +2560,14 @@ parse_ndata_decl(?STRING_EMPTY, State) ->
     cf(?STRING_EMPTY, State, fun parse_ndata_decl/2);
 parse_ndata_decl(?STRING_REST(">", Rest), State) ->
     {undefined, Rest, State};
-parse_ndata_decl(?STRING("N") = Rest, State) ->
-    cf(Rest, State, fun parse_ndata_decl/2);
-parse_ndata_decl(?STRING("ND") = Rest, State) ->
-    cf(Rest, State, fun parse_ndata_decl/2);
-parse_ndata_decl(?STRING("NDA") = Rest, State) ->
-    cf(Rest, State, fun parse_ndata_decl/2);
-parse_ndata_decl(?STRING("NDAT") = Rest, State) ->
-    cf(Rest, State, fun parse_ndata_decl/2);
+parse_ndata_decl(?STRING("N") = Bytes, State) ->
+    cf(Bytes, State, fun parse_ndata_decl/2);
+parse_ndata_decl(?STRING("ND") = Bytes, State) ->
+    cf(Bytes, State, fun parse_ndata_decl/2);
+parse_ndata_decl(?STRING("NDA") = Bytes, State) ->
+    cf(Bytes, State, fun parse_ndata_decl/2);
+parse_ndata_decl(?STRING("NDAT") = Bytes, State) ->
+    cf(Bytes, State, fun parse_ndata_decl/2);
 parse_ndata_decl(?STRING_REST("NDATA", Rest), State) ->
     parse_ndata_decl_1(Rest, State);
 parse_ndata_decl(Bytes, State) ->