svn commit: r523042 - /forrest/trunk/main/webapp/skins/common/xslt/fo/document-to-fo.xsl

[rg...@apache.org]

Author: rgardler
Date: Tue Mar 27 12:20:06 2007
New Revision: 523042

URL: http://svn.apache.org/viewvc?view=rev&rev=523042
Log:
Support a number of different paths for images in PDF (Part folution for FOR-635)

Modified:
    forrest/trunk/main/webapp/skins/common/xslt/fo/document-to-fo.xsl

Modified: forrest/trunk/main/webapp/skins/common/xslt/fo/document-to-fo.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/main/webapp/skins/common/xslt/fo/document-to-fo.xsl?view=diff&rev=523042&r1=523041&r2=523042
==============================================================================
--- forrest/trunk/main/webapp/skins/common/xslt/fo/document-to-fo.xsl (original)
+++ forrest/trunk/main/webapp/skins/common/xslt/fo/document-to-fo.xsl Tue Mar 27 12:20:06 2007
@@ -783,6 +783,9 @@
         <xsl:when test="starts-with(string(@src),'images/')">
           <xsl:value-of select="concat($imagesdir,substring-after(@src,'images'))"/>
         </xsl:when>
+        <xsl:when test="contains(string(@src),'/images/')">
+          <xsl:value-of select="concat($imagesdir,substring-after(@src,'/images'))"/>
+        </xsl:when>
         <!-- already absolute -->
         <xsl:when test="contains(string(@src),':') or starts-with(string(@src),'/')">
           <xsl:value-of select="@src"/>
@@ -791,6 +794,7 @@
         <xsl:otherwise><xsl:value-of select="concat($xmlbasedir,@src)"/></xsl:otherwise>
       </xsl:choose>
       </xsl:variable>
+      
       <fo:external-graphic src="{$imgpath}">
         <xsl:if test="@height">
           <xsl:attribute name="height"><xsl:value-of select="@height"/></xsl:attribute>
@@ -799,6 +803,7 @@
           <xsl:attribute name="width"><xsl:value-of select="@width"/></xsl:attribute>
         </xsl:if>
       </fo:external-graphic>
+      
       <!-- alt text -->
       <xsl:if test="//skinconfig/pdf/show-image-alt-text='true'">
         <xsl:if test="normalize-space(@alt)!=''">