forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brond...@apache.org
Subject svn commit: rev 20918 - in forrest/trunk: . src/core/context/skins/common/xslt/fo
Date Tue, 08 Jun 2004 18:38:31 GMT
Author: brondsem
Date: Tue Jun  8 11:38:30 2004
New Revision: 20918

Modified:
   forrest/trunk/src/core/context/skins/common/xslt/fo/document2fo.xsl
   forrest/trunk/status.xml
Log:
improved resolving image references in PDFs

Modified: forrest/trunk/src/core/context/skins/common/xslt/fo/document2fo.xsl
==============================================================================
--- forrest/trunk/src/core/context/skins/common/xslt/fo/document2fo.xsl	(original)
+++ forrest/trunk/src/core/context/skins/common/xslt/fo/document2fo.xsl	Tue Jun  8 11:38:30
2004
@@ -705,13 +705,16 @@
       <!-- Make relative paths absolute -->
       <xsl:variable name="imgpath">
       <xsl:choose>
-        <xsl:when test="starts-with(string(@src), 'images/') or contains(string(@src),
'../images')">
-          <xsl:value-of select="concat($imagesdir, substring-after(@src, 'images'))"/>
+        <!-- resources image dir -->
+        <xsl:when test="starts-with(string(@src),'images/')">
+          <xsl:value-of select="concat($imagesdir,substring-after(@src,'images'))"/>
         </xsl:when>
-        <xsl:when test="starts-with(string(@src), 'http') ">
+        <!-- already absolute -->
+        <xsl:when test="contains(string(@src),':') or starts-with(string(@src),'/')">
           <xsl:value-of select="@src"/>
         </xsl:when>
-        <xsl:otherwise><xsl:value-of select="concat($imagesdir, $xmlbasedir, @src)"/></xsl:otherwise>
+        <!-- relative to document -->
+        <xsl:otherwise><xsl:value-of select="concat($xmlbasedir,@src)"/></xsl:otherwise>
       </xsl:choose>
       </xsl:variable>
       <fo:external-graphic src="{$imgpath}">

Modified: forrest/trunk/status.xml
==============================================================================
--- forrest/trunk/status.xml	(original)
+++ forrest/trunk/status.xml	Tue Jun  8 11:38:30 2004
@@ -49,6 +49,9 @@
         Added new document to facilitate
         <link href="upgrading_06.html">upgrading to v0.6</link>
       </action>
+      <action dev="DB" type="fix" context="code" fixes-bug="FOR-114">
+        Improved resolving image references in PDFs.
+      </action>
       <action dev="NKB" type="fix" context="core">
         Now CSS files are parsed internally, so that the urls are included in the static
         site generation.

Mime
View raw message