[mvp-xml-cvs] nxslt/v2/src NxsltMain.cs,1.3,1.4 TypeUtils.cs,1.1,1.2 Utils.cs,1.1,1.2 issues.txt,1.1,1.2

[Oleg T. <he...@us...>]

Update of /cvsroot/mvp-xml/nxslt/v2/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12347/v2/src

Modified Files:
	NxsltMain.cs TypeUtils.cs Utils.cs issues.txt 
Log Message:


Index: issues.txt
===================================================================
RCS file: /cvsroot/mvp-xml/nxslt/v2/src/issues.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- issues.txt	29 Nov 2005 22:05:36 -0000	1.1
+++ issues.txt	4 Dec 2005 15:33:20 -0000	1.2
@@ -1,4 +1,3 @@
 1. Move to regexp in xmlns parsing.
 2. The same for parsing parameters.
-3. No more partial assembly names.
-4. Add XSLT settings to options (trusted/encoding).
\ No newline at end of file
+3. Add XSLT settings to options (trusted/encoding).
\ No newline at end of file

Index: TypeUtils.cs
===================================================================
RCS file: /cvsroot/mvp-xml/nxslt/v2/src/TypeUtils.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- TypeUtils.cs	29 Nov 2005 22:05:36 -0000	1.1
+++ TypeUtils.cs	4 Dec 2005 15:33:20 -0000	1.2
@@ -43,8 +43,7 @@
         //                
         try
         {
-          //assembly = Assembly.LoadWithPartialName(options.AssemblyName);
-          assembly = Assembly.Load(options.AssemblyName);
+          assembly = Assembly.LoadWithPartialName(options.AssemblyName);          
         }
         catch
         {

Index: Utils.cs
===================================================================
RCS file: /cvsroot/mvp-xml/nxslt/v2/src/Utils.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Utils.cs	29 Nov 2005 22:05:36 -0000	1.1
+++ Utils.cs	4 Dec 2005 15:33:20 -0000	1.2
@@ -4,6 +4,8 @@
 using System.Net;
 using System.Text.RegularExpressions;
 using System.Xml.XPath;
+using Mvp.Xml.XInclude;
+using System.IO;
 
 namespace XmlLab.nxslt
 {
@@ -100,5 +102,29 @@
               m.Groups[2].Value;
             return href;
         }
+
+        public static XmlReader CreateReader(string filename, XmlReaderSettings settings, NXsltOptions options)
+        {
+            if (options.ProcessXInclude)
+            {
+                return XmlReader.Create(new XIncludingReader(filename), settings);
+            }
+            else
+            {
+                return XmlReader.Create(filename, settings);
+            }
+        }
+
+        public static XmlReader CreateReader(Stream stream, XmlReaderSettings settings, NXsltOptions options)
+        {
+            if (options.ProcessXInclude)
+            {
+                return XmlReader.Create(new XIncludingReader(stream), settings);
+            }
+            else
+            {
+                return XmlReader.Create(stream, settings);
+            }
+        }
     }
 }

Index: NxsltMain.cs
===================================================================
RCS file: /cvsroot/mvp-xml/nxslt/v2/src/NxsltMain.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- NxsltMain.cs	1 Dec 2005 16:56:38 -0000	1.3
+++ NxsltMain.cs	4 Dec 2005 15:33:19 -0000	1.4
@@ -344,12 +344,12 @@
             else if (options.LoadSourceFromStdin)
             {
                 //Get source from stdin 
-                srcReader = XmlReader.Create(Console.OpenStandardInput(), srcReaderSettings);
+                srcReader = Utils.CreateReader(Console.OpenStandardInput(), srcReaderSettings, options);
             }
             else
             {
                 //Get source from URI
-                srcReader = XmlReader.Create(options.Source, srcReaderSettings);
+                srcReader = Utils.CreateReader(options.Source, srcReaderSettings, options);
             }
             //Chain schema validaring reader on top
             if (options.ValidateDocs)
@@ -392,12 +392,12 @@
             else if (options.LoadStylesheetFromStdin)
             {
                 //Get stylesheet from stdin 
-                stylesheetReader = XmlReader.Create(Console.OpenStandardInput(), stylesheetReaderSettings);
+                stylesheetReader = Utils.CreateReader(Console.OpenStandardInput(), stylesheetReaderSettings, options);
             }
             else
             {
                 //Get source from URI
-                stylesheetReader = XmlReader.Create(options.Stylesheet, stylesheetReaderSettings);
+                stylesheetReader = Utils.CreateReader(options.Stylesheet, stylesheetReaderSettings, options);
             }
             //Chain schema validaring reader on top
             if (options.ValidateDocs)