From 8a0e62c1e8c01dbecf70fb4317f00ad50e9f6051 Mon Sep 17 00:00:00 2001
From: Anthony Ramine <nox@dev-extend.eu>
Date: Mon, 20 Dec 2010 17:03:15 +0100
Subject: Fix namespace-conformance constraints

See [Namespaces in XML 1.0 (Third Edition)][1]:
> The prefix xml is by definition bound to the namespace name
> http://www.w3.org/XML/1998/namespace. It MAY, but need not, be
> declared, and MUST NOT be bound to any other namespace name. Other
> prefixes MUST NOT be bound to this namespace name, and it MUST NOT be
> declared as the default namespace.
>
> The prefix xmlns is used only to declare namespace bindings and is by
> definition bound to the namespace name http://www.w3.org/2000/xmlns/.
> It MUST NOT be declared . Other prefixes MUST NOT be bound to this
> namespace name, and it MUST NOT be declared as the default namespace.
> Element names MUST NOT have the prefix xmlns.
>
> In XML documents conforming to this specification, no tag may containe
> two attributes which have identical names, or have qualified names
> with the same local part and with prefixes which have been bound to
> namespace names that are identical.

[1] http://www.w3.org/TR/REC-xml-names/
---
 lib/xmerl/src/xmerl_scan.erl | 54 ++++++++++++++++++++++++++++++++++++--------
 1 file changed, 44 insertions(+), 10 deletions(-)

(limited to 'lib/xmerl')

diff --git a/lib/xmerl/src/xmerl_scan.erl b/lib/xmerl/src/xmerl_scan.erl
index 25c6547497..6855097089 100644
--- a/lib/xmerl/src/xmerl_scan.erl
+++ b/lib/xmerl/src/xmerl_scan.erl
@@ -1981,7 +1981,7 @@ scan_element(T, S, Pos) ->
 scan_element(T, S=#xmerl_scanner{line=L,col=C},
 	     Pos, SpaceDefault,Lang, Parents, NS) ->
     {Name, NamespaceInfo, T1, S1} = scan_name(T, S),
