You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by zo...@apache.org on 2004/01/03 17:44:09 UTC

cvs commit: xml-xalan/test/tests/conferr/variableerr variableerr21.xml variableerr21.xsl

zongaro     2004/01/03 08:44:09

  Modified:    test/tests/conf/attribset attribset42.xml attribset42.xsl
               test/tests/conf/conflictres conflictres37.xml
                        conflictres37.xsl
               test/tests/conf/extend extend05.xml extend05.xsl
               test/tests/conf/predicate predicate48.xml predicate49.xml
                        predicate50.xml predicate51.xml predicate52.xml
                        predicate53.xml predicate54.xml predicate55.xml
                        predicate56.xml
               test/tests/conferr/variableerr variableerr21.xml
                        variableerr21.xsl
  Log:
  Trying to eliminate instances of CR/LF at end of line in test cases.  Some CVS
  clients expand LF to CR/LF on checkout, and so end up with CR/CR/LF at end of
  line.
  
  Revision  Changes    Path
  1.2       +5 -5      xml-xalan/test/tests/conf/attribset/attribset42.xml
  
  Index: attribset42.xml
  ===================================================================
  RCS file: /home/cvs/xml-xalan/test/tests/conf/attribset/attribset42.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- attribset42.xml	14 Jun 2001 13:54:12 -0000	1.1
  +++ attribset42.xml	3 Jan 2004 16:44:08 -0000	1.2
  @@ -1,5 +1,5 @@
  -<?xml version="1.0"?> 
  -
  -<doc>
  -  <foo>a</foo>
  -</doc>
  +<?xml version="1.0"?> 
  +
  +<doc>
  +  <foo>a</foo>
  +</doc>
  
  
  
  1.2       +42 -42    xml-xalan/test/tests/conf/attribset/attribset42.xsl
  
  Index: attribset42.xsl
  ===================================================================
  RCS file: /home/cvs/xml-xalan/test/tests/conf/attribset/attribset42.xsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- attribset42.xsl	14 Jun 2001 13:54:12 -0000	1.1
  +++ attribset42.xsl	3 Jan 2004 16:44:08 -0000	1.2
  @@ -1,42 +1,42 @@
  -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
  -
  -<xsl:output indent="yes"/>
  -
  -  <!-- FileName: attribset42 -->
  -  <!-- Document: http://www.w3.org/TR/xslt -->
  -  <!-- DocVersion: 19991116 -->
  -  <!-- Section: 7.1.4 Named Attribute Sets -->
  -  <!-- Creator: Morten Jorgensen -->
  -  <!-- Purpose: Test inheritance of attribute sets. A literal result element
  -                is referring an attribute set that is defined by two separate
  -                <xsl:attribute-set.../> elements with the same name. Both
  -                these elements have a use-attribute-sets attribute, which
  -                means that we have a single attribute set that inherits from
  -                two other attribute sets. Both parents attribute sets have
  -                attributes that are overridden by the child.-->
  -
  -<xsl:template match="/">
  -  <out xsl:use-attribute-sets="child">
  -    <xsl:attribute name="location">Wonderland</xsl:attribute>
  -  </out>
  -</xsl:template>
  -
  -<xsl:attribute-set name="child" use-attribute-sets="alice">
  -  <xsl:attribute name="follow">yellowbrickroad</xsl:attribute>
  -  <xsl:attribute name="rabbithole">shallow</xsl:attribute>
  -</xsl:attribute-set>
  -
  -<xsl:attribute-set name="child" use-attribute-sets="rabbit">
  -  <xsl:attribute name="follow">theleader</xsl:attribute>
  -  <xsl:attribute name="alice">intoxicated</xsl:attribute>
  -</xsl:attribute-set>
  -
  -<xsl:attribute-set name="rabbit">
  -  <xsl:attribute name="rabbithole">deep</xsl:attribute>
  -</xsl:attribute-set>
  -
  -<xsl:attribute-set name="alice">
  -  <xsl:attribute name="alice">ondrugs</xsl:attribute>
  -</xsl:attribute-set>
  -
  -</xsl:stylesheet>
  \ No newline at end of file
  +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
  +
  +<xsl:output indent="yes"/>
  +
  +  <!-- FileName: attribset42 -->
  +  <!-- Document: http://www.w3.org/TR/xslt -->
  +  <!-- DocVersion: 19991116 -->
  +  <!-- Section: 7.1.4 Named Attribute Sets -->
  +  <!-- Creator: Morten Jorgensen -->
  +  <!-- Purpose: Test inheritance of attribute sets. A literal result element
  +                is referring an attribute set that is defined by two separate
  +                <xsl:attribute-set.../> elements with the same name. Both
  +                these elements have a use-attribute-sets attribute, which
  +                means that we have a single attribute set that inherits from
  +                two other attribute sets. Both parents attribute sets have
  +                attributes that are overridden by the child.-->
  +
  +<xsl:template match="/">
  +  <out xsl:use-attribute-sets="child">
  +    <xsl:attribute name="location">Wonderland</xsl:attribute>
  +  </out>
  +</xsl:template>
  +
  +<xsl:attribute-set name="child" use-attribute-sets="alice">
  +  <xsl:attribute name="follow">yellowbrickroad</xsl:attribute>
  +  <xsl:attribute name="rabbithole">shallow</xsl:attribute>
  +</xsl:attribute-set>
  +
  +<xsl:attribute-set name="child" use-attribute-sets="rabbit">
  +  <xsl:attribute name="follow">theleader</xsl:attribute>
  +  <xsl:attribute name="alice">intoxicated</xsl:attribute>
  +</xsl:attribute-set>
  +
  +<xsl:attribute-set name="rabbit">
  +  <xsl:attribute name="rabbithole">deep</xsl:attribute>
  +</xsl:attribute-set>
  +
  +<xsl:attribute-set name="alice">
  +  <xsl:attribute name="alice">ondrugs</xsl:attribute>
  +</xsl:attribute-set>
  +
  +</xsl:stylesheet>
  
  
  
  1.2       +6 -6      xml-xalan/test/tests/conf/conflictres/conflictres37.xml
  
  Index: conflictres37.xml
  ===================================================================
  RCS file: /home/cvs/xml-xalan/test/tests/conf/conflictres/conflictres37.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- conflictres37.xml	9 Dec 2003 15:22:17 -0000	1.1
  +++ conflictres37.xml	3 Jan 2004 16:44:08 -0000	1.2
  @@ -1,6 +1,6 @@
  -<?xml version="1.0" encoding="UTF-8"?>
  -<doc xmlns:xf="http://xml.apache.org/cocoon/xmlform/2002">
  -  <xf:output form="form1">with form attribute</xf:output>
  -  <xf:output>no form attribute</xf:output>
  -  <notxf>not in xf namespace</notxf>
  -</doc>
  \ No newline at end of file
  +<?xml version="1.0" encoding="UTF-8"?>
  +<doc xmlns:xf="http://xml.apache.org/cocoon/xmlform/2002">
  +  <xf:output form="form1">with form attribute</xf:output>
  +  <xf:output>no form attribute</xf:output>
  +  <notxf>not in xf namespace</notxf>
  +</doc>
  
  
  
  1.2       +37 -37    xml-xalan/test/tests/conf/conflictres/conflictres37.xsl
  
  Index: conflictres37.xsl
  ===================================================================
  RCS file: /home/cvs/xml-xalan/test/tests/conf/conflictres/conflictres37.xsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- conflictres37.xsl	9 Dec 2003 15:22:17 -0000	1.1
  +++ conflictres37.xsl	3 Jan 2004 16:44:08 -0000	1.2
  @@ -1,37 +1,37 @@
  -<?xml version="1.0" encoding="UTF-8"?>
  -
  -  <!-- FileName: conflictres37 -->
  -  <!-- Document: http://www.w3.org/TR/xslt -->
  -  <!-- DocVersion: 19991116 -->
  -  <!-- Section: 5.5 -->
  -  <!-- Creator: Ilene Seelemann -->
  -  <!-- Purpose: Test that qname with predicate has precedence over ncname:*, 
  -                which in turn has precedence over * in a match pattern. -->
  -
  -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
  -    version="1.0"
  -    xmlns:xalan="http://xml.apache.org/xslt"
  -    xmlns:xf="http://xml.apache.org/cocoon/xmlform/2002">
  -    
  -    <xsl:template match="/doc">
  -      <out>
  -         <xsl:apply-templates/>
  -       </out>
  -     </xsl:template>
  -     <xsl:template match="xf:output[@form]">
  -        <OutWithForm>
  -           <xsl:value-of select="."/>
  -        </OutWithForm>
  -     </xsl:template>
  -     <xsl:template match="xf:*">
  -        <OutWithoutForm>
  -        <xsl:value-of select="."/>
  -        </OutWithoutForm>
  -     </xsl:template>
  -     <xsl:template match="*">
  -         <General>
  -         <xsl:value-of select="."/>
  -         </General>
  -     </xsl:template>
  -</xsl:stylesheet>
  -
  +<?xml version="1.0" encoding="UTF-8"?>
  +
  +  <!-- FileName: conflictres37 -->
  +  <!-- Document: http://www.w3.org/TR/xslt -->
  +  <!-- DocVersion: 19991116 -->
  +  <!-- Section: 5.5 -->
  +  <!-- Creator: Ilene Seelemann -->
  +  <!-- Purpose: Test that qname with predicate has precedence over ncname:*, 
  +                which in turn has precedence over * in a match pattern. -->
  +
  +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
  +    version="1.0"
  +    xmlns:xalan="http://xml.apache.org/xslt"
  +    xmlns:xf="http://xml.apache.org/cocoon/xmlform/2002">
  +    
  +    <xsl:template match="/doc">
  +      <out>
  +         <xsl:apply-templates/>
  +       </out>
  +     </xsl:template>
  +     <xsl:template match="xf:output[@form]">
  +        <OutWithForm>
  +           <xsl:value-of select="."/>
  +        </OutWithForm>
  +     </xsl:template>
  +     <xsl:template match="xf:*">
  +        <OutWithoutForm>
  +        <xsl:value-of select="."/>
  +        </OutWithoutForm>
  +     </xsl:template>
  +     <xsl:template match="*">
  +         <General>
  +         <xsl:value-of select="."/>
  +         </General>
  +     </xsl:template>
  +</xsl:stylesheet>
  +
  
  
  
  1.2       +2 -2      xml-xalan/test/tests/conf/extend/extend05.xml
  
  Index: extend05.xml
  ===================================================================
  RCS file: /home/cvs/xml-xalan/test/tests/conf/extend/extend05.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- extend05.xml	11 Jun 2001 18:34:16 -0000	1.1
  +++ extend05.xml	3 Jan 2004 16:44:08 -0000	1.2
  @@ -1,2 +1,2 @@
  -<?xml version="1.0" ?>
  -<out></out>
  +<?xml version="1.0" ?>
  +<out></out>
  
  
  
  1.2       +24 -24    xml-xalan/test/tests/conf/extend/extend05.xsl
  
  Index: extend05.xsl
  ===================================================================
  RCS file: /home/cvs/xml-xalan/test/tests/conf/extend/extend05.xsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- extend05.xsl	11 Jun 2001 18:34:16 -0000	1.1
  +++ extend05.xsl	3 Jan 2004 16:44:08 -0000	1.2
  @@ -1,24 +1,24 @@
  -<xsl:stylesheet version="1.0" 
  -                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
  -                xmlns:saxon="http://icl.com/saxon"
  -                extension-element-prefixes="saxon">
  -
  -<!-- Written by Tom Amiro -->
  -  <!-- FileName: ac137.xsl -->
  -  <!-- Document: http://www.w3.org/TR/xslt11 -->
  -  <!-- DocVersion: 200001212 -->
  -  <!-- Section: 14 Extensions -->
  -  <!-- Purpose: Using element-available function to test for vendor extensions  -->
  -
  -<xsl:template match="/">
  -<out>
  -  <xsl:if test="element-available('saxon:entity-ref')">
  -    <saxon:entity-ref name="nbsp" />
  -  </xsl:if>
  -  <xsl:if test="element-available('saxon:entity-ref') = false">
  -    <xsl:text disable-output-escaping="yes">&amp;nbsp;</xsl:text>
  -  </xsl:if>
  -</out>
  -</xsl:template>
  -
  -</xsl:stylesheet>
  +<xsl:stylesheet version="1.0" 
  +                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
  +                xmlns:saxon="http://icl.com/saxon"
  +                extension-element-prefixes="saxon">
  +
  +<!-- Written by Tom Amiro -->
  +  <!-- FileName: ac137.xsl -->
  +  <!-- Document: http://www.w3.org/TR/xslt11 -->
  +  <!-- DocVersion: 200001212 -->
  +  <!-- Section: 14 Extensions -->
  +  <!-- Purpose: Using element-available function to test for vendor extensions  -->
  +
  +<xsl:template match="/">
  +<out>
  +  <xsl:if test="element-available('saxon:entity-ref')">
  +    <saxon:entity-ref name="nbsp" />
  +  </xsl:if>
  +  <xsl:if test="element-available('saxon:entity-ref') = false">
  +    <xsl:text disable-output-escaping="yes">&amp;nbsp;</xsl:text>
  +  </xsl:if>
  +</out>
  +</xsl:template>
  +
  +</xsl:stylesheet>
  
  
  
  1.2       +21 -21    xml-xalan/test/tests/conf/predicate/predicate48.xml
  
  Index: predicate48.xml
  ===================================================================
  RCS file: /home/cvs/xml-xalan/test/tests/conf/predicate/predicate48.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- predicate48.xml	15 Jun 2001 20:57:33 -0000	1.1
  +++ predicate48.xml	3 Jan 2004 16:44:08 -0000	1.2
  @@ -1,21 +1,21 @@
  -<?xml version="1.0"?>
  -<foo>
  -
  -  <bar a="0" b="0" c="0" d="0" seq="0"/>
  -  <bar a="0" b="0" c="0" d="1" seq="1"/>
  -  <bar a="0" b="0" c="1" d="0" seq="2"/>
  -  <bar a="0" b="0" c="1" d="1" seq="3"/>
  -  <bar a="0" b="1" c="0" d="0" seq="4"/>
  -  <bar a="0" b="1" c="0" d="1" seq="5"/>
  -  <bar a="0" b="1" c="1" d="0" seq="6"/>
  -  <bar a="0" b="1" c="1" d="1" seq="7"/>
  -  <bar a="1" b="0" c="0" d="0" seq="8"/>
  -  <bar a="1" b="0" c="0" d="1" seq="9"/>
  -  <bar a="1" b="0" c="1" d="0" seq="a"/>
  -  <bar a="1" b="0" c="1" d="1" seq="b"/>
  -  <bar a="1" b="1" c="0" d="0" seq="c"/>
  -  <bar a="1" b="1" c="0" d="1" seq="d"/>
  -  <bar a="1" b="1" c="1" d="0" seq="e"/>
  -  <bar a="1" b="1" c="1" d="1" seq="f"/>
  -
  -</foo>
  +<?xml version="1.0"?>
  +<foo>
  +
  +  <bar a="0" b="0" c="0" d="0" seq="0"/>
  +  <bar a="0" b="0" c="0" d="1" seq="1"/>
  +  <bar a="0" b="0" c="1" d="0" seq="2"/>
  +  <bar a="0" b="0" c="1" d="1" seq="3"/>
  +  <bar a="0" b="1" c="0" d="0" seq="4"/>
  +  <bar a="0" b="1" c="0" d="1" seq="5"/>
  +  <bar a="0" b="1" c="1" d="0" seq="6"/>
  +  <bar a="0" b="1" c="1" d="1" seq="7"/>
  +  <bar a="1" b="0" c="0" d="0" seq="8"/>
  +  <bar a="1" b="0" c="0" d="1" seq="9"/>
  +  <bar a="1" b="0" c="1" d="0" seq="a"/>
  +  <bar a="1" b="0" c="1" d="1" seq="b"/>
  +  <bar a="1" b="1" c="0" d="0" seq="c"/>
  +  <bar a="1" b="1" c="0" d="1" seq="d"/>
  +  <bar a="1" b="1" c="1" d="0" seq="e"/>
  +  <bar a="1" b="1" c="1" d="1" seq="f"/>
  +
  +</foo>
  
  
  
  1.2       +21 -21    xml-xalan/test/tests/conf/predicate/predicate49.xml
  
  Index: predicate49.xml
  ===================================================================
  RCS file: /home/cvs/xml-xalan/test/tests/conf/predicate/predicate49.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- predicate49.xml	15 Jun 2001 20:57:33 -0000	1.1
  +++ predicate49.xml	3 Jan 2004 16:44:08 -0000	1.2
  @@ -1,21 +1,21 @@
  -<?xml version="1.0"?>
  -<foo>
  -
  -  <bar a="0" b="0" c="0" d="0" seq="0"/>
  -  <bar a="0" b="0" c="0" d="1" seq="1"/>
  -  <bar a="0" b="0" c="1" d="0" seq="2"/>
  -  <bar a="0" b="0" c="1" d="1" seq="3"/>
  -  <bar a="0" b="1" c="0" d="0" seq="4"/>
  -  <bar a="0" b="1" c="0" d="1" seq="5"/>
  -  <bar a="0" b="1" c="1" d="0" seq="6"/>
  -  <bar a="0" b="1" c="1" d="1" seq="7"/>
  -  <bar a="1" b="0" c="0" d="0" seq="8"/>
  -  <bar a="1" b="0" c="0" d="1" seq="9"/>
  -  <bar a="1" b="0" c="1" d="0" seq="a"/>
  -  <bar a="1" b="0" c="1" d="1" seq="b"/>
  -  <bar a="1" b="1" c="0" d="0" seq="c"/>
  -  <bar a="1" b="1" c="0" d="1" seq="d"/>
  -  <bar a="1" b="1" c="1" d="0" seq="e"/>
  -  <bar a="1" b="1" c="1" d="1" seq="f"/>
  -
  -</foo>
  +<?xml version="1.0"?>
  +<foo>
  +
  +  <bar a="0" b="0" c="0" d="0" seq="0"/>
  +  <bar a="0" b="0" c="0" d="1" seq="1"/>
  +  <bar a="0" b="0" c="1" d="0" seq="2"/>
  +  <bar a="0" b="0" c="1" d="1" seq="3"/>
  +  <bar a="0" b="1" c="0" d="0" seq="4"/>
  +  <bar a="0" b="1" c="0" d="1" seq="5"/>
  +  <bar a="0" b="1" c="1" d="0" seq="6"/>
  +  <bar a="0" b="1" c="1" d="1" seq="7"/>
  +  <bar a="1" b="0" c="0" d="0" seq="8"/>
  +  <bar a="1" b="0" c="0" d="1" seq="9"/>
  +  <bar a="1" b="0" c="1" d="0" seq="a"/>
  +  <bar a="1" b="0" c="1" d="1" seq="b"/>
  +  <bar a="1" b="1" c="0" d="0" seq="c"/>
  +  <bar a="1" b="1" c="0" d="1" seq="d"/>
  +  <bar a="1" b="1" c="1" d="0" seq="e"/>
  +  <bar a="1" b="1" c="1" d="1" seq="f"/>
  +
  +</foo>
  
  
  
  1.2       +21 -21    xml-xalan/test/tests/conf/predicate/predicate50.xml
  
  Index: predicate50.xml
  ===================================================================
  RCS file: /home/cvs/xml-xalan/test/tests/conf/predicate/predicate50.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- predicate50.xml	15 Jun 2001 20:57:33 -0000	1.1
  +++ predicate50.xml	3 Jan 2004 16:44:08 -0000	1.2
  @@ -1,21 +1,21 @@
  -<?xml version="1.0"?>
  -<foo>
  -
  -  <bar a="0" b="0" c="0" d="0" seq="0"/>
  -  <bar a="0" b="0" c="0" d="1" seq="1"/>
  -  <bar a="0" b="0" c="1" d="0" seq="2"/>
  -  <bar a="0" b="0" c="1" d="1" seq="3"/>
  -  <bar a="0" b="1" c="0" d="0" seq="4"/>
  -  <bar a="0" b="1" c="0" d="1" seq="5"/>
  -  <bar a="0" b="1" c="1" d="0" seq="6"/>
  -  <bar a="0" b="1" c="1" d="1" seq="7"/>
  -  <bar a="1" b="0" c="0" d="0" seq="8"/>
  -  <bar a="1" b="0" c="0" d="1" seq="9"/>
  -  <bar a="1" b="0" c="1" d="0" seq="a"/>
  -  <bar a="1" b="0" c="1" d="1" seq="b"/>
  -  <bar a="1" b="1" c="0" d="0" seq="c"/>
  -  <bar a="1" b="1" c="0" d="1" seq="d"/>
  -  <bar a="1" b="1" c="1" d="0" seq="e"/>
  -  <bar a="1" b="1" c="1" d="1" seq="f"/>
  -
  -</foo>
  +<?xml version="1.0"?>
  +<foo>
  +
  +  <bar a="0" b="0" c="0" d="0" seq="0"/>
  +  <bar a="0" b="0" c="0" d="1" seq="1"/>
  +  <bar a="0" b="0" c="1" d="0" seq="2"/>
  +  <bar a="0" b="0" c="1" d="1" seq="3"/>
  +  <bar a="0" b="1" c="0" d="0" seq="4"/>
  +  <bar a="0" b="1" c="0" d="1" seq="5"/>
  +  <bar a="0" b="1" c="1" d="0" seq="6"/>
  +  <bar a="0" b="1" c="1" d="1" seq="7"/>
  +  <bar a="1" b="0" c="0" d="0" seq="8"/>
  +  <bar a="1" b="0" c="0" d="1" seq="9"/>
  +  <bar a="1" b="0" c="1" d="0" seq="a"/>
  +  <bar a="1" b="0" c="1" d="1" seq="b"/>
  +  <bar a="1" b="1" c="0" d="0" seq="c"/>
  +  <bar a="1" b="1" c="0" d="1" seq="d"/>
  +  <bar a="1" b="1" c="1" d="0" seq="e"/>
  +  <bar a="1" b="1" c="1" d="1" seq="f"/>
  +
  +</foo>
  
  
  
  1.2       +21 -21    xml-xalan/test/tests/conf/predicate/predicate51.xml
  
  Index: predicate51.xml
  ===================================================================
  RCS file: /home/cvs/xml-xalan/test/tests/conf/predicate/predicate51.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- predicate51.xml	15 Jun 2001 20:57:33 -0000	1.1
  +++ predicate51.xml	3 Jan 2004 16:44:08 -0000	1.2
  @@ -1,21 +1,21 @@
  -<?xml version="1.0"?>
  -<foo>
  -
  -  <bar a="0" b="0" c="0" d="0" seq="0"/>
  -  <bar a="0" b="0" c="0" d="1" seq="1"/>
  -  <bar a="0" b="0" c="1" d="0" seq="2"/>
  -  <bar a="0" b="0" c="1" d="1" seq="3"/>
  -  <bar a="0" b="1" c="0" d="0" seq="4"/>
  -  <bar a="0" b="1" c="0" d="1" seq="5"/>
  -  <bar a="0" b="1" c="1" d="0" seq="6"/>
  -  <bar a="0" b="1" c="1" d="1" seq="7"/>
  -  <bar a="1" b="0" c="0" d="0" seq="8"/>
  -  <bar a="1" b="0" c="0" d="1" seq="9"/>
  -  <bar a="1" b="0" c="1" d="0" seq="a"/>
  -  <bar a="1" b="0" c="1" d="1" seq="b"/>
  -  <bar a="1" b="1" c="0" d="0" seq="c"/>
  -  <bar a="1" b="1" c="0" d="1" seq="d"/>
  -  <bar a="1" b="1" c="1" d="0" seq="e"/>
  -  <bar a="1" b="1" c="1" d="1" seq="f"/>
  -
  -</foo>
  +<?xml version="1.0"?>
  +<foo>
  +
  +  <bar a="0" b="0" c="0" d="0" seq="0"/>
  +  <bar a="0" b="0" c="0" d="1" seq="1"/>
  +  <bar a="0" b="0" c="1" d="0" seq="2"/>
  +  <bar a="0" b="0" c="1" d="1" seq="3"/>
  +  <bar a="0" b="1" c="0" d="0" seq="4"/>
  +  <bar a="0" b="1" c="0" d="1" seq="5"/>
  +  <bar a="0" b="1" c="1" d="0" seq="6"/>
  +  <bar a="0" b="1" c="1" d="1" seq="7"/>
  +  <bar a="1" b="0" c="0" d="0" seq="8"/>
  +  <bar a="1" b="0" c="0" d="1" seq="9"/>
  +  <bar a="1" b="0" c="1" d="0" seq="a"/>
  +  <bar a="1" b="0" c="1" d="1" seq="b"/>
  +  <bar a="1" b="1" c="0" d="0" seq="c"/>
  +  <bar a="1" b="1" c="0" d="1" seq="d"/>
  +  <bar a="1" b="1" c="1" d="0" seq="e"/>
  +  <bar a="1" b="1" c="1" d="1" seq="f"/>
  +
  +</foo>
  
  
  
  1.2       +21 -21    xml-xalan/test/tests/conf/predicate/predicate52.xml
  
  Index: predicate52.xml
  ===================================================================
  RCS file: /home/cvs/xml-xalan/test/tests/conf/predicate/predicate52.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- predicate52.xml	15 Jun 2001 20:57:33 -0000	1.1
  +++ predicate52.xml	3 Jan 2004 16:44:08 -0000	1.2
  @@ -1,21 +1,21 @@
  -<?xml version="1.0"?>
  -<foo>
  -
  -  <bar a="0" b="0" c="0" d="0" seq="0"/>
  -  <bar a="0" b="0" c="0" d="1" seq="1"/>
  -  <bar a="0" b="0" c="1" d="0" seq="2"/>
  -  <bar a="0" b="0" c="1" d="1" seq="3"/>
  -  <bar a="0" b="1" c="0" d="0" seq="4"/>
  -  <bar a="0" b="1" c="0" d="1" seq="5"/>
  -  <bar a="0" b="1" c="1" d="0" seq="6"/>
  -  <bar a="0" b="1" c="1" d="1" seq="7"/>
  -  <bar a="1" b="0" c="0" d="0" seq="8"/>
  -  <bar a="1" b="0" c="0" d="1" seq="9"/>
  -  <bar a="1" b="0" c="1" d="0" seq="a"/>
  -  <bar a="1" b="0" c="1" d="1" seq="b"/>
  -  <bar a="1" b="1" c="0" d="0" seq="c"/>
  -  <bar a="1" b="1" c="0" d="1" seq="d"/>
  -  <bar a="1" b="1" c="1" d="0" seq="e"/>
  -  <bar a="1" b="1" c="1" d="1" seq="f"/>
  -
  -</foo>
  +<?xml version="1.0"?>
  +<foo>
  +
  +  <bar a="0" b="0" c="0" d="0" seq="0"/>
  +  <bar a="0" b="0" c="0" d="1" seq="1"/>
  +  <bar a="0" b="0" c="1" d="0" seq="2"/>
  +  <bar a="0" b="0" c="1" d="1" seq="3"/>
  +  <bar a="0" b="1" c="0" d="0" seq="4"/>
  +  <bar a="0" b="1" c="0" d="1" seq="5"/>
  +  <bar a="0" b="1" c="1" d="0" seq="6"/>
  +  <bar a="0" b="1" c="1" d="1" seq="7"/>
  +  <bar a="1" b="0" c="0" d="0" seq="8"/>
  +  <bar a="1" b="0" c="0" d="1" seq="9"/>
  +  <bar a="1" b="0" c="1" d="0" seq="a"/>
  +  <bar a="1" b="0" c="1" d="1" seq="b"/>
  +  <bar a="1" b="1" c="0" d="0" seq="c"/>
  +  <bar a="1" b="1" c="0" d="1" seq="d"/>
  +  <bar a="1" b="1" c="1" d="0" seq="e"/>
  +  <bar a="1" b="1" c="1" d="1" seq="f"/>
  +
  +</foo>
  
  
  
  1.2       +21 -21    xml-xalan/test/tests/conf/predicate/predicate53.xml
  
  Index: predicate53.xml
  ===================================================================
  RCS file: /home/cvs/xml-xalan/test/tests/conf/predicate/predicate53.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- predicate53.xml	15 Jun 2001 20:57:33 -0000	1.1
  +++ predicate53.xml	3 Jan 2004 16:44:08 -0000	1.2
  @@ -1,21 +1,21 @@
  -<?xml version="1.0"?>
  -<foo>
  -
  -  <bar a="0" b="0" c="0" d="0" seq="0"/>
  -  <bar a="0" b="0" c="0" d="1" seq="1"/>
  -  <bar a="0" b="0" c="1" d="0" seq="2"/>
  -  <bar a="0" b="0" c="1" d="1" seq="3"/>
  -  <bar a="0" b="1" c="0" d="0" seq="4"/>
  -  <bar a="0" b="1" c="0" d="1" seq="5"/>
  -  <bar a="0" b="1" c="1" d="0" seq="6"/>
  -  <bar a="0" b="1" c="1" d="1" seq="7"/>
  -  <bar a="1" b="0" c="0" d="0" seq="8"/>
  -  <bar a="1" b="0" c="0" d="1" seq="9"/>
  -  <bar a="1" b="0" c="1" d="0" seq="a"/>
  -  <bar a="1" b="0" c="1" d="1" seq="b"/>
  -  <bar a="1" b="1" c="0" d="0" seq="c"/>
  -  <bar a="1" b="1" c="0" d="1" seq="d"/>
  -  <bar a="1" b="1" c="1" d="0" seq="e"/>
  -  <bar a="1" b="1" c="1" d="1" seq="f"/>
  -
  -</foo>
  +<?xml version="1.0"?>
  +<foo>
  +
  +  <bar a="0" b="0" c="0" d="0" seq="0"/>
  +  <bar a="0" b="0" c="0" d="1" seq="1"/>
  +  <bar a="0" b="0" c="1" d="0" seq="2"/>
  +  <bar a="0" b="0" c="1" d="1" seq="3"/>
  +  <bar a="0" b="1" c="0" d="0" seq="4"/>
  +  <bar a="0" b="1" c="0" d="1" seq="5"/>
  +  <bar a="0" b="1" c="1" d="0" seq="6"/>
  +  <bar a="0" b="1" c="1" d="1" seq="7"/>
  +  <bar a="1" b="0" c="0" d="0" seq="8"/>
  +  <bar a="1" b="0" c="0" d="1" seq="9"/>
  +  <bar a="1" b="0" c="1" d="0" seq="a"/>
  +  <bar a="1" b="0" c="1" d="1" seq="b"/>
  +  <bar a="1" b="1" c="0" d="0" seq="c"/>
  +  <bar a="1" b="1" c="0" d="1" seq="d"/>
  +  <bar a="1" b="1" c="1" d="0" seq="e"/>
  +  <bar a="1" b="1" c="1" d="1" seq="f"/>
  +
  +</foo>
  
  
  
  1.2       +21 -21    xml-xalan/test/tests/conf/predicate/predicate54.xml
  
  Index: predicate54.xml
  ===================================================================
  RCS file: /home/cvs/xml-xalan/test/tests/conf/predicate/predicate54.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- predicate54.xml	15 Jun 2001 20:57:33 -0000	1.1
  +++ predicate54.xml	3 Jan 2004 16:44:08 -0000	1.2
  @@ -1,21 +1,21 @@
  -<?xml version="1.0"?>
  -<foo>
  -
  -  <bar a="0" b="0" c="0" d="0" seq="0"/>
  -  <bar a="0" b="0" c="0" d="1" seq="1"/>
  -  <bar a="0" b="0" c="1" d="0" seq="2"/>
  -  <bar a="0" b="0" c="1" d="1" seq="3"/>
  -  <bar a="0" b="1" c="0" d="0" seq="4"/>
  -  <bar a="0" b="1" c="0" d="1" seq="5"/>
  -  <bar a="0" b="1" c="1" d="0" seq="6"/>
  -  <bar a="0" b="1" c="1" d="1" seq="7"/>
  -  <bar a="1" b="0" c="0" d="0" seq="8"/>
  -  <bar a="1" b="0" c="0" d="1" seq="9"/>
  -  <bar a="1" b="0" c="1" d="0" seq="a"/>
  -  <bar a="1" b="0" c="1" d="1" seq="b"/>
  -  <bar a="1" b="1" c="0" d="0" seq="c"/>
  -  <bar a="1" b="1" c="0" d="1" seq="d"/>
  -  <bar a="1" b="1" c="1" d="0" seq="e"/>
  -  <bar a="1" b="1" c="1" d="1" seq="f"/>
  -
  -</foo>
  +<?xml version="1.0"?>
  +<foo>
  +
  +  <bar a="0" b="0" c="0" d="0" seq="0"/>
  +  <bar a="0" b="0" c="0" d="1" seq="1"/>
  +  <bar a="0" b="0" c="1" d="0" seq="2"/>
  +  <bar a="0" b="0" c="1" d="1" seq="3"/>
  +  <bar a="0" b="1" c="0" d="0" seq="4"/>
  +  <bar a="0" b="1" c="0" d="1" seq="5"/>
  +  <bar a="0" b="1" c="1" d="0" seq="6"/>
  +  <bar a="0" b="1" c="1" d="1" seq="7"/>
  +  <bar a="1" b="0" c="0" d="0" seq="8"/>
  +  <bar a="1" b="0" c="0" d="1" seq="9"/>
  +  <bar a="1" b="0" c="1" d="0" seq="a"/>
  +  <bar a="1" b="0" c="1" d="1" seq="b"/>
  +  <bar a="1" b="1" c="0" d="0" seq="c"/>
  +  <bar a="1" b="1" c="0" d="1" seq="d"/>
  +  <bar a="1" b="1" c="1" d="0" seq="e"/>
  +  <bar a="1" b="1" c="1" d="1" seq="f"/>
  +
  +</foo>
  
  
  
  1.2       +21 -21    xml-xalan/test/tests/conf/predicate/predicate55.xml
  
  Index: predicate55.xml
  ===================================================================
  RCS file: /home/cvs/xml-xalan/test/tests/conf/predicate/predicate55.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- predicate55.xml	15 Jun 2001 20:57:33 -0000	1.1
  +++ predicate55.xml	3 Jan 2004 16:44:08 -0000	1.2
  @@ -1,21 +1,21 @@
  -<?xml version="1.0"?>
  -<foo>
  -
  -  <bar a="0" b="0" c="0" d="0" seq="0"/>
  -  <bar a="0" b="0" c="0" d="1" seq="1"/>
  -  <bar a="0" b="0" c="1" d="0" seq="2"/>
  -  <bar a="0" b="0" c="1" d="1" seq="3"/>
  -  <bar a="0" b="1" c="0" d="0" seq="4"/>
  -  <bar a="0" b="1" c="0" d="1" seq="5"/>
  -  <bar a="0" b="1" c="1" d="0" seq="6"/>
  -  <bar a="0" b="1" c="1" d="1" seq="7"/>
  -  <bar a="1" b="0" c="0" d="0" seq="8"/>
  -  <bar a="1" b="0" c="0" d="1" seq="9"/>
  -  <bar a="1" b="0" c="1" d="0" seq="a"/>
  -  <bar a="1" b="0" c="1" d="1" seq="b"/>
  -  <bar a="1" b="1" c="0" d="0" seq="c"/>
  -  <bar a="1" b="1" c="0" d="1" seq="d"/>
  -  <bar a="1" b="1" c="1" d="0" seq="e"/>
  -  <bar a="1" b="1" c="1" d="1" seq="f"/>
  -
  -</foo>
  +<?xml version="1.0"?>
  +<foo>
  +
  +  <bar a="0" b="0" c="0" d="0" seq="0"/>
  +  <bar a="0" b="0" c="0" d="1" seq="1"/>
  +  <bar a="0" b="0" c="1" d="0" seq="2"/>
  +  <bar a="0" b="0" c="1" d="1" seq="3"/>
  +  <bar a="0" b="1" c="0" d="0" seq="4"/>
  +  <bar a="0" b="1" c="0" d="1" seq="5"/>
  +  <bar a="0" b="1" c="1" d="0" seq="6"/>
  +  <bar a="0" b="1" c="1" d="1" seq="7"/>
  +  <bar a="1" b="0" c="0" d="0" seq="8"/>
  +  <bar a="1" b="0" c="0" d="1" seq="9"/>
  +  <bar a="1" b="0" c="1" d="0" seq="a"/>
  +  <bar a="1" b="0" c="1" d="1" seq="b"/>
  +  <bar a="1" b="1" c="0" d="0" seq="c"/>
  +  <bar a="1" b="1" c="0" d="1" seq="d"/>
  +  <bar a="1" b="1" c="1" d="0" seq="e"/>
  +  <bar a="1" b="1" c="1" d="1" seq="f"/>
  +
  +</foo>
  
  
  
  1.2       +21 -21    xml-xalan/test/tests/conf/predicate/predicate56.xml
  
  Index: predicate56.xml
  ===================================================================
  RCS file: /home/cvs/xml-xalan/test/tests/conf/predicate/predicate56.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- predicate56.xml	15 Jun 2001 20:57:33 -0000	1.1
  +++ predicate56.xml	3 Jan 2004 16:44:08 -0000	1.2
  @@ -1,21 +1,21 @@
  -<?xml version="1.0"?>
  -<foo>
  -
  -  <bar a="0" b="0" c="0" d="0" seq="0"/>
  -  <bar a="0" b="0" c="0" d="1" seq="1"/>
  -  <bar a="0" b="0" c="1" d="0" seq="2"/>
  -  <bar a="0" b="0" c="1" d="1" seq="3"/>
  -  <bar a="0" b="1" c="0" d="0" seq="4"/>
  -  <bar a="0" b="1" c="0" d="1" seq="5"/>
  -  <bar a="0" b="1" c="1" d="0" seq="6"/>
  -  <bar a="0" b="1" c="1" d="1" seq="7"/>
  -  <bar a="1" b="0" c="0" d="0" seq="8"/>
  -  <bar a="1" b="0" c="0" d="1" seq="9"/>
  -  <bar a="1" b="0" c="1" d="0" seq="a"/>
  -  <bar a="1" b="0" c="1" d="1" seq="b"/>
  -  <bar a="1" b="1" c="0" d="0" seq="c"/>
  -  <bar a="1" b="1" c="0" d="1" seq="d"/>
  -  <bar a="1" b="1" c="1" d="0" seq="e"/>
  -  <bar a="1" b="1" c="1" d="1" seq="f"/>
  -
  -</foo>
  +<?xml version="1.0"?>
  +<foo>
  +
  +  <bar a="0" b="0" c="0" d="0" seq="0"/>
  +  <bar a="0" b="0" c="0" d="1" seq="1"/>
  +  <bar a="0" b="0" c="1" d="0" seq="2"/>
  +  <bar a="0" b="0" c="1" d="1" seq="3"/>
  +  <bar a="0" b="1" c="0" d="0" seq="4"/>
  +  <bar a="0" b="1" c="0" d="1" seq="5"/>
  +  <bar a="0" b="1" c="1" d="0" seq="6"/>
  +  <bar a="0" b="1" c="1" d="1" seq="7"/>
  +  <bar a="1" b="0" c="0" d="0" seq="8"/>
  +  <bar a="1" b="0" c="0" d="1" seq="9"/>
  +  <bar a="1" b="0" c="1" d="0" seq="a"/>
  +  <bar a="1" b="0" c="1" d="1" seq="b"/>
  +  <bar a="1" b="1" c="0" d="0" seq="c"/>
  +  <bar a="1" b="1" c="0" d="1" seq="d"/>
  +  <bar a="1" b="1" c="1" d="0" seq="e"/>
  +  <bar a="1" b="1" c="1" d="1" seq="f"/>
  +
  +</foo>
  
  
  
  1.2       +6 -6      xml-xalan/test/tests/conferr/variableerr/variableerr21.xml
  
  Index: variableerr21.xml
  ===================================================================
  RCS file: /home/cvs/xml-xalan/test/tests/conferr/variableerr/variableerr21.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- variableerr21.xml	8 Dec 2003 18:25:43 -0000	1.1
  +++ variableerr21.xml	3 Jan 2004 16:44:09 -0000	1.2
  @@ -1,6 +1,6 @@
  -<?xml version="1.0"?>
  -<doc>
  -  <item>1</item>
  -  <item>2</item>
  -  <item>3</item>
  -</doc>
  \ No newline at end of file
  +<?xml version="1.0"?>
  +<doc>
  +  <item>1</item>
  +  <item>2</item>
  +  <item>3</item>
  +</doc>
  
  
  
  1.2       +25 -25    xml-xalan/test/tests/conferr/variableerr/variableerr21.xsl
  
  Index: variableerr21.xsl
  ===================================================================
  RCS file: /home/cvs/xml-xalan/test/tests/conferr/variableerr/variableerr21.xsl,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- variableerr21.xsl	8 Dec 2003 18:25:43 -0000	1.1
  +++ variableerr21.xsl	3 Jan 2004 16:44:09 -0000	1.2
  @@ -1,25 +1,25 @@
  -<?xml version="1.0"?>
  -<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
  -
  -  <!-- FileName: variableerr21 -->
  -  <!-- Document: http://www.w3.org/TR/xslt -->
  -  <!-- DocVersion: 19991116 -->
  -  <!-- Section: 11.6 Passing Parameters to Templates  -->
  -  <!-- Purpose: Test for xsl:with-param with both content and select. -->
  -  <!-- ExpectedException: xsl:with-param element must not have both content and a select attribute. -->
  -  <!-- Author: Richard Cao -->
  -
  -<xsl:template match="doc">
  -  <xsl:call-template name="foo">
  -    <xsl:with-param name="bar" select="3">2</xsl:with-param>
  -  </xsl:call-template>
  -</xsl:template>
  -
  -<xsl:template name="foo">
  -  <xsl:param name="bar" select="0"/>
  -  <out>
  -    <xsl:value-of select="$bar"/>
  -  </out>
  -</xsl:template>
  -
  -</xsl:stylesheet>
  +<?xml version="1.0"?>
  +<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
  +
  +  <!-- FileName: variableerr21 -->
  +  <!-- Document: http://www.w3.org/TR/xslt -->
  +  <!-- DocVersion: 19991116 -->
  +  <!-- Section: 11.6 Passing Parameters to Templates  -->
  +  <!-- Purpose: Test for xsl:with-param with both content and select. -->
  +  <!-- ExpectedException: xsl:with-param element must not have both content and a select attribute. -->
  +  <!-- Author: Richard Cao -->
  +
  +<xsl:template match="doc">
  +  <xsl:call-template name="foo">
  +    <xsl:with-param name="bar" select="3">2</xsl:with-param>
  +  </xsl:call-template>
  +</xsl:template>
  +
  +<xsl:template name="foo">
  +  <xsl:param name="bar" select="0"/>
  +  <out>
  +    <xsl:value-of select="$bar"/>
  +  </out>
  +</xsl:template>
  +
  +</xsl:stylesheet>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org