forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stev...@apache.org
Subject cvs commit: xml-forrest status.xml
Date Thu, 10 Apr 2003 14:22:33 GMT
stevenn     2003/04/10 07:22:33

  Modified:    src/resources/conf sitemap.xmap
               src/resources/skins/common/xslt/fo document2fo.xsl
               .        status.xml
  Log:
  Fixed rendering of images in PDF for images not located in the resources/images dir.
  
  Revision  Changes    Path
  1.90      +2 -1      xml-forrest/src/resources/conf/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/sitemap.xmap,v
  retrieving revision 1.89
  retrieving revision 1.90
  diff -u -r1.89 -r1.90
  --- sitemap.xmap	10 Apr 2003 09:53:35 -0000	1.89
  +++ sitemap.xmap	10 Apr 2003 14:22:31 -0000	1.90
  @@ -161,7 +161,8 @@
         <map:match type="regexp" pattern="^(.*?)([^/]*).pdf$">
           <map:generate src="cocoon:/{1}{2}.xml"/>
           <map:transform src="skins/{forrest:skin}/xslt/fo/document2fo.xsl">
  -          <map:parameter name="basedir" value="{realpath:resources}/"/>
  +          <map:parameter name="ctxbasedir" value="{realpath:.}/"/>
  +          <map:parameter name="xmlbasedir" value="content/xdocs/{1}"/>
           </map:transform>
           <map:serialize type="fo2pdf"/>
         </map:match>
  
  
  
  1.9       +8 -2      xml-forrest/src/resources/skins/common/xslt/fo/document2fo.xsl
  
  Index: document2fo.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/skins/common/xslt/fo/document2fo.xsl,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- document2fo.xsl	4 Apr 2003 13:37:25 -0000	1.8
  +++ document2fo.xsl	10 Apr 2003 14:22:32 -0000	1.9
  @@ -5,7 +5,8 @@
                   version="1.0">
   
     <xsl:output method="xml"/>
  -  <xsl:param name="basedir" select="'file:'"/>
  +  <xsl:param name="ctxbasedir" select="."/>
  +  <xsl:param name="xmlbasedir"/>
     <xsl:include href="pdfoutline.xsl"/>
     <xsl:include href="footerinfo.xsl"/>
   
  @@ -503,7 +504,12 @@
         </xsl:if>
   
         <!-- Make relative paths absolute -->
  -      <xsl:variable name="imgpath" select="concat($basedir, @src)"/>
  +      <xsl:variable name="imgpath">
  +      <xsl:choose>
  +        <xsl:when test="starts-with(string(@src), 'images/')"><xsl:value-of select="concat($ctxbasedir,
'resources/' , @src)"/></xsl:when>
  +        <xsl:otherwise><xsl:value-of select="concat($ctxbasedir, $xmlbasedir,
@src)"/></xsl:otherwise>
  +      </xsl:choose>
  +      </xsl:variable>
         <fo:external-graphic src="{$imgpath}" content-width="scale-to-fit"
                              content-height="scale-to-fit" max-width="100%">
           <xsl:if test="@height">
  
  
  
  1.146     +4 -0      xml-forrest/status.xml
  
  Index: status.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/status.xml,v
  retrieving revision 1.145
  retrieving revision 1.146
  diff -u -r1.145 -r1.146
  --- status.xml	10 Apr 2003 10:08:19 -0000	1.145
  +++ status.xml	10 Apr 2003 14:22:32 -0000	1.146
  @@ -24,6 +24,10 @@
   
     <changes>
       <release version="0.5-dev" date="unreleased">
  +      <action dev="SN" type="hack" context="core">
  +        Fixed rendering of images in PDF for images not located in the
  +        resources/images dir.
  +      </action>
         <action dev="JT" type="fix" context="core">
           Add automatic (doctype-triggered) handling of todo and changes XML
           files, regardless of file name or location in the directory tree.  The
  
  
  

Mime
View raw message