Author: atsushi
Date: 2005-03-07 06:10:45 -0500 (Mon, 07 Mar 2005)
New Revision: 41517
Modified:
trunk/mcs/class/System.XML/Mono.Xml.Xsl.Operations/ChangeLog
trunk/mcs/class/System.XML/Mono.Xml.Xsl.Operations/XslCopy.cs
trunk/mcs/class/System.XML/Mono.Xml.Xsl.Operations/XslLiteralElement.cs
trunk/mcs/class/System.XML/Mono.Xml.Xsl/ChangeLog
trunk/mcs/class/System.XML/Mono.Xml.Xsl/XslTransformProcessor.cs
Log:
2005-03-07 Atsushi Enomoto <[EMAIL PROTECTED]>
* XslTransformProcessor.cs : renamed TryElementNamespacesOutput() to
OutputLiteralNamespaceUriNodes() so that everyone can understand
what it means and when it should be invoked.
* XslLiteralElement.cs : renamed TryElementNamespacesOutput() to
OutputLiteralNamespaceUriNodes() so that everyone can understand
what it means and when it should be invoked.
* XslCopy.cs : So for example literal namespace URIs should not be
copied here ;-)
Modified: trunk/mcs/class/System.XML/Mono.Xml.Xsl/ChangeLog
===================================================================
--- trunk/mcs/class/System.XML/Mono.Xml.Xsl/ChangeLog 2005-03-07 11:05:41 UTC
(rev 41516)
+++ trunk/mcs/class/System.XML/Mono.Xml.Xsl/ChangeLog 2005-03-07 11:10:45 UTC
(rev 41517)
@@ -1,3 +1,9 @@
+2005-03-07 Atsushi Enomoto <[EMAIL PROTECTED]>
+
+ * XslTransformProcessor.cs : renamed TryElementNamespacesOutput() to
+ OutputLiteralNamespaceUriNodes() so that everyone can understand
+ what it means and when it should be invoked.
+
2005-03-04 Atsushi Enomoto <[EMAIL PROTECTED]>
* Compiler.cs : added another CompileTemplateContent() which is
Modified: trunk/mcs/class/System.XML/Mono.Xml.Xsl/XslTransformProcessor.cs
===================================================================
--- trunk/mcs/class/System.XML/Mono.Xml.Xsl/XslTransformProcessor.cs
2005-03-07 11:05:41 UTC (rev 41516)
+++ trunk/mcs/class/System.XML/Mono.Xml.Xsl/XslTransformProcessor.cs
2005-03-07 11:10:45 UTC (rev 41517)
@@ -317,13 +317,9 @@
currentTemplateStack.Pop ();
}
- internal void TryElementNamespacesOutput (Hashtable nsDecls,
ArrayList excludedPrefixes)
+ // Outputs Literal namespace nodes described in spec 7.7.1
+ internal void OutputLiteralNamespaceUriNodes (Hashtable
nsDecls, ArrayList excludedPrefixes, string localPrefixInCopy)
{
- TryElementNamespacesOutput (nsDecls, excludedPrefixes,
null);
- }
-
- internal void TryElementNamespacesOutput (Hashtable nsDecls,
ArrayList excludedPrefixes, string localPrefixInCopy)
- {
if (nsDecls == null)
return;
Modified: trunk/mcs/class/System.XML/Mono.Xml.Xsl.Operations/ChangeLog
===================================================================
--- trunk/mcs/class/System.XML/Mono.Xml.Xsl.Operations/ChangeLog
2005-03-07 11:05:41 UTC (rev 41516)
+++ trunk/mcs/class/System.XML/Mono.Xml.Xsl.Operations/ChangeLog
2005-03-07 11:10:45 UTC (rev 41517)
@@ -1,3 +1,11 @@
+2005-03-07 Atsushi Enomoto <[EMAIL PROTECTED]>
+
+ * XslLiteralElement.cs : renamed TryElementNamespacesOutput() to
+ OutputLiteralNamespaceUriNodes() so that everyone can understand
+ what it means and when it should be invoked.
+ * XslCopy.cs : So for example literal namespace URIs should not be
+ copied here ;-)
+
2005-03-04 Atsushi Enomoto <[EMAIL PROTECTED]>
* XslTemplateContent.cs : inside template, fallback is ignored.
Modified: trunk/mcs/class/System.XML/Mono.Xml.Xsl.Operations/XslCopy.cs
===================================================================
--- trunk/mcs/class/System.XML/Mono.Xml.Xsl.Operations/XslCopy.cs
2005-03-07 11:05:41 UTC (rev 41516)
+++ trunk/mcs/class/System.XML/Mono.Xml.Xsl.Operations/XslCopy.cs
2005-03-07 11:10:45 UTC (rev 41517)
@@ -87,7 +87,6 @@
p.PushElementState (prefix,
p.CurrentNode.LocalName, p.CurrentNode.NamespaceURI, true);
p.Out.WriteStartElement (prefix,
p.CurrentNode.LocalName, p.CurrentNode.NamespaceURI);
- p.TryElementNamespacesOutput (nsDecls, null,
prefix);
if (useAttributeSets != null)
foreach (XmlQualifiedName s in
useAttributeSets)
p.ResolveAttributeSet
(s).Evaluate (p);
@@ -100,7 +99,7 @@
} while
(p.CurrentNode.MoveToNextNamespace (XPathNamespaceScope.ExcludeXml));
p.CurrentNode.MoveToParent ();
}
-
+
if (children != null) children.Evaluate (p);
p.Out.WriteFullEndElement ();
Modified:
trunk/mcs/class/System.XML/Mono.Xml.Xsl.Operations/XslLiteralElement.cs
===================================================================
--- trunk/mcs/class/System.XML/Mono.Xml.Xsl.Operations/XslLiteralElement.cs
2005-03-07 11:05:41 UTC (rev 41516)
+++ trunk/mcs/class/System.XML/Mono.Xml.Xsl.Operations/XslLiteralElement.cs
2005-03-07 11:10:45 UTC (rev 41517)
@@ -133,7 +133,7 @@
((XslLiteralAttribute)attrs
[i]).Evaluate (p);
}
- p.TryElementNamespacesOutput (nsDecls, null, null);
+ p.OutputLiteralNamespaceUriNodes (nsDecls, null, null);
if (children != null) children.Evaluate (p);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
