2004-03-27 Atsushi Enomoto <[email protected]>

	* DTDReader.cs : In some places sequential parameter entity was
	  incorrectly skipped (and caused invalid result).

svn path=/trunk/mcs/; revision=24661

mcs/class/System.XML/System.Xml/ChangeLog

@@ -1,3 +1,8 @@
+2004-03-27  Atsushi Enomoto <[email protected]>
+
+	* DTDReader.cs : In some places sequential parameter entity was
+	  incorrectly skipped (and caused invalid result).
+
 2004-03-24  Atsushi Enomoto <[email protected]>
 
 	* XmlDocumentNavigator.cs : MoveTo*Namespace() should not iterate

mcs/class/System.XML/System.Xml/DTDReader.cs

@@ -393,6 +393,12 @@ namespace System.Xml
 					TryExpandPERef ();
 					SkipWhitespace ();
 					while(PeekChar () != ')') {
+						SkipWhitespace ();
+						if (PeekChar () == '%') {
+							TryExpandPERef ();
+							SkipWhitespace ();
+							continue;
+						}
 						Expect('|');
 						SkipWhitespace ();
 						TryExpandPERef ();
@@ -417,8 +423,11 @@ namespace System.Xml
 					SkipWhitespace ();
 
 					do {	// copied from ReadCP() ...;-)
-						TryExpandPERef ();
-						SkipWhitespace ();
+						if (PeekChar () == '%') {
+							TryExpandPERef ();
+							SkipWhitespace ();
+							continue;
+						}
 						if(PeekChar ()=='|') {
 							// CPType=Or
 							if (model.OrderType == DTDContentOrderType.Seq)
@@ -485,8 +494,11 @@ namespace System.Xml
 				model.ChildModels.Add (ReadCP (elem));
 				SkipWhitespace ();
 				do {
-					TryExpandPERef ();
-					SkipWhitespace ();
+					if (PeekChar () == '%') {
+						TryExpandPERef ();
+						SkipWhitespace ();
+						continue;
+					}
 					if(PeekChar ()=='|') {
 						// CPType=Or
 						if (model.OrderType == DTDContentOrderType.Seq)