CVS: jfor/samples inherit-attributes.xsl,1.2,1.3

Update of /cvsroot/jfor/jfor/samples
In directory usw-pr-cvs1:/tmp/cvs-serv4242/samples

Modified Files:
	inherit-attributes.xsl 
Log Message:
inherit-attributes debug block bug corrected

Index: inherit-attributes.xsl
===================================================================
RCS file: /cvsroot/jfor/jfor/samples/inherit-attributes.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** inherit-attributes.xsl	12 Jul 2002 15:18:44 -0000	1.2
--- inherit-attributes.xsl	30 Jul 2002 15:57:22 -0000	1.3
***************
*** 66,69 ****
--- 66,72 ----
  $Id$
  $Log$
+ Revision 1.3  2002/07/30 15:57:22  bdelacretaz
+ inherit-attributes debug block bug corrected
+ 
  Revision 1.2  2002/07/12 15:18:44  rmarra
  skip "keep-together" attribute
***************
*** 106,112 ****
  <!-- Recursive copy, copying most attributes from all ancestors, overridden by our attributes -->  
  <xsl:template match="*" name="copy">
      <xsl:copy>
!         <xsl:copy-of select="ancestor::*/@*[not(name()='break-before' or name()='start-indent' or name()='keep-together')]"/>
          <xsl:copy-of select="@*"/>
          <xsl:apply-templates/>
      </xsl:copy>
--- 109,126 ----
  <!-- Recursive copy, copying most attributes from all ancestors, overridden by our attributes -->  
  <xsl:template match="*" name="copy">
+     <xsl:param name="toAdd"/>
      <xsl:copy>
!         <xsl:copy-of select="ancestor::*/@*[not(
!             name()='break-before' 
!             or name()='start-indent' 
!             or name()='keep-together'
!             or name()='flow-name'
!             or name()='master-name'
!         )]"/>
          <xsl:copy-of select="@*"/>
+         
+         <xsl:if test="$toAdd">
+             <xsl:copy-of select="$toAdd"/>
+         </xsl:if>
          <xsl:apply-templates/>
      </xsl:copy>
***************
*** 115,126 ****
  <!-- in debug mode, add mention that this was called -->
  <xsl:template match="fo:flow[contains(@flow-name,'body')]">
!     <xsl:if test="$debug">
!         <fo:block font-size="8pt" color="red">
!             NOTE: The XSL-FO of this document was processed by inherit-attributes.xsl (from the jfor
!             samples directory) before converting to RTF. Direct conversion to RTF might give different
!             results.
!         </fo:block>
!     </xsl:if>
!     <xsl:call-template name="copy"/>
  </xsl:template>
  
--- 129,144 ----
  <!-- in debug mode, add mention that this was called -->
  <xsl:template match="fo:flow[contains(@flow-name,'body')]">
!     <xsl:variable name="toAdd">
!         <xsl:if test="$debug">
!             <fo:block font-size="8pt" color="red">
!                 NOTE: The XSL-FO of this document was processed by inherit-attributes.xsl (from the jfor
!                 samples directory) before converting to RTF. Direct conversion to RTF might give different
!                 results.
!             </fo:block>
!         </xsl:if>
!     </xsl:variable>
!     <xsl:call-template name="copy">
!         <xsl:with-param name="toAdd" select="$toAdd"/>
!     </xsl:call-template>
  </xsl:template>
  



-------------------------------------------------------
This sf.net email is sponsored by: Dice - The leading online job board
for high-tech professionals. Search and apply for tech jobs today!
http://seeker.dice.com/seeker.epl?rel_code=31