Index: RssFeed.cs
===================================================================
RCS file: /cvsroot/rss-net/RSS.NET/RssFeed.cs,v
retrieving revision 1.4
diff -u -r1.4 RssFeed.cs
--- RssFeed.cs	3 Sep 2003 03:11:33 -0000	1.4
+++ RssFeed.cs	5 Nov 2003 00:58:46 -0000
@@ -47,6 +47,7 @@
 using System;
 using System.IO;
 using System.Net;
+using System.Text;
 
 namespace Rss
 {
@@ -63,8 +64,12 @@
 		private bool cached = false;
 		private string etag = RssDefault.String;
 		private string url = RssDefault.String;
+		private Encoding encoding = null;
 		/// <summary>Initialize a new instance of the RssFeed class.</summary>
 		public RssFeed() {}
+		/// <summary>Initialize a new instance of the RssFeed class with a specified encoding.</summary>
+		public RssFeed(Encoding enc) { encoding = enc; }
+
 		/// <summary>Returns a string representation of the current Object.</summary>
 		/// <returns>The Url of the feed</returns>
 		public override string ToString()
@@ -112,6 +117,12 @@
 		{
 			get { return url; }
 		}
+		/// <summary>Encoding of the feed</summary>
+		public Encoding Encoding
+		{
+			get { return encoding; }
+			set { encoding = value; }
+		}
 		/// <summary>Reads the specified RSS feed</summary>
 		/// <param name="url">The url or filename of the RSS feed</param>
 		/// <returns>The contents of the feed</returns>
@@ -215,17 +226,31 @@
 		}
 		/// <summary>Writes the RSS feed to the specified stream.</summary>
 		/// <param name="stream">specified Stream</param>
-		/// <remarks>The encoding is ISO-8859-1.</remarks>
 		/// <exception cref="ArgumentException">The Stream cannot be written to.</exception>
 		/// <exception cref="InvalidOperationException">Feed must contain at least one channel.</exception>
 		/// <exception cref="InvalidOperationException">Channel must contain at least one item.</exception>
 		public void Write(Stream stream)
 		{
-			RssWriter writer = new RssWriter(stream);
+			RssWriter writer;
+			
+			if (encoding == null)
+				writer = new RssWriter(stream);
+			else
+				writer = new RssWriter(stream, encoding);
 			write(writer);
 		}
+		/// <summary>Writes the RSS feed to the specified stream using the specified character encoding.</summary>
+		/// <param name="stream">specified Stream</param>
+		/// <param name="enc">the encoding to use</param>
+		/// <exception cref="ArgumentException">The Stream cannot be written to.</exception>
+		/// <exception cref="InvalidOperationException">Feed must contain at least one channel.</exception>
+		/// <exception cref="InvalidOperationException">Channel must contain at least one item.</exception>
+		public void Write(Stream stream, Encoding enc)
+		{
+			encoding = enc;
+			Write(stream);
+		}
 		/// <summary>Writes the RSS feed to the specified file.</summary>
-		/// <remarks>The encoding is ISO-8859-1.</remarks>
 		/// <exception cref="ArgumentException">The filename is empty, contains only white space, or contains one or more invalid characters.</exception>
 		/// <exception cref="UnauthorizedAccessException">Access is denied.</exception>
 		/// <exception cref="ArgumentNullException">The filename is a (null c#, Nothing vb) reference.</exception>
@@ -237,8 +262,19 @@
 		/// <exception cref="InvalidOperationException">Channel must contain at least one item.</exception>
 		public void Write(string fileName)
 		{
-			RssWriter writer = new RssWriter(fileName);
+			RssWriter writer;
+			
+			if (encoding == null)
+				writer = new RssWriter(fileName);
+			else
+				writer = new RssWriter(fileName, encoding);
 			write(writer);
+		}
+		/// <summary>Writes the RSS feed to the specified file using the specified character encoding.</summary>
+		public void Write(string fileName, Encoding enc)
+		{
+			encoding = enc;
+			Write(fileName);
 		}
 		private void write(RssWriter writer)
 		{