-    vc_Element_valid(Name,S),
+    vc_Element_valid(Name,NamespaceInfo,S),
     ?strip2,
     scan_element(T2, S2, Pos, Name, L, C, _Attrs = [], 
 		 Lang, Parents, NamespaceInfo, NS, 
@@ -2016,7 +2016,8 @@ scan_element("/>" ++ T, S0 = #xmerl_scanner{hook_fun = Hook,
     Attrs = lists:reverse(Attrs0),
     E=processed_whole_element(S, Pos, Name, Attrs, Lang, Parents,NSI,Namespace),
     
-    wfc_unique_att_spec(Attrs,S),
+    #xmlElement{attributes = Attrs1} = E,
+    wfc_unique_att_spec(Attrs1,S),
     S1 = #xmerl_scanner{} = Event(#xmerl_event{event = ended,
 					       line = L,
 					       col = C,
@@ -2088,7 +2089,7 @@ scan_element(T, S, Pos, Name, StartL, StartC, Attrs, Lang, Parents,
     Attr = #xmlAttribute{name = AttName, 
 			 pos = AttrPos,
 			 language = Lang,
-			 namespace = NamespaceInfo,
+			 nsinfo = NamespaceInfo,
 			 value = AttValue,
 			 normalized = IsNorm},
     XMLBase=if
@@ -2155,7 +2156,7 @@ processed_whole_element(S=#xmerl_scanner{hook_fun = _Hook,
 		    [A#xmlAttribute{
 		       expanded_name=expanded_name(
 				       A#xmlAttribute.name, 
-				       A#xmlAttribute.namespace,
+				       A#xmlAttribute.nsinfo,
 						% NSI,
 				       TempNamespace, S)} || A <- Attrs],
 		{expanded_name(Name, NSI, Namespace, S), ExpAttrsX};
@@ -2194,10 +2195,32 @@ check_namespace(_, _, _, NS) ->
 
 expanded_name(Name, [], #xmlNamespace{default = []}, _S) ->
     Name;
-expanded_name(Name, [], #xmlNamespace{default = URI}, _S) ->
-    {URI, Name};
-expanded_name(_Name, {"xmlns", Local}, _NS, _S) -> % CHECK THIS /JB
-    {"xmlns",Local};
+expanded_name(Name, [], #xmlNamespace{default = URI}, S) ->
+    case URI of
+	'http://www.w3.org/XML/1998/namespace' ->
+	    ?fatal(cannot_bind_default_namespace_to_xml_namespace_name, S);
+	'http://www.w3.org/2000/xmlns/' ->
+	    ?fatal(cannot_bind_default_namespace_to_xmlns_namespace_name, S);
+	_ ->
+	    {URI, Name}
+    end;
+expanded_name(Name, N = {"xmlns", Local}, #xmlNamespace{nodes = Ns}, S) ->
+    {_, Value} = lists:keyfind(Local, 1, Ns),
+    case Name of
+	'xmlns:xml' when Value =/= 'http://www.w3.org/XML/1998/namespace' ->
+	    ?fatal({xml_prefix_cannot_be_redeclared, Value}, S);
+	'xmlns:xmlns' ->
+	    ?fatal({xmlns_prefix_cannot_be_declared, Value}, S);
+	_ ->
+	    case Value of
+		'http://www.w3.org/XML/1998/namespace' ->
+		    ?fatal({cannot_bind_prefix_to_xml_namespace, Local}, S);
+		'http://www.w3.org/2000/xmlns/' ->
+		    ?fatal({cannot_bind_prefix_to_xmlns_namespace, Local}, S);
+		_ ->
+		    N
+	    end
+    end;
 expanded_name(_Name, {Prefix, Local}, #xmlNamespace{nodes = Ns}, S) ->
     case lists:keysearch(Prefix, 1, Ns) of
 	{value, {_, URI}} ->
@@ -3259,12 +3282,18 @@ mandatory_delimeter_wfc(T,S) ->
 
 wfc_unique_att_spec([],_S) ->
     ok;
-wfc_unique_att_spec([#xmlAttribute{name=N}|Atts],S) ->
+wfc_unique_att_spec([#xmlAttribute{name=N,expanded_name=EN}|Atts],S) ->
     case lists:keymember(N,#xmlAttribute.name,Atts) of
 	true ->
 	    ?fatal({error,{unique_att_spec_required,N}},S);
 	_ ->
-	    wfc_unique_att_spec(Atts,S)
+	    case S#xmerl_scanner.namespace_conformant andalso
+		    lists:keymember(EN, #xmlAttribute.expanded_name, Atts) of
+		true ->
+		    ?fatal({error,{unique_att_spec_required,EN}},S);
+		_ ->
+		    wfc_unique_att_spec(Atts,S)
+	    end
     end.
 
 wfc_legal_char(Chars,S) when is_list(Chars)->
@@ -3313,6 +3342,11 @@ wfc_Internal_parsed_entity(internal,Value,S) ->
 wfc_Internal_parsed_entity(_,_,_) ->
     ok.
 
+vc_Element_valid(_Name, {"xmlns", _},
+		 S = #xmerl_scanner{namespace_conformant = true}) ->
+    ?fatal({error,{illegal_element_prefix,xmlns}},S);
+vc_Element_valid(Name, _, S) ->
+    vc_Element_valid(Name, S).
 
 vc_Element_valid(_Name,#xmerl_scanner{environment=internal_parsed_entity}) ->
     ok;
-- 
cgit v1.2.3


From 5d3feb918409696bf375ccf1ab6e67f027e3aa6e Mon Sep 17 00:00:00 2001
From: Anthony Ramine <nox@dev-extend.eu>
Date: Tue, 7 Dec 2010 19:30:36 +0100
Subject: Set `vsn` field in `#xmlDecl` record

---
 lib/xmerl/src/xmerl_scan.erl | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib/xmerl')

diff --git a/lib/xmerl/src/xmerl_scan.erl b/lib/xmerl/src/xmerl_scan.erl
index 6855097089..ad6fa7d2b9 100644
--- a/lib/xmerl/src/xmerl_scan.erl
+++ b/lib/xmerl/src/xmerl_scan.erl
@@ -789,7 +789,8 @@ scan_xml_decl(T, S) ->
     Attr = #xmlAttribute{name = version,
 			 parents = [{xml, _XMLPos = 1}],
 			 value = Vsn},
-    scan_xml_decl(T4, S4, #xmlDecl{attributes = [Attr]}).
+    scan_xml_decl(T4, S4, #xmlDecl{vsn = Vsn,
+				   attributes = [Attr]}).
 
 scan_xml_decl([], S=#xmerl_scanner{continuation_fun = F}, Decl) ->
     ?dbg("cont()...~n", []),
-- 
cgit v1.2.3


From 2b11547e61112b102a02de6b30c11c37e34ca21b Mon Sep 17 00:00:00 2001
From: Anthony Ramine <nox@dev-extend.eu>
Date: Tue, 7 Dec 2010 14:23:01 +0100
Subject: Track parents in `#xmlPI` nodes

---
 lib/xmerl/include/xmerl.hrl  |  7 +++---
 lib/xmerl/src/xmerl_lib.erl  |  3 ++-
 lib/xmerl/src/xmerl_scan.erl | 56 ++++++++++++++++++++++++--------------------
 3 files changed, 37 insertions(+), 29 deletions(-)

(limited to 'lib/xmerl')

diff --git a/lib/xmerl/include/xmerl.hrl b/lib/xmerl/include/xmerl.hrl
index 7bb3f4de9b..fb9b00c73c 100644
--- a/lib/xmerl/include/xmerl.hrl
+++ b/lib/xmerl/include/xmerl.hrl
@@ -103,9 +103,10 @@
 
 %% processing instruction
 -record(xmlPI,{
-	  name,	% atom()
-	  pos,	% integer()
-	  value	% IOlist()
+	  name,		% atom()
+	  parents = [],	% [{atom(),integer()}]
+	  pos,		% integer()
+	  value		% IOlist()
 	 }).
 
 -record(xmlDocument,{
diff --git a/lib/xmerl/src/xmerl_lib.erl b/lib/xmerl/src/xmerl_lib.erl
index 6402f1cbeb..aeb821f411 100644
--- a/lib/xmerl/src/xmerl_lib.erl
+++ b/lib/xmerl/src/xmerl_lib.erl
@@ -160,8 +160,9 @@ expand_element(E = #xmlText{}, Pos, Parents, Norm) ->
     E#xmlText{pos = Pos,
 	      parents = Parents,
 	      value = expand_text(E#xmlText.value, Norm)};
-expand_element(E = #xmlPI{}, Pos, _Parents, Norm) ->
+expand_element(E = #xmlPI{}, Pos, Parents, Norm) ->
     E#xmlPI{pos = Pos,
+	    parents = Parents,
 	    value = expand_text(E#xmlPI.value, Norm)};
 expand_element(E = #xmlComment{}, Pos, Parents, Norm) ->
     E#xmlComment{pos = Pos,
diff --git a/lib/xmerl/src/xmerl_scan.erl b/lib/xmerl/src/xmerl_scan.erl
index ad6fa7d2b9..0c84ae5775 100644
--- a/lib/xmerl/src/xmerl_scan.erl
+++ b/lib/xmerl/src/xmerl_scan.erl
@@ -755,7 +755,7 @@ scan_misc("<!--" ++ T, S0, Pos) -> % Comment
 scan_misc("<?" ++ T, S0, Pos) -> % PI
     ?dbg("prolog(\"<?\")~n", []),
     ?bump_col(2),
-    {_PI, T1, S1} = scan_pi(T, S, Pos),
+    {_PI, T1, S1} = scan_pi(T, S, Pos, []),
     scan_misc(T1,S1,Pos);
 scan_misc(T=[H|_T], S, Pos) when ?whitespace(H) ->
     ?dbg("prolog(whitespace)~n", []),
@@ -1026,50 +1026,53 @@ xml_vsn([H|T], S=#xmerl_scanner{col = C}, Delim, Acc) ->
 
 %%%%%%% [16] PI ::= '<?' PITarget (S (Char* - (Char* '?>' Char*)))? '?>'
 
-scan_pi([], S=#xmerl_scanner{continuation_fun = F}, Pos) ->
+scan_pi([], S=#xmerl_scanner{continuation_fun = F}, Pos, Ps) ->
     ?dbg("cont()...~n", []),
-    F(fun(MoreBytes, S1) -> scan_pi(MoreBytes, S1, Pos) end,
+    F(fun(MoreBytes, S1) -> scan_pi(MoreBytes, S1, Pos, Ps) end,
       fun(S1) -> ?fatal(unexpected_end, S1) end,
       S);
-scan_pi(Str = [H1,H2,H3 | T],S0=#xmerl_scanner{line = L, col = C}, Pos)
+scan_pi(Str = [H1,H2,H3 | T],S0=#xmerl_scanner{line = L, col = C}, Pos, Ps)
   when H1==$x;H1==$X ->
     %% names beginning with [xX][mM][lL] are reserved for future use.
     ?bump_col(3),
     if 
 	((H2==$m) or (H2==$M)) and
 	((H3==$l) or (H3==$L)) ->
-	    scan_wellknown_pi(T,S,Pos);
+	    scan_wellknown_pi(T,S,Pos,Ps);
 	true ->
 	    {Target, _NamespaceInfo, T1, S1} = scan_name(Str, S),
-	    scan_pi(T1, S1, Target, L, C, Pos, [])
+	    scan_pi(T1, S1, Target, L, C, Pos, Ps, [])
     end;
-scan_pi(Str, S=#xmerl_scanner{line = L, col = C}, Pos) ->
+scan_pi(Str, S=#xmerl_scanner{line = L, col = C}, Pos, Ps) ->
     {Target, _NamespaceInfo, T1, S1} = scan_name(Str, S),
-    scan_pi(T1, S1, Target, L, C, Pos,[]).
+    scan_pi(T1, S1, Target, L, C, Pos, Ps, []).
 
 
 %%% More info on xml-stylesheet can be found at:
 %%%   "Associating Style Sheets with XML documents", Version 1.0,
 %%%   W3C Recommendation 29 June 1999 (http://www.w3.org/TR/xml-stylesheet/)
-scan_wellknown_pi("-stylesheet"++T, S0=#xmerl_scanner{line=L,col=C},Pos) ->
+scan_wellknown_pi("-stylesheet"++T, S0=#xmerl_scanner{line=L,col=C},Pos,Ps) ->
     ?dbg("prolog(\"<?xml-stylesheet\")~n", []),
     ?bump_col(16),
-    scan_pi(T, S, "xml-stylesheet",L,C,Pos,[]);
-scan_wellknown_pi(Str,S,_Pos) ->
+    scan_pi(T, S, "xml-stylesheet",L,C,Pos,Ps,[]);
+scan_wellknown_pi(Str,S,_Pos,_Ps) ->
     ?fatal({invalid_target_name, lists:sublist(Str, 1, 10)}, S).
 
 
 
-scan_pi([], S=#xmerl_scanner{continuation_fun = F}, Target,L, C, Pos, Acc) ->
+scan_pi([], S=#xmerl_scanner{continuation_fun = F}, Target,
+	L, C, Pos, Ps, Acc) ->
     ?dbg("cont()...~n", []),
-    F(fun(MoreBytes, S1) -> scan_pi(MoreBytes, S1, Target, L, C, Pos, Acc) end,
+    F(fun(MoreBytes, S1) -> scan_pi(MoreBytes, S1, Target,
+				    L, C, Pos, Ps, Acc) end,
       fun(S1) -> ?fatal(unexpected_end, S1) end,
       S);
 scan_pi("?>" ++ T, S0 = #xmerl_scanner{hook_fun = Hook,
 				       event_fun = Event}, 
-	Target, L, C, Pos, Acc) ->
+	Target, L, C, Pos, Ps, Acc) ->
     ?bump_col(2),
     PI = #xmlPI{name = Target,
+		parents = Ps,
 		pos = Pos,
 		value = lists:reverse(Acc)},
     S1 = #xmerl_scanner{} = Event(#xmerl_event{event = ended,
@@ -1078,22 +1081,25 @@ scan_pi("?>" ++ T, S0 = #xmerl_scanner{hook_fun = Hook,
 					       data = PI}, S),
     {Ret, S2} = Hook(PI, S1),
     {Ret, T, S2};
-scan_pi([H|T], S, Target, L, C, Pos, Acc) when ?whitespace(H) ->
+scan_pi([H|T], S, Target, L, C, Pos, Ps, Acc) when ?whitespace(H) ->
     ?strip1,
-    scan_pi2(T1, S1, Target, L, C, Pos, Acc);
-scan_pi([H|_T],S,_Target, _L, _C, _Pos, _Acc) ->
+    scan_pi2(T1, S1, Target, L, C, Pos, Ps, Acc);
+scan_pi([H|_T],S,_Target, _L, _C, _Pos, _Ps, _Acc) ->
     ?fatal({expected_whitespace_OR_end_of_PI,{char,H}}, S).
 
-scan_pi2([], S=#xmerl_scanner{continuation_fun = F}, Target,L, C, Pos, Acc) ->
+scan_pi2([], S=#xmerl_scanner{continuation_fun = F}, Target,
+	 L, C, Pos, Ps, Acc) ->
     ?dbg("cont()...~n", []),
-    F(fun(MoreBytes, S1) -> scan_pi2(MoreBytes, S1, Target, L, C, Pos, Acc) end,
+    F(fun(MoreBytes, S1) -> scan_pi2(MoreBytes, S1, Target,
+				     L, C, Pos, Ps, Acc) end,
       fun(S1) -> ?fatal(unexpected_end, S1) end,
       S);
 scan_pi2("?>" ++ T, S0 = #xmerl_scanner{hook_fun = Hook,
 				       event_fun = Event}, 
-	Target, L, C, Pos, Acc) ->
+	 Target, L, C, Pos, Ps, Acc) ->
     ?bump_col(2),
     PI = #xmlPI{name = Target,
+		parents = Ps,
 		pos = Pos,
 		value = lists:reverse(Acc)},
     S1 = #xmerl_scanner{} = Event(#xmerl_event{event = ended,
@@ -1102,10 +1108,10 @@ scan_pi2("?>" ++ T, S0 = #xmerl_scanner{hook_fun = Hook,
 					       data = PI}, S),
     {Ret, S2} = Hook(PI, S1),
     {Ret, T, S2};
-scan_pi2(Str, S0, Target, L, C, Pos, Acc) ->
+scan_pi2(Str, S0, Target, L, C, Pos, Ps, Acc) ->
     ?bump_col(1),
     {Ch,T} = wfc_legal_char(Str,S),
-    scan_pi2(T, S, Target, L, C, Pos, [Ch|Acc]).
+    scan_pi2(T, S, Target, L, C, Pos, Ps, [Ch|Acc]).
 
 
 
@@ -1576,7 +1582,7 @@ scan_markup_decl("<!--" ++ T, S0) ->
     scan_comment(T, S);
 scan_markup_decl("<?" ++ T, S0) ->
     ?bump_col(2),
-    {_PI, T1, S1} = scan_pi(T, S,_Pos=markup),
+    {_PI, T1, S1} = scan_pi(T, S,_Pos=markup,[]),
     strip(T1, S1);
 scan_markup_decl("<!ELEMENT" ++ T, 
 		 #xmerl_scanner{rules_read_fun = Read,
@@ -2532,9 +2538,9 @@ scan_content_markup("![CDATA[" ++ T, S0, Pos, _Name, _Attrs,
 		    _Space, _Lang, Parents, _NS) ->
     ?bump_col(8),
     scan_cdata(T, S, Pos, Parents);
-scan_content_markup("?"++T,S0,Pos,_Name,_Attrs,_Space,_Lang,_Parents,_NS) ->
+scan_content_markup("?"++T,S0,Pos,_Name,_Attrs,_Space,_Lang,Parents,_NS) ->
     ?bump_col(1),
-    scan_pi(T, S, Pos);
+    scan_pi(T, S, Pos, Parents);
 scan_content_markup(T, S, Pos, _Name, _Attrs, Space, Lang, Parents, NS) ->
     scan_element(T, S, Pos, Space, Lang, Parents, NS).
 
-- 
cgit v1.2.3


From 64a41197d8d5a292348d38467b28a041a95c500b Mon Sep 17 00:00:00 2001
From: Anthony Ramine <nox@dev-extend.eu>
Date: Tue, 7 Dec 2010 16:39:44 +0100
Subject: Track parents and namespace in `#xmlAttribute` nodes

---
 lib/xmerl/src/xmerl_scan.erl | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'lib/xmerl')

diff --git a/lib/xmerl/src/xmerl_scan.erl b/lib/xmerl/src/xmerl_scan.erl
index 0c84ae5775..740f825053 100644
--- a/lib/xmerl/src/xmerl_scan.erl
+++ b/lib/xmerl/src/xmerl_scan.erl
@@ -2094,6 +2094,7 @@ scan_element(T, S, Pos, Name, StartL, StartC, Attrs, Lang, Parents,
 		      P+1
 	      end,
     Attr = #xmlAttribute{name = AttName, 
+			 parents = [{Name, Pos}|Parents],
 			 pos = AttrPos,
 			 language = Lang,
 			 nsinfo = NamespaceInfo,
@@ -2161,6 +2162,7 @@ processed_whole_element(S=#xmerl_scanner{hook_fun = _Hook,
 		TempNamespace = Namespace#xmlNamespace{default = []},
 		ExpAttrsX = 
 		    [A#xmlAttribute{
+		       namespace=Namespace,
 		       expanded_name=expanded_name(
 				       A#xmlAttribute.name, 
 				       A#xmlAttribute.nsinfo,
-- 
cgit v1.2.3


From 7fc95c00764fc13d2e3e676cca1a66be5d672c41 Mon Sep 17 00:00:00 2001
From: Anthony Ramine <nox@dev-extend.eu>
Date: Tue, 7 Dec 2010 17:28:56 +0100
Subject: Allow whole documents to be returned

Functions `xmerl_scan:file/2` and `xmerl_scan:string/2` now accepts a
new option `{document, true}` to produce a whole document as a
`xmlDocument` record instead of just the root element node.

You may wonder why this would be useful, this option is the only way to
get to the top-level comments and processing instructions without
hooking through the customization functions. Those nodes are needed to
implement [Canonical XML][c14n-xml] support.

[c14n-xml]: http://www.w3.org/TR/2008/PR-xml-c14n11-20080129/
            "Canonical XML"
---
 lib/xmerl/include/xmerl.hrl  |   1 +
 lib/xmerl/src/xmerl_scan.erl | 140 ++++++++++++++++++++++++++++---------------
 2 files changed, 92 insertions(+), 49 deletions(-)

(limited to 'lib/xmerl')

diff --git a/lib/xmerl/include/xmerl.hrl b/lib/xmerl/include/xmerl.hrl
index fb9b00c73c..9c471c437f 100644
--- a/lib/xmerl/include/xmerl.hrl
+++ b/lib/xmerl/include/xmerl.hrl
@@ -155,6 +155,7 @@
 	  declarations = [],	   % [{Name, Attrs}]
 	  doctype_name,
 	  doctype_DTD = internal, % internal | DTDId
+	  document = false,
 	  rules,
 	  keep_rules = false,	% delete (ets) tab if false
 	  namespace_conformant = false, % true | false
diff --git a/lib/xmerl/src/xmerl_scan.erl b/lib/xmerl/src/xmerl_scan.erl
index 740f825053..303fc26550 100644
--- a/lib/xmerl/src/xmerl_scan.erl
+++ b/lib/xmerl/src/xmerl_scan.erl
@@ -100,7 +100,15 @@
 %%    <dd>Set default character set used (default UTF-8).
 %%    This character set is used only if not explicitly given by the XML
 %%    declaration. </dd>
+%%  <dt><code>{document, Flag}</code></dt>
+%%    <dd>Set to 'true' if xmerl should return a complete XML document
+%%    as an xmlDocument record (default 'false').</dd>
 %% </dl>
+%% @type document() = xmlElement() | xmlDocument(). <p>
+%% The document returned by <tt>xmerl_scan:string/[1,2]</tt> and
+%% <tt>xmerl_scan:file/[1,2]</tt>. The type of the returned record depends on
+%% the value of the document option passed to the function.
+%% </p>
 
 
 -module(xmerl_scan).
@@ -224,7 +232,7 @@ cont_state(X, S=#xmerl_scanner{fun_states = FS}) ->
 file(F) ->
     file(F, []).
 
-%% @spec file(Filename::string(), Options::option_list()) -> {xmlElement(),Rest}
+%% @spec file(Filename::string(), Options::option_list()) -> {document(),Rest}
 %%   Rest = list()
 %%% @doc Parse file containing an XML document
 file(F, Options) ->
@@ -264,7 +272,7 @@ int_file_decl(F, Options,_ExtCharset) ->
 string(Str) ->  
     string(Str, []).
 
-%% @spec string(Text::list(),Options::option_list()) -> {xmlElement(),Rest}
+%% @spec string(Text::list(),Options::option_list()) -> {document(),Rest}
 %%   Rest = list()
 %%% @doc Parse string containing an XML document
 string(Str, Options) ->
@@ -381,6 +389,8 @@ initial_state([{quiet, F}|T], S) when F==true; F==false ->
     initial_state(T, S#xmerl_scanner{quiet = F});
 initial_state([{doctype_DTD,DTD}|T], S) ->
     initial_state(T,S#xmerl_scanner{doctype_DTD = DTD});
+initial_state([{document, F}|T], S) when is_boolean(F) ->
+    initial_state(T,S#xmerl_scanner{document = F});
 initial_state([{text_decl,Bool}|T], S) ->
     initial_state(T,S#xmerl_scanner{text_decl=Bool});
 initial_state([{environment,Env}|T], S) ->
@@ -518,6 +528,7 @@ scan_document(Str0, S=#xmerl_scanner{event_fun = Event,
 				     line = L, col = C,
 				     environment=Env,
 				     encoding=Charset,
+				     document=Document,
 				     validation=ValidateResult}) ->
     S1 = Event(#xmerl_event{event = started,
 			    line = L,
@@ -539,17 +550,17 @@ scan_document(Str0, S=#xmerl_scanner{event_fun = Event,
 	end,
 %%     M1 = erlang:memory(),
 %%     io:format("Memory status before prolog: ~p~n",[M1]),
-    {T1, S2} = scan_prolog(Str, S1, _StartPos = 1),
+    {Prolog, Pos, T1, S2} = scan_prolog(Str, S1, _StartPos = 1),
 %%     M2 = erlang:memory(),
 %%     io:format("Memory status after prolog: ~p~n",[M2]),
     %%io:format("scan_document 2, prolog parsed~n",[]),
     T2 = scan_mandatory("<",T1,1,S2,expected_element_start_tag),
 %%     M3 = erlang:memory(),
 %%     io:format("Memory status before element: ~p~n",[M3]),
-    {Res, T3, S3} =scan_element(T2,S2,_StartPos = 1),
+    {Res, T3, S3} =scan_element(T2,S2,Pos),
 %%     M4 = erlang:memory(),
 %%     io:format("Memory status after element: ~p~n",[M4]),
-    {Tail, S4}=scan_misc(T3, S3, _StartPos = 1),
+    {Misc, _Pos1, Tail, S4}=scan_misc(T3, S3, Pos + 1),
 %%     M5 = erlang:memory(),
 %%     io:format("Memory status after misc: ~p~n",[M5]),
     
@@ -595,7 +606,15 @@ scan_document(Str0, S=#xmerl_scanner{event_fun = Event,
 		 {Res,cleanup(S5)}
 	 end,
 
-    {Res2, Tail, S6}.
+    Res3 =
+	case Document of
+	    true ->
+		Content = lists:reverse(Prolog, [Res2 | lists:reverse(Misc)]),
+		#xmlDocument{content = Content};
+	    false ->
+		Res2#xmlElement{pos = 1}
+	end,
+    {Res3, Tail, S6}.
 
 
 scan_decl(Str, S=#xmerl_scanner{event_fun = Event,
@@ -624,14 +643,17 @@ scan_decl(Str, S=#xmerl_scanner{event_fun = Event,
 %%% prolog    ::=    XMLDecl? Misc* (doctypedecl Misc*)?
 %%%
 %% empty text declarations are handled by the first function clause.
-scan_prolog([], S=#xmerl_scanner{continuation_fun = F}, Pos) ->
+scan_prolog(T, S, Pos) ->
+    scan_prolog(T, S, Pos, []).
+scan_prolog([], S=#xmerl_scanner{continuation_fun = F}, Pos, Acc) ->
     ?dbg("cont()...~n", []),
-    F(fun(MoreBytes, S1) -> scan_prolog(MoreBytes, S1, Pos) end,
-      fun(S1) -> {[], S1} end,
+    F(fun(MoreBytes, S1) -> scan_prolog(MoreBytes, S1, Pos, Acc) end,
+      fun(S1) -> {Acc, Pos, [], S1} end,
       S);
-scan_prolog("<?xml"++T,S0=#xmerl_scanner{encoding=Charset0,col=Col,line=L},Pos)
-  when ?whitespace(hd(T)) ->
-    {Charset,T3, S3}=
+scan_prolog("<?xml"++T,
+	    S0=#xmerl_scanner{encoding=Charset0,col=Col,line=L},
+	    Pos,Acc) when ?whitespace(hd(T)) ->
+    {Charset, T3, S3} =
     if
 	Col==1,L==1,S0#xmerl_scanner.text_decl==true -> 
 	    ?dbg("prolog(\"<?xml\")~n", []),
@@ -639,13 +661,13 @@ scan_prolog("<?xml"++T,S0=#xmerl_scanner{encoding=Charset0,col=Col,line=L},Pos)
 	    {_,T1,S1} = mandatory_strip(T,S),
 	    {Decl,T2, S2}=scan_text_decl(T1,S1),
 	    Encoding=Decl#xmlDecl.encoding,
-	    {Encoding,T2, S2#xmerl_scanner{encoding=Encoding}};
+	    {Encoding, T2, S2#xmerl_scanner{encoding=Encoding}};
 	Col==1,L==1 -> 
 	    ?dbg("prolog(\"<?xml\")~n", []),
 	    ?bump_col(5),
 	    {Decl,T2, S2}=scan_xml_decl(T, S),
 	    Encoding=Decl#xmlDecl.encoding,
-	    {Encoding,T2, S2#xmerl_scanner{encoding=Encoding}};
+	    {Encoding, T2, S2#xmerl_scanner{encoding=Encoding}};
 	true ->
 	    ?fatal({xml_declaration_must_be_first_in_doc,Col,L},S0)
     end,
@@ -659,7 +681,7 @@ scan_prolog("<?xml"++T,S0=#xmerl_scanner{encoding=Charset0,col=Col,line=L},Pos)
     %% Now transform to declared character set.
     if
 	Charset==Charset0 -> % Document already transformed to this charset!
-	    scan_prolog(T3, S3, Pos);
+	    scan_prolog(T3, S3, Pos, Acc);
 	Charset0=/=undefined ->
 	    %% For example may an external entity
 	    %% have the BOM for utf-16 and the internal
@@ -668,17 +690,18 @@ scan_prolog("<?xml"++T,S0=#xmerl_scanner{encoding=Charset0,col=Col,line=L},Pos)
 	    %% 'iso-10646-utf-1', and Charset will be 'utf-16', all
 	    %% legal.
 	    %%
-	    scan_prolog(T3,S3#xmerl_scanner{encoding=Charset0},Pos);
+	    scan_prolog(T3,S3#xmerl_scanner{encoding=Charset0},Pos,Acc);
 	Charset == "utf-8" ->
-	    scan_prolog(T3, S3, Pos);
+	    scan_prolog(T3, S3, Pos, Acc);
 	Charset=/=undefined -> % Document not previously transformed
 	    T4=xmerl_ucs:to_unicode(T3,list_to_atom(Charset)),
-	    scan_prolog(T4, S3, Pos);
+	    scan_prolog(T4, S3, Pos, Acc);
 	true -> % No encoding info given
-	    scan_prolog(T3, S3, Pos)
+	    scan_prolog(T3, S3, Pos, Acc)
     end;
-scan_prolog("<!DOCTYPE" ++ T, S0=#xmerl_scanner{environment=prolog,
-						encoding=_Charset}, Pos) ->
+scan_prolog("<!DOCTYPE" ++ T,
+	    S0=#xmerl_scanner{environment=prolog,encoding=_Charset},
+	    Pos, Acc) ->
     ?dbg("prolog(\"<!DOCTYPE\")~n", []),
     ?bump_col(9),
     %% If no known character set assume it is UTF-8
@@ -687,10 +710,13 @@ scan_prolog("<!DOCTYPE" ++ T, S0=#xmerl_scanner{environment=prolog,
 	   true -> T
        end,
     {T2, S1} = scan_doctype(T1, S),
-    scan_misc(T2, S1, Pos);
-scan_prolog(Str="%"++_T,S=#xmerl_scanner{environment={external,_}},_Pos) ->
-    scan_ext_subset(Str,S);
-scan_prolog(Str, S0 = #xmerl_scanner{user_state=_US,encoding=_Charset},Pos) ->
+    scan_misc(T2, S1, Pos, Acc);
+scan_prolog(Str="%"++_T,S=#xmerl_scanner{environment={external,_}},
+	    Pos,Acc) ->
+    {T, S1} = scan_ext_subset(Str,S),
+    {Acc, Pos, T, S1};
+scan_prolog(Str, S0 = #xmerl_scanner{user_state=_US,encoding=_Charset},
+	    Pos,Acc) ->
     ?dbg("prolog(\"<\")~n", []),
     
     %% Check for Comments, PI before possible DOCTYPE declaration
@@ -700,26 +726,28 @@ scan_prolog(Str, S0 = #xmerl_scanner{user_state=_US,encoding=_Charset},Pos) ->
 %%	  Charset==undefined -> xmerl_ucs:to_unicode(Str,'utf-8');
 	  true -> Str
       end,
-    {T1, S1}=scan_misc(T, S, Pos),
-    scan_prolog2(T1,S1,Pos).
+    {Acc1, Pos1, T1, S1}=scan_misc(T, S, Pos, Acc),
+    scan_prolog2(T1,S1,Pos1,Acc1).
 
 
 
-scan_prolog2([], S=#xmerl_scanner{continuation_fun = F}, Pos) ->
+scan_prolog2([], S=#xmerl_scanner{continuation_fun = F}, Pos, Acc) ->
     ?dbg("cont()...~n", []),
-    F(fun(MoreBytes, S1) -> scan_prolog2(MoreBytes, S1, Pos) end,
-      fun(S1) -> {[], S1} end,
+    F(fun(MoreBytes, S1) -> scan_prolog2(MoreBytes, S1, Pos, Acc) end,
+      fun(S1) -> {Acc, Pos, [], S1} end,
       S);
-scan_prolog2("<!DOCTYPE" ++ T, S0=#xmerl_scanner{environment=prolog}, Pos) ->
+scan_prolog2("<!DOCTYPE" ++ T, S0=#xmerl_scanner{environment=prolog},
+	     Pos, Acc) ->
     ?dbg("prolog(\"<!DOCTYPE\")~n", []),
     ?bump_col(9),
     {T1, S1} = scan_doctype(T, S),
-    scan_misc(T1, S1, Pos);
-scan_prolog2(Str = "<!" ++ _, S, _Pos) ->
+    scan_misc(T1, S1, Pos, Acc);
+scan_prolog2(Str = "<!" ++ _, S, Pos, Acc) ->
     ?dbg("prolog(\"<!\")~n", []),
     %% In e.g. a DTD, we jump directly to markup declarations
-    scan_ext_subset(Str, S);
-scan_prolog2(Str, S0 = #xmerl_scanner{user_state=_US},Pos) ->
+    {T, S1} = scan_ext_subset(Str, S),
+    {Acc, Pos, T, S1};
+scan_prolog2(Str, S0 = #xmerl_scanner{user_state=_US},Pos,Acc) ->
     ?dbg("prolog(\"<\")~n", []),
     
     %% Here we consider the DTD provided by doctype_DTD option,
@@ -733,7 +761,7 @@ scan_prolog2(Str, S0 = #xmerl_scanner{user_state=_US},Pos) ->
 	end,
     %% Check for more Comments and PI after DOCTYPE declaration
 %    ?bump_col(1),
-    scan_misc(Str, S1, Pos).
+    scan_misc(Str, S1, Pos, Acc).
 
 
 
@@ -743,26 +771,40 @@ scan_prolog2(Str, S0 = #xmerl_scanner{user_state=_US},Pos) ->
 %% - Neither of Comment and PI are returned in the resulting parsed
 %%   structure.
 %% - scan_misc/3 implements Misc* as that is how the rule is always used
-scan_misc([], S=#xmerl_scanner{continuation_fun = F}, Pos) ->
+scan_misc(T, S, Pos) ->
+    scan_misc(T, S, Pos, []).
+scan_misc([], S=#xmerl_scanner{continuation_fun = F}, Pos, Acc) ->
     ?dbg("cont()...~n", []),
-    F(fun(MoreBytes, S1) -> scan_misc(MoreBytes, S1, Pos) end,
-      fun(S1) -> {[], S1} end,
+    F(fun(MoreBytes, S1) -> scan_misc(MoreBytes, S1, Pos, Acc) end,
+      fun(S1) -> {Acc, Pos, [], S1} end,
       S);
-scan_misc("<!--" ++ T, S0, Pos) -> % Comment
+scan_misc("<!--" ++ T, S0=#xmerl_scanner{acc_fun = F}, Pos, Acc) -> % Comment
     ?bump_col(4),
-    {_, T1, S1} = scan_comment(T, S, Pos, _Parents = [], _Lang = []),
-    scan_misc(T1,S1,Pos);
-scan_misc("<?" ++ T, S0, Pos) -> % PI
+    {C, T1, S1} = scan_comment(T, S, Pos, _Parents = [], _Lang = []),
+    {Acc2, Pos2, S3} = case F(C, Acc, S1) of
+			   {Acc1, S2} ->
+			       {Acc1, Pos + 1, S2};
+			   {Acc1, Pos1, S2} ->
+			       {Acc1, Pos1, S2}
+		       end,
+    scan_misc(T1,S3,Pos2,Acc2);
+scan_misc("<?" ++ T, S0=#xmerl_scanner{acc_fun = F}, Pos, Acc) -> % PI
     ?dbg("prolog(\"<?\")~n", []),
     ?bump_col(2),
-    {_PI, T1, S1} = scan_pi(T, S, Pos, []),
-    scan_misc(T1,S1,Pos);
-scan_misc(T=[H|_T], S, Pos) when ?whitespace(H) ->
+    {PI, T1, S1} = scan_pi(T, S, Pos, []),
+    {Acc2, Pos2, S3} = case F(PI, Acc, S1) of
+			   {Acc1, S2} ->
+			       {Acc1, Pos + 1, S2};
+			   {Acc1, Pos1, S2} ->
+			       {Acc1, Pos1, S2}
+		       end,
+    scan_misc(T1,S3,Pos2,Acc2);
+scan_misc(T=[H|_T], S, Pos, Acc) when ?whitespace(H) ->
     ?dbg("prolog(whitespace)~n", []),
     {_,T1,S1}=strip(T,S),
-    scan_misc(T1,S1,Pos);
-scan_misc(T,S,_Pos) ->
-    {T,S}.
+    scan_misc(T1,S1,Pos,Acc);
+scan_misc(T,S,Pos,Acc) ->
+    {Acc,Pos,T,S}.
 
 
 cleanup(S=#xmerl_scanner{keep_rules = false,
-- 
cgit v1.2.3


From fcf6b58a1f7a2eafa0db79f1715db1c193c3f346 Mon Sep 17 00:00:00 2001
From: Anthony Ramine <nox@dev-extend.eu>
Date: Sat, 18 Dec 2010 23:49:15 +0100
Subject: Add `default_attrs` option

When `default_attrs` is `true`, any attribute with a default value defined
in the doctype but not in the attribute axis of the currently scanned
element is added to it.
---
 lib/xmerl/include/xmerl.hrl  |  1 +
 lib/xmerl/src/xmerl_scan.erl | 34 ++++++++++++++++++++++++++++++++--
 2 files changed, 33 insertions(+), 2 deletions(-)

(limited to 'lib/xmerl')

diff --git a/lib/xmerl/include/xmerl.hrl b/lib/xmerl/include/xmerl.hrl
index 9c471c437f..2e18e216e2 100644
--- a/lib/xmerl/include/xmerl.hrl
+++ b/lib/xmerl/include/xmerl.hrl
@@ -156,6 +156,7 @@
 	  doctype_name,
 	  doctype_DTD = internal, % internal | DTDId
 	  document = false,
+	  default_attrs = false,
 	  rules,
 	  keep_rules = false,	% delete (ets) tab if false
 	  namespace_conformant = false, % true | false
diff --git a/lib/xmerl/src/xmerl_scan.erl b/lib/xmerl/src/xmerl_scan.erl
index 303fc26550..9e3e6ee728 100644
--- a/lib/xmerl/src/xmerl_scan.erl
+++ b/lib/xmerl/src/xmerl_scan.erl
@@ -103,6 +103,9 @@
 %%  <dt><code>{document, Flag}</code></dt>
 %%    <dd>Set to 'true' if xmerl should return a complete XML document
 %%    as an xmlDocument record (default 'false').</dd>
+%%  <dt><code>{default_attrs, Flag}</code></dt>
+%%    <dd>Set to 'true' if xmerl should add to elements missing attributes
+%%    with a defined default value (default 'false').</dd>
 %% </dl>
 %% @type document() = xmlElement() | xmlDocument(). <p>
 %% The document returned by <tt>xmerl_scan:string/[1,2]</tt> and
@@ -391,6 +394,8 @@ initial_state([{doctype_DTD,DTD}|T], S) ->
     initial_state(T,S#xmerl_scanner{doctype_DTD = DTD});
 initial_state([{document, F}|T], S) when is_boolean(F) ->
     initial_state(T,S#xmerl_scanner{document = F});
+initial_state([{default_attrs, F}|T], S) when is_boolean(F) ->
+    initial_state(T,S#xmerl_scanner{default_attrs = F});
 initial_state([{text_decl,Bool}|T], S) ->
     initial_state(T,S#xmerl_scanner{text_decl=Bool});
 initial_state([{environment,Env}|T], S) ->
@@ -2161,6 +2166,14 @@ scan_element(T, S, Pos, Name, StartL, StartC, Attrs, Lang, Parents,
     scan_element(T4, S5, Pos, Name, StartL, StartC, [Attr|Attrs], 
 		 Lang, Parents, NSI, NewNS, SpaceDefault).
 
+get_default_attrs(S = #xmerl_scanner{rules_read_fun = Read}, ElemName) ->
+    case Read(elem_def, ElemName, S) of
+	#xmlElement{attributes = Attrs} ->
+	    [ {AttName, AttValue} ||
+	      {AttName, _, AttValue, _, _} <- Attrs, AttValue =/= no_value ];
+	_ -> []
+    end.
+
 get_att_type(S=#xmerl_scanner{rules_read_fun=Read},AttName,ElemName) ->
     case Read(elem_def,ElemName,S) of
 	#xmlElement{attributes = Attrs} ->
@@ -2190,6 +2203,23 @@ processed_whole_element(S=#xmerl_scanner{hook_fun = _Hook,
 			Pos, Name, Attrs, Lang, Parents, NSI, Namespace) ->
     Language = check_language(Attrs, Lang),
 
+    AllAttrs =
+	case S#xmerl_scanner.default_attrs of
+	    true ->
+		[ #xmlAttribute{name = AttName,
+				parents = [{Name, Pos} | Parents],
+				language = Lang,
+				nsinfo = NSI,
+				namespace = Namespace,
+				value = AttValue,
+				normalized = true} ||
+		  {AttName, AttValue} <- get_default_attrs(S, Name),
+		  AttValue =/= no_value,
+		  not lists:keymember(AttName, #xmlAttribute.name, Attrs) ];
+	    false ->
+		Attrs
+	end,
+
     {ExpName, ExpAttrs} = 
 	case S#xmerl_scanner.namespace_conformant of
 	    true ->
@@ -2209,10 +2239,10 @@ processed_whole_element(S=#xmerl_scanner{hook_fun = _Hook,
 				       A#xmlAttribute.name, 
 				       A#xmlAttribute.nsinfo,
 						% NSI,
-				       TempNamespace, S)} || A <- Attrs],
+				       TempNamespace, S)} || A <- AllAttrs],
 		{expanded_name(Name, NSI, Namespace, S), ExpAttrsX};
 	    false ->
-		{Name, Attrs}
+		{Name, AllAttrs}
 	end,
 
     #xmlElement{name = Name,
-- 
cgit v1.2.3


From 6d841684ff63ff8cc6295ea4c4461385ab594136 Mon Sep 17 00:00:00 2001
From: Anthony Ramine <nox@dev-extend.eu>
Date: Tue, 7 Dec 2010 23:31:34 +0100
Subject: Accumulate comments in element nodes

---
 lib/xmerl/src/xmerl_scan.erl       | 7 ++++---
 lib/xmerl/src/xmerl_xpath.erl      | 6 ++++++
 lib/xmerl/src/xmerl_xpath_pred.erl | 3 +++
 3 files changed, 13 insertions(+), 3 deletions(-)

(limited to 'lib/xmerl')

diff --git a/lib/xmerl/src/xmerl_scan.erl b/lib/xmerl/src/xmerl_scan.erl
index 9e3e6ee728..5f61fe2bb1 100644
--- a/lib/xmerl/src/xmerl_scan.erl
+++ b/lib/xmerl/src/xmerl_scan.erl
@@ -2553,9 +2553,6 @@ scan_content("&" ++ T, S0, Pos, Name, Attrs, Space, Lang, Parents, NS, Acc,[]) -
 	_ ->
 	    scan_content(string_to_char_set(S1#xmerl_scanner.encoding,ExpRef)++T1,S1,Pos,Name,Attrs,Space,Lang,Parents,NS,Acc,[])
     end;
-scan_content("<!--" ++ T, S, Pos, Name, Attrs, Space, Lang, Parents, NS, Acc,[]) ->
-    {_, T1, S1} = scan_comment(T, S, Pos, Parents, Lang),
-    scan_content(T1, S1, Pos+1, Name, Attrs, Space, Lang, Parents, NS, Acc,[]);
 scan_content("<" ++ T, S0, Pos, Name, Attrs, Space, Lang, Parents, NS, Acc,[]) ->
     ?bump_col(1),
     {Markup, T1, S1} = 
@@ -2615,6 +2612,10 @@ scan_content_markup("![CDATA[" ++ T, S0, Pos, _Name, _Attrs,
 scan_content_markup("?"++T,S0,Pos,_Name,_Attrs,_Space,_Lang,Parents,_NS) ->
     ?bump_col(1),
     scan_pi(T, S, Pos, Parents);
+scan_content_markup("!--" ++ T, S0, Pos, _Name, _Attrs,
+		    _Space, Lang, Parents, _NS) ->
+    ?bump_col(1),
+    scan_comment(T, S, Pos, Parents, Lang);
 scan_content_markup(T, S, Pos, _Name, _Attrs, Space, Lang, Parents, NS) ->
     scan_element(T, S, Pos, Space, Lang, Parents, NS).
 
diff --git a/lib/xmerl/src/xmerl_xpath.erl b/lib/xmerl/src/xmerl_xpath.erl
index db3d3ac2d6..ee06f08029 100644
--- a/lib/xmerl/src/xmerl_xpath.erl
+++ b/lib/xmerl/src/xmerl_xpath.erl
@@ -303,6 +303,9 @@ write_node(#xmlNode{pos = Pos,
 		    node = #xmlText{value = Txt,
 				    parents = Ps}}) ->
     {text, Pos, Txt, Ps};
+write_node(#xmlNode{pos = Pos,
+		    node = #xmlComment{parents = Ps}}) ->
+    {comment, Pos, '', Ps};
 write_node(_) ->
     other.
 
@@ -628,6 +631,7 @@ node_type(#xmlElement{}) ->	element;
 node_type(#xmlText{}) ->	text;
 node_type(#xmlPI{}) ->		processing_instruction;
 node_type(#xmlNamespace{}) ->	namespace;
+node_type(#xmlComment{}) ->	comment;
 node_type(#xmlDocument{}) ->	root_node.
 
 %% "The namespace axis contains the namespace nodes of the context node;
@@ -730,6 +734,8 @@ node_test({node_type, NT}, #xmlNode{node = N}, _Context) ->
 	    true;
 	{namespace, #xmlNamespace{}} ->
 	    true;
+	{comment, #xmlComment{}} ->
+	    true;
 	_ ->
 	    false
     end;
diff --git a/lib/xmerl/src/xmerl_xpath_pred.erl b/lib/xmerl/src/xmerl_xpath_pred.erl
index 451a09bee3..9ad7925111 100644
--- a/lib/xmerl/src/xmerl_xpath_pred.erl
+++ b/lib/xmerl/src/xmerl_xpath_pred.erl
@@ -442,6 +442,9 @@ string_value(El=#xmlNode{type=element}) ->
 string_value(T=#xmlNode{type=text}) ->
     #xmlText{value=Txt} = T#xmlNode.node,
     ?string(Txt);
+string_value(T=#xmlNode{type=comment}) ->
+    #xmlComment{value=Txt} = T#xmlNode.node,
+    ?string(Txt);
 string_value(infinity) -> ?string("Infinity");
 string_value(neg_infinity) -> ?string("-Infinity");
 string_value(A) when is_atom(A) ->
-- 
cgit v1.2.3


From 3979cefe5310319d6c7a8c57111c02d5e221486f Mon Sep 17 00:00:00 2001
From: Anthony Ramine <nox@dev-extend.eu>
Date: Tue, 7 Dec 2010 11:44:43 +0100
Subject: Support more top-level primary expressions

This change allows numbers and literals to be used as top-level primary
expressions without failing:

	1> xmerl_xpath:string("3", Doc).
	#xmlObj{type = number,value = 3}
	2> xmerl_xpath:string("'foo'", Doc).
	#xmlObj{type = string,value = "foo"}

We still need to allow arithmetic, comparative, boolean and negative
expressions, as in `xmerl_xpath_pred:expr/2`.
---
 lib/xmerl/src/xmerl_xpath.erl     | 8 +++-----
 lib/xmerl/src/xmerl_xpath_lib.erl | 4 +++-
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'lib/xmerl')

diff --git a/lib/xmerl/src/xmerl_xpath.erl b/lib/xmerl/src/xmerl_xpath.erl
index ee06f08029..e53d105ce7 100644
--- a/lib/xmerl/src/xmerl_xpath.erl
+++ b/lib/xmerl/src/xmerl_xpath.erl
@@ -338,13 +338,11 @@ eval_path(filter, {PathExpr, PredExpr}, C = #xmlContext{}) ->
     S1 = path_expr(PathExpr, S),
     pred_expr(PredExpr, S1).
 
-eval_primary_expr(FC = {function_call,_,_},S = #state{context = Context}) ->
+eval_primary_expr(PrimExpr, S = #state{context = Context}) ->
 %%    NewNodeSet = xmerl_xpath_pred:eval(FC, Context),
-    NewNodeSet = xmerl_xpath_lib:eval(primary_expr, FC, Context),
+    NewNodeSet = xmerl_xpath_lib:eval(primary_expr, PrimExpr, Context),
     NewContext = Context#xmlContext{nodeset = NewNodeSet},
-    S#state{context = NewContext};
-eval_primary_expr(PrimExpr,_S) ->
-    exit({primary_expression,{not_implemented, PrimExpr}}).
+    S#state{context = NewContext}.
     
 
 %% axis(Axis,NodeTest,Context::xmlContext()) -> xmlContext()
diff --git a/lib/xmerl/src/xmerl_xpath_lib.erl b/lib/xmerl/src/xmerl_xpath_lib.erl
index cfd0e36667..096f54ec30 100644
--- a/lib/xmerl/src/xmerl_xpath_lib.erl
+++ b/lib/xmerl/src/xmerl_xpath_lib.erl
@@ -49,5 +49,7 @@ primary_expr({function_call, F, Args}, C) ->
 	    %% here, we should look up the function in the context provided 
 	    %% by the caller, but we haven't figured this out yet.
 	    exit({not_a_core_function, F})
-    end.
+    end;
+primary_expr(PrimExpr, _C) ->
+    exit({primary_expression, {not_implemented, PrimExpr}}).
 
-- 
cgit v1.2.3


From 3eaca03e5c07429fc82fde26dc0fb3020b022be0 Mon Sep 17 00:00:00 2001
From: Anthony Ramine <nox@dev-extend.eu>
Date: Tue, 7 Dec 2010 11:28:33 +0100
Subject: Fix path filters

---
 lib/xmerl/src/xmerl_xpath.erl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'lib/xmerl')

diff --git a/lib/xmerl/src/xmerl_xpath.erl b/lib/xmerl/src/xmerl_xpath.erl
index e53d105ce7..b23a659ed2 100644
--- a/lib/xmerl/src/xmerl_xpath.erl
+++ b/lib/xmerl/src/xmerl_xpath.erl
@@ -333,10 +333,10 @@ eval_path(rel, PathExpr, C = #xmlContext{}) ->
     Context = C#xmlContext{nodeset = NodeSet},
     S = #state{context = Context},
     path_expr(PathExpr, S);
-eval_path(filter, {PathExpr, PredExpr}, C = #xmlContext{}) ->
+eval_path(filter, {PathExpr, {pred, Pred}}, C = #xmlContext{}) ->
     S = #state{context = C},
-    S1 = path_expr(PathExpr, S),
-    pred_expr(PredExpr, S1).
+    S1 = match_expr(PathExpr, S),
+    eval_pred(Pred, S1).
 
 eval_primary_expr(PrimExpr, S = #state{context = Context}) ->
 %%    NewNodeSet = xmerl_xpath_pred:eval(FC, Context),
-- 
cgit v1.2.3


From bffc6b40025b620b36c764aa9b74f00d31edb3a8 Mon Sep 17 00:00:00 2001
From: Anthony Ramine <nox@dev-extend.eu>
Date: Wed, 8 Dec 2010 11:01:12 +0100
Subject: Fix processing-instruction(name?)

---
 lib/xmerl/src/xmerl_xpath.erl       | 8 +++++---
 lib/xmerl/src/xmerl_xpath_parse.yrl | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'lib/xmerl')

diff --git a/lib/xmerl/src/xmerl_xpath.erl b/lib/xmerl/src/xmerl_xpath.erl
index b23a659ed2..40ba48b357 100644
--- a/lib/xmerl/src/xmerl_xpath.erl
+++ b/lib/xmerl/src/xmerl_xpath.erl
@@ -734,12 +734,14 @@ node_test({node_type, NT}, #xmlNode{node = N}, _Context) ->
 	    true;
 	{comment, #xmlComment{}} ->
 	    true;
+	{processing_instruction, #xmlPI{}} ->
+	    true;
 	_ ->
 	    false
     end;
-node_test({processing_instruction, {literal, _, Name}}, 
-	  #xmlNode{node = {processing_instruction, Name, _Data}}, _Context) ->
-    true;
+node_test({processing_instruction, Name1},
+	  #xmlNode{node = #xmlPI{name = Name2}}, _Context) ->
+    Name1 == atom_to_list(Name2);
 node_test(_Other, _N, _Context) ->
     %io:format("node_test(~p, ~p) -> false.~n", [_Other, write_node(_N)]),
     false.
diff --git a/lib/xmerl/src/xmerl_xpath_parse.yrl b/lib/xmerl/src/xmerl_xpath_parse.yrl
index 37576b9e61..f60cea0a2e 100644
--- a/lib/xmerl/src/xmerl_xpath_parse.yrl
+++ b/lib/xmerl/src/xmerl_xpath_parse.yrl
@@ -144,6 +144,7 @@ Expect 2.
 %% [7]
 'NodeTest' -> 'NameTest' : '$1' .
 'NodeTest' -> 'node_type' '(' ')' : {node_type, value('$1')} .
+'NodeTest' -> 'processing-instruction' '(' ')' : {node_type, value('$1')} .
 'NodeTest' -> 'processing-instruction' '(' 'literal' ')' 
 	: {processing_instruction, value('$3')} .
 
-- 
cgit v1.2.3


From 5b9aeb694cc7839163f684244c37a3029b9a1c8e Mon Sep 17 00:00:00 2001
From: Anthony Ramine <nox@dev-extend.eu>
Date: Tue, 7 Dec 2010 23:40:09 +0100
Subject: Add `#xmlPI` support to xmerl_xpath:write_node/1

---
 lib/xmerl/src/xmerl_xpath.erl | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'lib/xmerl')

diff --git a/lib/xmerl/src/xmerl_xpath.erl b/lib/xmerl/src/xmerl_xpath.erl
index 40ba48b357..d9dae7c53f 100644
--- a/lib/xmerl/src/xmerl_xpath.erl
+++ b/lib/xmerl/src/xmerl_xpath.erl
@@ -306,6 +306,10 @@ write_node(#xmlNode{pos = Pos,
 write_node(#xmlNode{pos = Pos,
 		    node = #xmlComment{parents = Ps}}) ->
     {comment, Pos, '', Ps};
+write_node(#xmlNode{pos = Pos,
+		    node = #xmlPI{name = Name,
+				  parents = Ps}}) ->
+    {processing_instruction, Pos, Name, Ps};
 write_node(_) ->
     other.
 
-- 
cgit v1.2.3


From ef8ba559efdef989a5c608ac40635410500395df Mon Sep 17 00:00:00 2001
From: Anthony Ramine <nox@dev-extend.eu>
Date: Tue, 7 Dec 2010 11:30:05 +0100
Subject: Implement namespace axis

Namespace nodes are represented as `#xmlNsNode` records.
Now that the namespace axis is correctly implemented, attributes nodes
corresponding to attributes that declare namespaces are ignored.

See [5.3 Attribute Nodes][xpath-5.3]:
> There are no attribute nodes corresponding to attributes
> that declare namespaces.

[xpath-5.3]: http://www.w3.org/TR/xpath/#attribute-nodes
---
 lib/xmerl/include/xmerl.hrl        |  7 ++--
 lib/xmerl/src/xmerl_xpath.erl      | 82 +++++++++++++++++++++++++++++++-------
 lib/xmerl/src/xmerl_xpath_pred.erl |  6 +++
 3 files changed, 77 insertions(+), 18 deletions(-)

(limited to 'lib/xmerl')

diff --git a/lib/xmerl/include/xmerl.hrl b/lib/xmerl/include/xmerl.hrl
index 2e18e216e2..e75528ae34 100644
--- a/lib/xmerl/include/xmerl.hrl
+++ b/lib/xmerl/include/xmerl.hrl
@@ -61,10 +61,11 @@
 	 }).
 
 %% namespace node - i.e. a {Prefix, URI} pair
-%% TODO: these are not currently used?? /RC
 -record(xmlNsNode,{
-	  prefix,
-	  uri = []
+	  parents = [],	% [{atom(),integer()}]
+	  pos,		% integer()
+	  prefix,	% string()
+	  uri = []	% [] | atom()
 	 }).
 
 %% XML Element
diff --git a/lib/xmerl/src/xmerl_xpath.erl b/lib/xmerl/src/xmerl_xpath.erl
index d9dae7c53f..b3301f2faf 100644
--- a/lib/xmerl/src/xmerl_xpath.erl
+++ b/lib/xmerl/src/xmerl_xpath.erl
@@ -41,18 +41,13 @@
 % xmerl_xpath_parse:parse(xmerl_xpath_scan:tokens("parent::processing-instruction('foo')")).
 %% </pre>
 %%
-%% @type docEntity() = 
+%% @type nodeEntity() =
 %%      xmlElement()
 %%    | xmlAttribute()
 %%    | xmlText() 
 %%    | xmlPI()
 %%    | xmlComment()
-%% @type nodeEntity() = 
-%%      xmlElement()
-%%    | xmlAttribute()
-%%    | xmlText() 
-%%    | xmlPI()
-%%    | xmlNamespace()
+%%    | xmlNsNode()
 %%    | xmlDocument()
 %% @type option_list(). <p>Options allows to customize the behaviour of the
 %%     XPath scanner.
@@ -310,6 +305,10 @@ write_node(#xmlNode{pos = Pos,
 		    node = #xmlPI{name = Name,
 				  parents = Ps}}) ->
     {processing_instruction, Pos, Name, Ps};
+write_node(#xmlNode{pos = Pos,
+		    node = #xmlNsNode{parents = Ps,
+				      prefix = Prefix}}) ->
+    {namespace, Pos, Prefix, Ps};
 write_node(_) ->
     other.
 
@@ -389,8 +388,8 @@ axis1(preceding, Tok, N, Acc, Context) ->
     match_preceding(Tok, N, Acc, Context);
 axis1(attribute, Tok, N, Acc, Context) ->
     match_attribute(Tok, N, Acc, Context);
-%axis1(namespace, Tok, N, Acc, Context) ->
-%    match_namespace(Tok, N, Acc, Context);
+axis1(namespace, Tok, N, Acc, Context) ->
+   match_namespace(Tok, N, Acc, Context);
 axis1(ancestor_or_self, Tok, N, Acc, Context) ->
     match_ancestor_or_self(Tok, N, Acc, Context);
 axis1(descendant_or_self, Tok, N, Acc, Context) ->
@@ -632,15 +631,58 @@ node_type(#xmlAttribute{}) ->	attribute;
 node_type(#xmlElement{}) ->	element;
 node_type(#xmlText{}) ->	text;
 node_type(#xmlPI{}) ->		processing_instruction;
-node_type(#xmlNamespace{}) ->	namespace;
+node_type(#xmlNsNode{}) ->	namespace;
 node_type(#xmlComment{}) ->	comment;
 node_type(#xmlDocument{}) ->	root_node.
 
 %% "The namespace axis contains the namespace nodes of the context node;
 %% the axis will be empty unless the context node is an element."
-%match_namespace(_Tok, _N, _Acc, _Context) ->
-    %% TODO: IMPLEMENT NAMESPACE AXIS
-%    erlang:fault(not_yet_implemented).
+match_namespace(Tok, N, Acc, Context) ->
+    case N#xmlNode.type of
+	element ->
+	    #xmlNode{parents = Ps, node = E} = N,
+	    #xmlElement{name = Name,
+			namespace = NS,
+			parents = EPs,
+			pos = Pos} = E,
+	    #xmlNamespace{default = Default, nodes = NSPairs} = NS,
+	    ThisEPs = [{Name, Pos}|EPs],
+	    ThisPs = [N|Ps],
+	    Acc0 =
+		case Default of
+		    D when D =:= []; D =:= '' ->
+			{[], 1};
+		    URI ->
+			DefaultNSNode = #xmlNsNode{parents = ThisEPs,
+						   pos = 1,
+						   prefix = [],
+						   uri = URI},
+			Node = #xmlNode{type = namespace,
+					node = DefaultNSNode,
+					parents = ThisPs},
+			{[Node], 2}
+		end,
+	    {Nodes, _I} =
+		lists:foldr(
+		  fun ({Prefix, URI}, {AccX, I}) ->
+			  NSNode = #xmlNsNode{parents = ThisEPs,
+					      pos = I,
+					      prefix = Prefix,
+					      uri = URI},
+			  ThisN = #xmlNode{pos = I,
+					   type = namespace,
+					   node = NSNode,
+					   parents = ThisPs},
+			  {[ThisN | AccX], I + 1}
+		  end, Acc0, NSPairs),
+	    lists:foldr(
+	      fun (ThisN, AccX) ->
+		      match_self(Tok, ThisN, AccX, Context)
+	      end, Acc, Nodes);
+	_Other ->
+	    %%[]
+	    Acc
+    end.
 
 
 update_nodeset(Context = #xmlContext{axis_type = AxisType}, NodeSet) ->
@@ -661,8 +703,15 @@ update_nodeset(Context = #xmlContext{axis_type = AxisType}, NodeSet) ->
 
 node_test(F, N, Context) when is_function(F) ->
     F(N, Context);
+node_test(_Test, #xmlNode{type=attribute,node=#xmlAttribute{name=xmlns}},
+	  _Context) ->
+    false;
+node_test(_Test,
+	  #xmlNode{type=attribute,node=#xmlAttribute{nsinfo={"xmlns",_Local}}},
+	  _Context) ->
+    false;
 node_test({wildcard, _}, #xmlNode{type=ElAt}, _Context) 
-  when ElAt==element; ElAt==attribute -> 
+  when ElAt==element; ElAt==attribute; ElAt==namespace ->
     true;
 node_test({prefix_test, Prefix}, #xmlNode{node = N}, _Context) ->
     case N of
@@ -726,6 +775,9 @@ node_test({name, {_Tag, Prefix, Local}},
 		 [{_Tag, Prefix, Local}, write_node(NSNodes)]),
 	    false
     end;
+node_test({name, {_Tag, [], Local}},
+	  #xmlNode{node = #xmlNsNode{prefix = Local}}, _Context) ->
+    true;
 node_test({node_type, NT}, #xmlNode{node = N}, _Context) ->
     case {NT, N} of
 	{text, #xmlText{}} ->
@@ -734,7 +786,7 @@ node_test({node_type, NT}, #xmlNode{node = N}, _Context) ->
 	    true;
 	{attribute, #xmlAttribute{}} ->
 	    true;
-	{namespace, #xmlNamespace{}} ->
+	{namespace, #xmlNsNode{}} ->
 	    true;
 	{comment, #xmlComment{}} ->
 	    true;
diff --git a/lib/xmerl/src/xmerl_xpath_pred.erl b/lib/xmerl/src/xmerl_xpath_pred.erl
index 9ad7925111..855b8599fe 100644
--- a/lib/xmerl/src/xmerl_xpath_pred.erl
+++ b/lib/xmerl/src/xmerl_xpath_pred.erl
@@ -337,6 +337,9 @@ local_name1([#xmlNode{type=element,node=El}|_]) ->
 local_name1([#xmlNode{type=attribute,node=Att}|_]) ->
     #xmlAttribute{name=Name,nsinfo=NSI} = Att,
     local_name2(Name,NSI);
+local_name1([#xmlNode{type=namespace,node=N}|_]) ->
+    #xmlNsNode{prefix=Prefix} = N,
+    ?string(Prefix);
 local_name1([#xmlElement{name = Name, nsinfo = NSI}|_]) ->
     local_name2(Name,NSI).
 local_name2(Name, NSI) ->
@@ -431,6 +434,9 @@ string_value(N=#xmlObj{}) ->
 string_value(A=#xmlNode{type=attribute}) ->
     #xmlAttribute{value=AttVal}=A#xmlNode.node,
     ?string(AttVal);
+string_value(N=#xmlNode{type=namespace}) ->
+    #xmlNsNode{uri=URI}=N#xmlNode.node,
+    ?string(atom_to_list(URI));
 string_value(El=#xmlNode{type=element}) ->
     #xmlElement{content=C} = El#xmlNode.node,
     TextValue = fun(#xmlText{value=T},_Fun) -> T;
-- 
cgit v1.2.3


From 5b2375ff231353c059a340d95b317d998df279fc Mon Sep 17 00:00:00 2001
From: Lars Thorsen <lars@erlang.org>
Date: Fri, 28 Oct 2011 10:37:49 +0200
Subject: Fix bugs and add a flag to skip comments

Add flag {comments, Flag} to xmerl_scan for filtering of comments.
Default (true) is that xmlComment records are returned from the scanner
and this flag should be set to false if one don't want comments
in the output.

Fix some bugs to get the test cases to run clean.
---
 lib/xmerl/include/xmerl.hrl                        |   1 +
 lib/xmerl/src/xmerl_scan.erl                       | 110 +++++++++++++--------
 lib/xmerl/src/xmerl_validate.erl                   | 103 ++++++++++---------
 lib/xmerl/src/xmerl_xsd.erl                        |  63 +++++++-----
 lib/xmerl/test/xmerl_SUITE.erl                     |  36 ++++++-
 lib/xmerl/test/xmerl_SUITE_data/misc.tar.gz        | Bin 47340 -> 48157 bytes
 .../test/xmerl_SUITE_data/xpath/xpath_abbrev.erl   |   2 +-
 lib/xmerl/vsn.mk                                   |   2 +-
 8 files changed, 198 insertions(+), 119 deletions(-)

(limited to 'lib/xmerl')

diff --git a/lib/xmerl/include/xmerl.hrl b/lib/xmerl/include/xmerl.hrl
index e75528ae34..3760a5cce0 100644
--- a/lib/xmerl/include/xmerl.hrl
+++ b/lib/xmerl/include/xmerl.hrl
@@ -156,6 +156,7 @@
 	  declarations = [],	   % [{Name, Attrs}]
 	  doctype_name,
 	  doctype_DTD = internal, % internal | DTDId
+	  comments = true,
 	  document = false,
 	  default_attrs = false,
 	  rules,
diff --git a/lib/xmerl/src/xmerl_scan.erl b/lib/xmerl/src/xmerl_scan.erl
index 5f61fe2bb1..ec7ea534d6 100644
--- a/lib/xmerl/src/xmerl_scan.erl
+++ b/lib/xmerl/src/xmerl_scan.erl
@@ -103,6 +103,9 @@
 %%  <dt><code>{document, Flag}</code></dt>
 %%    <dd>Set to 'true' if xmerl should return a complete XML document
 %%    as an xmlDocument record (default 'false').</dd>
+%%  <dt><code>{comments, Flag}</code></dt>
+%%    <dd>Set to 'false' if xmerl should skip comments otherwise they will
+%%    be returned as xmlComment records (default 'true').</dd>
 %%  <dt><code>{default_attrs, Flag}</code></dt>
 %%    <dd>Set to 'true' if xmerl should add to elements missing attributes
 %%    with a defined default value (default 'false').</dd>
@@ -394,6 +397,8 @@ initial_state([{doctype_DTD,DTD}|T], S) ->
     initial_state(T,S#xmerl_scanner{doctype_DTD = DTD});
 initial_state([{document, F}|T], S) when is_boolean(F) ->
     initial_state(T,S#xmerl_scanner{document = F});
+initial_state([{comments, F}|T], S) when is_boolean(F) ->
+    initial_state(T,S#xmerl_scanner{comments = F});
 initial_state([{default_attrs, F}|T], S) when is_boolean(F) ->
     initial_state(T,S#xmerl_scanner{default_attrs = F});
 initial_state([{text_decl,Bool}|T], S) ->
@@ -546,8 +551,8 @@ scan_document(Str0, S=#xmerl_scanner{event_fun = Event,
     Str=if
 	    Charset == "utf-8" ->
 		Str0;
-	    Charset=/=undefined -> % Default character set is UTF-8
-		xmerl_ucs:to_unicode(Str0,list_to_atom(Charset));
+	    Charset =/= undefined -> % Default character set is UTF-8
+		xmerl_ucs:to_unicode(Str0, list_to_atom(Charset));
 	    true -> %% Charset is undefined if no external input is
                     %% given, and no auto detection of character
                     %% encoding was made.
@@ -559,10 +564,10 @@ scan_document(Str0, S=#xmerl_scanner{event_fun = Event,
 %%     M2 = erlang:memory(),
 %%     io:format("Memory status after prolog: ~p~n",[M2]),
     %%io:format("scan_document 2, prolog parsed~n",[]),
-    T2 = scan_mandatory("<",T1,1,S2,expected_element_start_tag),
+    T2 = scan_mandatory("<", T1, 1, S2, expected_element_start_tag),
 %%     M3 = erlang:memory(),
 %%     io:format("Memory status before element: ~p~n",[M3]),
-    {Res, T3, S3} =scan_element(T2,S2,Pos),
+    {Res, T3, S3} = scan_element(T2,S2,Pos),
 %%     M4 = erlang:memory(),
 %%     io:format("Memory status after element: ~p~n",[M4]),
     {Misc, _Pos1, Tail, S4}=scan_misc(T3, S3, Pos + 1),
@@ -574,41 +579,41 @@ scan_document(Str0, S=#xmerl_scanner{event_fun = Event,
 					       col = S4#xmerl_scanner.col,
 					       data = document}, S4),
 
-    {Res2,S6} = case validation_mode(ValidateResult) of
+    {Res2, S6} = case validation_mode(ValidateResult) of
 	     off ->
-		 {Res,cleanup(S5)};
+		 {Res, cleanup(S5)};
 	     dtd when Env == element; Env == prolog ->
 		 check_decl2(S5),
-		 case xmerl_validate:validate(S5,Res) of
-		     {'EXIT',{error,Reason}} ->
-			 S5b=cleanup(S5),
-			 ?fatal({failed_validation,Reason}, S5b);
-		     {'EXIT',Reason} ->
-			 S5b=cleanup(S5),
-			 ?fatal({failed_validation,Reason}, S5b);
-		     {error,Reason} ->
-			 S5b=cleanup(S5),
-			 ?fatal({failed_validation,Reason}, S5b);
-		     {error,Reason,_Next} ->
-			 S5b=cleanup(S5),
-			 ?fatal({failed_validation,Reason}, S5b);
+		 case xmerl_validate:validate(S5, Res) of
+		     {'EXIT', {error, Reason}} ->
+			 S5b = cleanup(S5),
+			 ?fatal({failed_validation, Reason}, S5b);
+		     {'EXIT', Reason} ->
+			 S5b = cleanup(S5),
+			 ?fatal({failed_validation, Reason}, S5b);
+		     {error, Reason} ->
+			 S5b = cleanup(S5),
+			 ?fatal({failed_validation, Reason}, S5b);
+		     {error, Reason, _Next} ->
+			 S5b = cleanup(S5),
+			 ?fatal({failed_validation, Reason}, S5b);
 		     _XML ->
-			 {Res,cleanup(S5)}
+			 {Res, cleanup(S5)}
 		 end;
 	     schema ->
-		 case schemaLocations(Res,S5) of
-		     {ok,Schemas} ->
+		 case schemaLocations(Res, S5) of
+		     {ok, Schemas} ->
 			 cleanup(S5),
 			 %%io:format("Schemas: ~p~nRes: ~p~ninhertih_options(S): ~p~n",
 			 %%          [Schemas,Res,inherit_options(S5)]),
-			 XSDRes = xmerl_xsd:process_validate(Schemas,Res,
+			 XSDRes = xmerl_xsd:process_validate(Schemas, Res,
 							     inherit_options(S5)),
-			 handle_schema_result(XSDRes,S5);
+			 handle_schema_result(XSDRes, S5);
 		     _ ->
-			 {Res,cleanup(S5)}
+			 {Res, cleanup(S5)}
 		 end;
 	     _ ->
-		 {Res,cleanup(S5)}
+		 {Res, cleanup(S5)}
 	 end,
 
     Res3 =
@@ -617,7 +622,7 @@ scan_document(Str0, S=#xmerl_scanner{event_fun = Event,
 		Content = lists:reverse(Prolog, [Res2 | lists:reverse(Misc)]),
 		#xmlDocument{content = Content};
 	    false ->
-		Res2#xmlElement{pos = 1}
+		Res2
 	end,
     {Res3, Tail, S6}.
 
@@ -633,11 +638,11 @@ scan_decl(Str, S=#xmerl_scanner{event_fun = Event,
 			    data = document}, S),
     
     case scan_prolog(Str, S1, _StartPos = 1) of
-	{T2="<"++_, S2} ->
+	{_,_,T2="<"++_, S2} ->
 	    {{S2#xmerl_scanner.user_state,T2},[],S2};
-	{[], S2}->
+	{_,_,[], S2}->
 	    {[],[],S2};
-	{T2, S2} ->
+	{_,_,T2, S2} ->
 	    {_,_,S3} = scan_content(T2,S2,[],_Attrs=[],S2#xmerl_scanner.space,
 				    _Lang=[],_Parents=[],#xmlNamespace{}),
 	    {T2,[],S3}
@@ -783,16 +788,22 @@ scan_misc([], S=#xmerl_scanner{continuation_fun = F}, Pos, Acc) ->
     F(fun(MoreBytes, S1) -> scan_misc(MoreBytes, S1, Pos, Acc) end,
       fun(S1) -> {Acc, Pos, [], S1} end,
       S);
-scan_misc("<!--" ++ T, S0=#xmerl_scanner{acc_fun = F}, Pos, Acc) -> % Comment
+scan_misc("<!--" ++ T, S0=#xmerl_scanner{acc_fun = F, comments=CF}, Pos, Acc) -> % Comment
     ?bump_col(4),
     {C, T1, S1} = scan_comment(T, S, Pos, _Parents = [], _Lang = []),
-    {Acc2, Pos2, S3} = case F(C, Acc, S1) of
-			   {Acc1, S2} ->
-			       {Acc1, Pos + 1, S2};
-			   {Acc1, Pos1, S2} ->
-			       {Acc1, Pos1, S2}
-		       end,
-    scan_misc(T1,S3,Pos2,Acc2);
+    case CF of
+	true ->
+	    {Acc2, Pos2, S3} = 
+		case F(C, Acc, S1) of
+		    {Acc1, S2} ->
+			{Acc1, Pos + 1, S2};
+		    {Acc1, Pos1, S2} ->
+			{Acc1, Pos1, S2}
+		end,
+	    scan_misc(T1, S3, Pos2, Acc2);
+	false ->
+	    scan_misc(T1, S1, Pos, Acc)
+    end;
 scan_misc("<?" ++ T, S0=#xmerl_scanner{acc_fun = F}, Pos, Acc) -> % PI
     ?dbg("prolog(\"<?\")~n", []),
     ?bump_col(2),
@@ -2553,6 +2564,23 @@ scan_content("&" ++ T, S0, Pos, Name, Attrs, Space, Lang, Parents, NS, Acc,[]) -
 	_ ->
 	    scan_content(string_to_char_set(S1#xmerl_scanner.encoding,ExpRef)++T1,S1,Pos,Name,Attrs,Space,Lang,Parents,NS,Acc,[])
     end;
+scan_content("<!--" ++ T, S0=#xmerl_scanner{acc_fun = F, comments=CF}, Pos, Name, Attrs, Space, 
+	     Lang, Parents, NS, Acc,[]) ->
+    ?bump_col(4),
+    {C, T1, S1} = scan_comment(T, S, Pos, Parents, Lang),
+    case CF of
+	true ->
+	    {Acc2, Pos2, S3} = 
+		case F(C, Acc, S1) of
+		    {Acc1, S2} ->
+			{Acc1, Pos + 1, S2};
+		    {Acc1, Pos1, S2} ->
+			{Acc1, Pos1, S2}
+		end,
+	    scan_content(T1, S3, Pos2, Name, Attrs, Space, Lang, Parents, NS, Acc2,[]);
+	false ->
+	    scan_content(T1, S1, Pos, Name, Attrs, Space, Lang, Parents, NS, Acc,[])
+    end;   
 scan_content("<" ++ T, S0, Pos, Name, Attrs, Space, Lang, Parents, NS, Acc,[]) ->
     ?bump_col(1),
     {Markup, T1, S1} = 
@@ -2612,10 +2640,6 @@ scan_content_markup("![CDATA[" ++ T, S0, Pos, _Name, _Attrs,
 scan_content_markup("?"++T,S0,Pos,_Name,_Attrs,_Space,_Lang,Parents,_NS) ->
     ?bump_col(1),
     scan_pi(T, S, Pos, Parents);
-scan_content_markup("!--" ++ T, S0, Pos, _Name, _Attrs,
-		    _Space, Lang, Parents, _NS) ->
-    ?bump_col(1),
-    scan_comment(T, S, Pos, Parents, Lang);
 scan_content_markup(T, S, Pos, _Name, _Attrs, Space, Lang, Parents, NS) ->
     scan_element(T, S, Pos, Space, Lang, Parents, NS).
 
@@ -4033,7 +4057,7 @@ schemaLocations(El,#xmerl_scanner{schemaLocation=SL}) ->
 
 schemaLocations(#xmlElement{attributes=Atts,xmlbase=_Base}) -> 
     Pred = fun(#xmlAttribute{name=schemaLocation}) -> false;
-	      (#xmlAttribute{namespace={_,"schemaLocation"}}) -> false;
+	      (#xmlAttribute{nsinfo={_,"schemaLocation"}}) -> false;
 	      (_) -> true
 	   end,
     case lists:dropwhile(Pred,Atts) of
diff --git a/lib/xmerl/src/xmerl_validate.erl b/lib/xmerl/src/xmerl_validate.erl
index 893e23ca34..4028fef2b9 100644
--- a/lib/xmerl/src/xmerl_validate.erl
+++ b/lib/xmerl/src/xmerl_validate.erl
@@ -399,25 +399,28 @@ test_attribute_value(_Rule,Attr,_,_) ->
 
 %% +type valid_contents([rule()],[xmlElement()])->
 %%              [xmlElement() | {error,???}.
-valid_contents(Rule,XMLS,Rules,S,WSActionMode)->
-    case parse(Rule,XMLS,Rules,WSActionMode,S) of
-	{XML_N,[]}->
-	    lists:flatten(XML_N);
-	{_,[#xmlElement{name=Name}|_T]} ->
-	    exit({error,{element,Name,isnt_comprise_in_the_rule,Rule}});
-	{_,[#xmlText{}=Txt|_T]} ->
-	    exit({error,{element,text,Txt,isnt_comprise_in_the_rule,Rule}});
-	{error,Reason} ->
-	    {error,Reason};
-	{error,Reason,N} ->
-	    {error,Reason,N}
+valid_contents(Rule, XMLS, Rules, S, WSActionMode)->
+    case parse(Rule, XMLS, Rules, WSActionMode, S) of
+	{error, Reason} ->
+	    {error, Reason};
+	{error, Reason, N} ->
+	    {error, Reason, N};
+	{XML_N, Rest} ->   %The list may consist of xmlComment{} records
+	    case lists:dropwhile(fun(X) when is_record(X, xmlComment) -> true; (_) -> false end, Rest) of 
+		[] ->
+		    lists:flatten(XML_N);
+		[#xmlElement{name=Name} |_T] ->
+		    exit({error, {element, Name, isnt_comprise_in_the_rule, Rule}});
+		[#xmlText{} = Txt |_T] ->
+		    exit({error, {element, text, Txt, isnt_comprise_in_the_rule, Rule}})
+	    end
     end.
 
-parse({'*',SubRule},XMLS,Rules,WSaction,S)->
-    star(SubRule,XMLS,Rules,WSaction,[],S); 
-parse({'+',SubRule},XMLS,Rules,WSaction,S) ->
-    plus(SubRule,XMLS,Rules,WSaction,S);
-parse({choice,CHOICE},XMLS,Rules,WSaction,S)->
+parse({'*', SubRule}, XMLS, Rules, WSaction, S)->
+    star(SubRule, XMLS, Rules, WSaction, [], S); 
+parse({'+',SubRule}, XMLS, Rules, WSaction, S) ->
+    plus(SubRule, XMLS, Rules, WSaction, S);
+parse({choice,CHOICE}, XMLS, Rules, WSaction, S)->
 %    case XMLS of
 %	[] ->
 %	    io:format("~p~n",[{choice,CHOICE,[]}]);
@@ -426,47 +429,49 @@ parse({choice,CHOICE},XMLS,Rules,WSaction,S)->
 %	[#xmlText{value=V}|_] ->
 %	    io:format("~p~n",[{choice,CHOICE,{text,V}}])
 %    end,
-    choice(CHOICE,XMLS,Rules,WSaction,S);
-parse(empty,[],_Rules,_WSaction,_S) ->
-    {[],[]};
-parse({'?',SubRule},XMLS,Rules,_WSaction,S)->
-    question(SubRule,XMLS,Rules,S);
-parse({seq,List},XMLS,Rules,WSaction,S) ->
-    seq(List,XMLS,Rules,WSaction,S);
-parse(El_Name,[#xmlElement{name=El_Name}=XML|T],Rules,_WSaction,S) 
+    choice(CHOICE, XMLS, Rules, WSaction, S);
+parse(empty, [], _Rules, _WSaction, _S) ->
+    {[], []};
+parse({'?', SubRule}, XMLS, Rules, _WSaction, S)->
+    question(SubRule, XMLS, Rules, S);
+parse({seq,List}, XMLS, Rules, WSaction, S) ->
+    seq(List, XMLS, Rules, WSaction, S);
+parse(El_Name, [#xmlElement{name=El_Name} = XML |T], Rules, _WSaction, S) 
   when is_atom(El_Name)->
-    case do_validation(read_rules(Rules,El_Name),XML,Rules,S) of
-	{error,R} ->
+    case do_validation(read_rules(Rules, El_Name), XML, Rules, S) of
+	{error, R} ->
 %	    {error,R};
 	    exit(R);
-	{error,R,_N}->
+	{error, R, _N}->
 %	    {error,R,N};
 	    exit(R);
 	XML_->
-	    {[XML_],T}
+	    {[XML_], T}
     end;
-parse(any,Cont,Rules,_WSaction,S) ->
-    case catch parse_any(Cont,Rules,S) of
-	Err = {error,_} -> Err;
-	ValidContents -> {ValidContents,[]}
+parse(any, Cont, Rules, _WSaction, S) ->
+    case catch parse_any(Cont, Rules, S) of
+	Err = {error, _} -> Err;
+	ValidContents -> {ValidContents, []}
     end;
-parse(El_Name,[#xmlElement{name=Name}|_T]=S,_Rules,_WSa,_S) when is_atom(El_Name)->
+parse(El_Name, [#xmlElement{name=Name} |_T] = XMLS, _Rules, _WSa, _S) when is_atom(El_Name) ->
     {error,
-     {element_seq_not_conform,{wait,El_Name},{is,Name}},
-     {{next,S},{act,[]}} };
-parse(_El_Name,[#xmlPI{}=H|T],_Rules,_WSa,_S) ->
-    {[H],T};
-parse('#PCDATA',XML,_Rules,_WSa,_S)->
+     {element_seq_not_conform,{wait, El_Name}, {is, Name}},
+     {{next, XMLS}, {act, []}}};
+parse(El_Name, [#xmlComment{} |T], Rules, WSa, S) ->
+    parse(El_Name, T, Rules, WSa, S);
+parse(_El_Name, [#xmlPI{} = H |T], _Rules, _WSa, _S) ->
+    {[H], T};
+parse('#PCDATA', XMLS, _Rules, _WSa, _S)->
     %%% PCDATA it is 0 , 1 or more #xmlText{}.
-    parse_pcdata(XML);
-parse(El_Name,[#xmlText{}|_T]=S,_Rules,_WSa,_S)->
+    parse_pcdata(XMLS);
+parse(El_Name, [#xmlText{}|_T] = XMLS, _Rules, _WSa, _S)->
     {error,
-     {text_in_place_of,El_Name},
-     {{next,S},{act,[]}}};
-parse([],_,_,_,_) ->
-    {error,no_rule};
-parse(Rule,[],_,_,_) ->
-    {error,{no_xml_element,Rule}}.
+     {text_in_place_of, El_Name},
+     {{next, XMLS}, {act, []}}};
+parse([], _, _, _, _) ->
+    {error, no_rule};
+parse(Rule, [], _, _, _) ->
+    {error, {no_xml_element, Rule}}.
 
 parse_any([],_Rules,_S) ->
     [];
@@ -618,11 +623,15 @@ el_name(#xmlElement{name=Name})->
 
 parse_pcdata([#xmlText{}=H|T])->
     parse_pcdata(T,[H]);
+parse_pcdata([#xmlComment{}|T])->
+    parse_pcdata(T,[]);
 parse_pcdata(H) ->
     {[],H}.
 
 parse_pcdata([#xmlText{}=H|T],Acc)->
     parse_pcdata(T,Acc++[H]);
+parse_pcdata([#xmlComment{}|T],Acc)->
+    parse_pcdata(T,Acc);
 parse_pcdata(H,Acc) ->
     {Acc,H}.
 
diff --git a/lib/xmerl/src/xmerl_xsd.erl b/lib/xmerl/src/xmerl_xsd.erl
index dfdc6138ef..ed0890f0d0 100644
--- a/lib/xmerl/src/xmerl_xsd.erl
+++ b/lib/xmerl/src/xmerl_xsd.erl
@@ -245,21 +245,27 @@ process_validate2({SE,_},Schema,Xml,Opts) ->
     S4 = validation_options(S3,Opts),
     validate3(Schema,Xml,S4).
 
-validate3(Schema,Xml,S=#xsd_state{errors=[]}) -> 
-    Ret = {_,S2} = 
-	case catch validate_xml(Xml,S) of
-	    {[XML2],[],Sx}  ->
-		{XML2,Sx};
-	    {XML2,[],Sx} ->
-		{XML2,Sx};
-	    {_,UnValidated,Sx} ->
-		{Xml,acc_errs(Sx,{error_path(UnValidated,Xml#xmlElement.name),?MODULE,
-				  {unvalidated_rest,UnValidated}})};
-	    _Err = {error,Reason} ->
-		{Xml,acc_errs(S,Reason)};
-	    {'EXIT',Reason} ->
-		{Xml,acc_errs(S,{error_path(Xml,Xml#xmlElement.name),?MODULE,
-				 {undefined,{internal_error,Reason}}})}
+validate3(Schema, Xml,S =#xsd_state{errors=[]}) -> 
+    Ret = {_, S2} = 
+	case catch validate_xml(Xml, S) of
+	    _Err = {error, Reason} ->
+		{Xml, acc_errs(S, Reason)};
+	    {'EXIT', Reason} ->
+		{Xml, acc_errs(S, {error_path(Xml, Xml#xmlElement.name), ?MODULE,
+				 {undefined, {internal_error, Reason}}})};
+	    {XML2, Rest, Sx} ->
+		case lists:dropwhile(fun(X) when is_record(X, xmlComment) -> true; (_) -> false end, Rest) of
+		    [] ->
+			case XML2 of
+			    [XML3] ->
+				{XML3,Sx};
+			    XML3 ->
+				{XML3,Sx}
+			end;
+		    UnValidated ->
+			{Xml,acc_errs(Sx,{error_path(UnValidated,Xml#xmlElement.name),?MODULE,
+					  {unvalidated_rest,UnValidated}})}
+		end
 	end,
     save_to_file(S2,filename:rootname(Schema)++".tab2"),
     case S2#xsd_state.errors of
@@ -1950,7 +1956,7 @@ fetch_external_schema(Path,S) when is_list(Path) ->
 			{EXSD,S#xsd_state{schema_name=File}}
 		end;
 	    {_,{string,String},_} -> %% this is for a user defined fetch fun that returns an xml document on string format.
-		?debug("scanning string: ~p~n",[File]),
+		?debug("scanning string: ~p~n",[String]),
 		case xmerl_scan:string(String,S#xsd_state.xml_options) of
 		    {error,Reason} ->
 			{error,acc_errs(S,{[],?MODULE,{parsing_external_schema_failed,Path,Reason}})};
@@ -2520,9 +2526,9 @@ check_element_type([],#schema_complex_type{name=_Name,block=_Bl,content=C},
 	    {error,{error_path(Checked,undefined),?MODULE,
 		    {empty_content_not_allowed,C}}}
     end;
-check_element_type(C,{anyType,_},_Env,_Block,S,_Checked) ->
+check_element_type(C, {anyType, _}, _Env, _Block, S, _Checked) ->
     %% permitt anything
-    {C,[],S};
+    {lists:reverse(C), [], S};
 
 check_element_type(XML=[#xmlText{}|_],Type=#schema_simple_type{},
 		    _Env,_Block,S,_Checked) ->
@@ -2585,7 +2591,7 @@ check_element_type(XML=[XMLEl=#xmlElement{name=Name}|RestXML],
 	    S6 = check_form(ElName,Name,XMLEl,
 			    actual_form_value(CMEl#schema_element.form,
 					      S5#xsd_state.elementFormDefault),
-			    S5),
+			    S5), 
 	    %Step into content of XML element.
 	    {Content,_,S7} =
 		case
@@ -2605,12 +2611,12 @@ check_element_type(XML=[XMLEl=#xmlElement{name=Name}|RestXML],
 	     RestXML,
 	     set_scope(S5#xsd_state.scope,set_num_el(S7,S6))};
 	true ->
-	    {error,{error_path(XMLEl,Name),?MODULE,
-		    {element_not_suitable_with_schema,ElName,S}}};
+	    {error,{error_path(XMLEl, Name), ?MODULE,
+		    {element_not_suitable_with_schema, ElName, S}}};
 	_ when S#xsd_state.num_el >= Min -> 
 	    %% it may be a match error or an optional element not
 	    %% present
-	    {[],XML,S#xsd_state{num_el=0}}; 
+	    {[], XML, S#xsd_state{num_el=0}}; 
 	_ -> 
 	    {error,{error_path(XMLEl,Name),?MODULE,
 		    {element_not_suitable_with_schema,ElName,CMName,CMEl,S}}}
@@ -2645,7 +2651,7 @@ check_element_type(XML=[#xmlElement{}|_Rest],
 check_element_type(XML=[E=#xmlElement{name=Name}|Rest],
 		   Any={any,{Namespace,_Occ={Min,_},ProcessorContents}},Env,
 		   _Block,S,_Checked) ->
-    ?debug("check any: {any,{~p,~p,~p}}~n",[Namespace,Occ,ProcessorContents]),
+    ?debug("check any: {any,{~p,~p,~p}}~n",[Namespace,_Occ,ProcessorContents]),
     %% ProcessorContents any of lax | strict | skip
     %% lax: may validate if schema is found
     %% strict: must validate
@@ -2710,8 +2716,11 @@ check_element_type([],CM,_Env,_Block,S,Checked) ->
 	    {error,{error_path(Checked,undefined),?MODULE,
 		    {empty_content_not_allowed,CM}}}
     end;
+check_element_type([C = #xmlComment{} |Rest],CM,Env,Block,S,Checked) ->
+     check_element_type(Rest,CM,Env,Block,S,[C |Checked]);
 check_element_type(XML,CM,_Env,_Block,S,_Checked) ->
     {error,{error_path(XML,undefined),?MODULE,{match_failure,XML,CM,S}}}.
+
 %% single xml content object and single schema object
 check_text_type(XML=[#xmlText{}|_],optional_text,S) ->
 %    {XMLTxt,optional_text};
@@ -2730,7 +2739,7 @@ check_text_type([XMLTxt=#xmlText{}|_],CMEl,_S) ->
 	    {cannot_contain_text,XMLTxt,CMEl}}}.
 
 split_xmlText(XML) ->
-    splitwith(fun(#xmlText{}) -> true;(_) -> false end,XML).
+    splitwith(fun(#xmlText{}) -> true;(#xmlComment{}) -> true;(_) -> false end,XML).
 
 %% Sequence
 check_sequence([T=#xmlText{}|Rest],Els,Occ,Env,S,Checked) ->
@@ -2773,6 +2782,8 @@ check_sequence(Seq=[_InstEl=#xmlElement{}|_],[El|Els],Occ={_Min,_Max},Env,S,Chec
 			   count_num_el(set_num_el(S3,S2)),
 			   Ret++Checked)
     end;
+check_sequence([C = #xmlComment{} |Rest], Els, Occ, Env, S, Checked) ->
+    check_sequence(Rest,Els,Occ,Env,S,[C |Checked]);
 check_sequence(Rest,[],_Occ,_Env,S,Checked) ->
     {Checked,Rest,set_num_el(S,0)};
 check_sequence([],Els,_Occ,_Env,S,Checked) ->
@@ -2869,6 +2880,8 @@ check_all(XML=[E=#xmlElement{name=Name}|RestXML],CM,Occ,Env,S,
 		   {element_not_in_all,ElName,E,CM}},
 	    check_all(RestXML,CM,Occ,Env,acc_errs(S,Err),[E|Checked],PrevXML)
     end;
+check_all([C=#xmlComment{} |RestXML], CM, Occ, Env, S, Checked, XML) ->
+    check_all(RestXML, CM, Occ, Env, S, [C |Checked], XML);
 check_all(XML,[],_,_,S,Checked,_) ->
     {Checked,XML,S};
 check_all([],CM,_Occ,_,S,Checked,_PrevXML) ->
@@ -2920,7 +2933,7 @@ check_target_namespace(XMLEl,S) ->
 
 schemaLocations(El=#xmlElement{attributes=Atts},S) ->
     Pred = fun(#xmlAttribute{name=schemaLocation}) -> false;
-	      (#xmlAttribute{namespace={_,"schemaLocation"}}) -> false;
+	      (#xmlAttribute{nsinfo={_,"schemaLocation"}}) -> false;
 	      (_) -> true
 	   end,
     case lists:dropwhile(Pred,Atts) of
diff --git a/lib/xmerl/test/xmerl_SUITE.erl b/lib/xmerl/test/xmerl_SUITE.erl
index 94c38d4d48..55b6d1844c 100644
--- a/lib/xmerl/test/xmerl_SUITE.erl
+++ b/lib/xmerl/test/xmerl_SUITE.erl
@@ -58,7 +58,7 @@ groups() ->
      {ticket_tests, [],
       [ticket_5998, ticket_7211, ticket_7214, ticket_7430,
        ticket_6873, ticket_7496, ticket_8156, ticket_8697,
-       ticket_9411, ticket_9457]},
+       ticket_9411, ticket_9457, ticket_9664_schema, ticket_9664_dtd]},
      {app_test, [], [{xmerl_app_test, all}]},
      {appup_test, [], [{xmerl_appup_test, all}]}].
 
@@ -284,7 +284,7 @@ export(Config) ->
     ?line {E,_} = xmerl_scan:file(TestFile),
     ?line Exported = xmerl:export([E],xmerl_xml,[{prolog,Prolog}]),
     B = list_to_binary(Exported++"\n"),
-    ?line {ok,B} = file:read_file(TestFile),
+    ?line {ok, B} = file:read_file(TestFile),
     ok.
 
 %%----------------------------------------------------------------------
@@ -609,6 +609,38 @@ ticket_9457_cont(Continue, Exception, GlobalState) ->
 	    Exception(GlobalState)
     end.
 
+
+ticket_9664_schema(suite) -> [];
+ticket_9664_schema(doc) -> 
+    ["Test that comments are handled correct whith"];
+ticket_9664_schema(Config) ->
+
+    ?line {E, _} = xmerl_scan:file(filename:join([?config(data_dir, Config), misc,
+						  "ticket_9664_schema.xml"]),[]),
+    ?line {ok, S} = xmerl_xsd:process_schema(filename:join([?config(data_dir, Config), misc,
+							    "motorcycles.xsd"])),
+    ?line {E1, _} = xmerl_xsd:validate(E, S),
+
+    ?line {E1,_} = xmerl_xsd:process_validate(filename:join([?config(data_dir,Config), misc,
+							    "motorcycles.xsd"]),E,[]),
+
+    ?line {E1,_} = xmerl_scan:file(filename:join([?config(data_dir,Config),  misc,
+						 "ticket_9664_schema.xml"]), 
+				  [{schemaLocation, [{"mc", "motorcycles.xsd"}]},
+				   {validation, schema}]),
+    ok.
+
+ticket_9664_dtd(suite) -> [];
+ticket_9664_dtd(doc) -> 
+    ["Test that comments are handled correct whith"];
+ticket_9664_dtd(Config) ->
+    ?line {E, _} = xmerl_scan:file(filename:join([?config(data_dir, Config),  misc,
+						  "ticket_9664_dtd.xml"]),[]),
+    ?line {E, _} = xmerl_scan:file(filename:join([?config(data_dir, Config),  misc,
+						  "ticket_9664_dtd.xml"]),[{validation, true}]),
+    ok.
+
+
 %%======================================================================
 %% Support Functions
 %%======================================================================
diff --git a/lib/xmerl/test/xmerl_SUITE_data/misc.tar.gz b/lib/xmerl/test/xmerl_SUITE_data/misc.tar.gz
index fef7431845..ffc1d327a5 100644
Binary files a/lib/xmerl/test/xmerl_SUITE_data/misc.tar.gz and b/lib/xmerl/test/xmerl_SUITE_data/misc.tar.gz differ
diff --git a/lib/xmerl/test/xmerl_SUITE_data/xpath/xpath_abbrev.erl b/lib/xmerl/test/xmerl_SUITE_data/xpath/xpath_abbrev.erl
index 850b7f8135..7b6f1e95b3 100644
--- a/lib/xmerl/test/xmerl_SUITE_data/xpath/xpath_abbrev.erl
+++ b/lib/xmerl/test/xmerl_SUITE_data/xpath/xpath_abbrev.erl
@@ -210,7 +210,7 @@ ticket_7496() ->
     ?line {Doc3,_} = xmerl_scan:file("documentRoot.xml"),
     ?line ok = Test(Doc3,"//child",[child,child,child]),
     ?line ok = Test(Doc3,"//child[@name='beta']",[child]),
-    ?line [{xmlAttribute,id,[],[],[],[],1,[],"2",false}] =
+    ?line [{xmlAttribute,id,[],[],[],_,1,[],"2",false}] =
 	xmerl_xpath:string("/documentRoot/parent/child[@name='beta']/@id",Doc3),
     ?line ok = Test(Doc3,"/documentRoot/parent/child|/documentRoot/parent/pet",
 		    [child,child,child,pet,pet]),
diff --git a/lib/xmerl/vsn.mk b/lib/xmerl/vsn.mk
index 82df8fdeef..de47e3418b 100644
--- a/lib/xmerl/vsn.mk
+++ b/lib/xmerl/vsn.mk
@@ -1 +1 @@
-XMERL_VSN = 1.2.10
+XMERL_VSN = 1.3
-- 
cgit v1.2.3