2005-07-09 Chris Burdess <dog@gnu.org>

        * gnu/xml/transform/AbstractNumberNode.java,
        gnu/xml/transform/ApplyImportsNode.java,
        gnu/xml/transform/ApplyTemplatesNode.java,
        gnu/xml/transform/AttributeNode.java,
        gnu/xml/transform/Bindings.java,
        gnu/xml/transform/CallTemplateNode.java,
        gnu/xml/transform/CopyOfNode.java,
        gnu/xml/transform/CurrentFunction.java,
        gnu/xml/transform/DocumentFunction.java,
        gnu/xml/transform/ElementAvailableFunction.java,
        gnu/xml/transform/ElementNode.java,
        gnu/xml/transform/ForEachNode.java,
        gnu/xml/transform/FormatNumberFunction.java,
        gnu/xml/transform/FunctionAvailableFunction.java,
        gnu/xml/transform/GenerateIdFunction.java,
        gnu/xml/transform/IfNode.java,
        gnu/xml/transform/KeyFunction.java,
        gnu/xml/transform/ParameterNode.java,
        gnu/xml/transform/SortKey.java,
        gnu/xml/transform/StreamSerializer.java,
        gnu/xml/transform/Stylesheet.java,
        gnu/xml/transform/SystemPropertyFunction.java,
        gnu/xml/transform/TemplateNode.java,
        gnu/xml/transform/TransformerImpl.java,
        gnu/xml/transform/UnparsedEntityUriFunction.java,
        gnu/xml/transform/ValueOfNode.java,
        gnu/xml/transform/WhenNode.java,
        gnu/xml/transform/WithParam.java,
        gnu/xml/xpath/AndExpr.java,
        gnu/xml/xpath/ArithmeticExpr.java,
        gnu/xml/xpath/BooleanFunction.java,
        gnu/xml/xpath/CeilingFunction.java,
        gnu/xml/xpath/ConcatFunction.java,
        gnu/xml/xpath/Constant.java,
        gnu/xml/xpath/ContainsFunction.java,
        gnu/xml/xpath/CountFunction.java,
        gnu/xml/xpath/EqualityExpr.java,
        gnu/xml/xpath/Expr.java,
        gnu/xml/xpath/FalseFunction.java,
        gnu/xml/xpath/FloorFunction.java,
        gnu/xml/xpath/FunctionCall.java,
        gnu/xml/xpath/IdFunction.java,
        gnu/xml/xpath/LangFunction.java,
        gnu/xml/xpath/LastFunction.java,
        gnu/xml/xpath/LocalNameFunction.java,
        gnu/xml/xpath/NameFunction.java,
        gnu/xml/xpath/NameTest.java,
        gnu/xml/xpath/NamespaceTest.java,
        gnu/xml/xpath/NamespaceUriFunction.java,
        gnu/xml/xpath/NegativeExpr.java,
        gnu/xml/xpath/NodeTypeTest.java,
        gnu/xml/xpath/NormalizeSpaceFunction.java,
        gnu/xml/xpath/NotFunction.java,
        gnu/xml/xpath/NumberFunction.java,
        gnu/xml/xpath/OrExpr.java,
        gnu/xml/xpath/ParenthesizedExpr.java,
        gnu/xml/xpath/Pattern.java,
        gnu/xml/xpath/PositionFunction.java,
        gnu/xml/xpath/Predicate.java,
        gnu/xml/xpath/RelationalExpr.java,
        gnu/xml/xpath/Root.java,
        gnu/xml/xpath/RoundFunction.java,
        gnu/xml/xpath/Selector.java,
        gnu/xml/xpath/StartsWithFunction.java,
        gnu/xml/xpath/Steps.java,
        gnu/xml/xpath/StringFunction.java,
        gnu/xml/xpath/StringLengthFunction.java,
        gnu/xml/xpath/SubstringAfterFunction.java,
        gnu/xml/xpath/SubstringBeforeFunction.java,
        gnu/xml/xpath/SubstringFunction.java,
        gnu/xml/xpath/SumFunction.java,
        gnu/xml/xpath/Test.java,
        gnu/xml/xpath/TranslateFunction.java,
        gnu/xml/xpath/TrueFunction.java,
        gnu/xml/xpath/UnionExpr.java,
        gnu/xml/xpath/VariableReference.java,
        gnu/xml/xpath/XPathParser.java,
        gnu/xml/xpath/XPathParser.y,
        javax/xml/namespace/QName.java: Corrections to handling of XSL
        variables and minor conformance updates.

1 files changed, 15 insertions, 2 deletions

diff --git a/gnu/xml/transform/ValueOfNode.java b/gnu/xml/transform/ValueOfNode.java
index afff2cd99..430598a94 100644
--- a/gnu/xml/transform/ValueOfNode.java
+++ b/gnu/xml/transform/ValueOfNode.java
@@ -85,6 +85,10 @@ final class ValueOfNode
     throws TransformerException
   {
     Object ret = select.evaluate(context, pos, len);
+    /*if (stylesheet.debug)
+      {
+        System.err.println("value-of: " + select + " -> " + ret);
+      }*/
     String value;
     if (ret instanceof Collection)
       {
@@ -100,10 +104,10 @@ final class ValueOfNode
       {
         value = Expr._string(context, ret);
       }
-    /*if (stylesheet.debug)
+    if (stylesheet.debug)
       {
         System.err.println("value-of: "+context+" "+ select + " -> "+ value);
-      }*/
+      }
     if (value != null && value.length() > 0)
       {
         Document doc = (parent instanceof Document) ?
@@ -131,6 +135,15 @@ final class ValueOfNode
       }
   }
 
+  public boolean references(QName var)
+  {
+    if (select != null && select.references(var))
+      {
+        return true;
+      }
+    return super.references(var);
+  }
+  
   public String toString()
   {
     StringBuffer buf = new StringBuffer(getClass().getName());