cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sylv...@apache.org
Subject cvs commit: xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/java xsp.xsl
Date Fri, 14 Sep 2001 12:58:03 GMT
sylvain     01/09/14 05:58:03

  Modified:    src/org/apache/cocoon/components/language/markup/xsp/java
                        Tag: cocoon_20_branch xsp.xsl
  Log:
  Allow <xsp:attribute> inside <xsp:logic>
  Reported by Torsten Curdt <tcurdt@dff.st>
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.2.2.6   +5 -5      xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl
  
  Index: xsp.xsl
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/org/apache/cocoon/components/language/markup/xsp/java/xsp.xsl,v
  retrieving revision 1.2.2.5
  retrieving revision 1.2.2.6
  diff -u -r1.2.2.5 -r1.2.2.6
  --- xsp.xsl	2001/08/14 13:59:23	1.2.2.5
  +++ xsp.xsl	2001/09/14 12:58:03	1.2.2.6
  @@ -12,7 +12,7 @@
   <!--
    * @author <a href="mailto:ricardo@apache.org>Ricardo Rocha</a>
    * @author <a href="sylvain.wallez@anyware-tech.com">Sylvain Wallez</a>
  - * @version CVS $Revision: 1.2.2.5 $ $Date: 2001/08/14 13:59:23 $
  + * @version CVS $Revision: 1.2.2.6 $ $Date: 2001/09/14 12:58:03 $
   -->
   
   <!-- XSP Core logicsheet for the Java language -->
  @@ -211,7 +211,7 @@
         </xsl:if>
       </xsl:for-each>
   
  -    <xsl:apply-templates select="xsp:attribute"/>
  +    <xsl:apply-templates select="xsp:attribute | xsp:logic[xsp:attribute]"/>
   
       this.contentHandler.startElement(
         <xsl:copy-of select="$uri"/>,
  @@ -222,7 +222,7 @@
   
       xspAttr.clear();
   
  -    <xsl:apply-templates select="node()[not(name(.) = 'xsp:attribute')]"/>
  +    <xsl:apply-templates select="node()[not(name(.) = 'xsp:attribute' or (name(.) =
'xsp:logic' and ./xsp:attribute))]"/>
   
       this.contentHandler.endElement(
         <xsl:copy-of select="$uri"/>,
  @@ -385,7 +385,7 @@
   
       <xsl:apply-templates select="@*"/>
   
  -    <xsl:apply-templates select="xsp:attribute"/>
  +    <xsl:apply-templates select="xsp:attribute | xsp:logic[xsp:attribute]"/>
   
       this.contentHandler.startElement(
         "<xsl:value-of select="namespace-uri(.)"/>",
  @@ -396,7 +396,7 @@
   
       xspAttr.clear();
   
  -    <xsl:apply-templates select="node()[not(name(.) = 'xsp:attribute')]"/>
  +    <xsl:apply-templates select="node()[not(name(.) = 'xsp:attribute' or (name(.) =
'xsp:logic' and ./xsp:attribute))]"/>
   
       this.contentHandler.endElement(
         "<xsl:value-of select="namespace-uri(.)"/>",
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org


Mime
View raw message