forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgard...@apache.org
Subject cvs commit: xml-forrest/src/core/context/skins/common/xslt/fo document2fo.xsl
Date Thu, 05 Feb 2004 14:24:12 GMT
rgardler    2004/02/05 06:24:12

  Modified:    src/core/context faq.xmap sitemap.xmap
               src/core/context/skins/common/xslt/fo document2fo.xsl
  Log:
  Images are displayed in PDF docs again.
  
  Revision  Changes    Path
  1.5       +3 -3      xml-forrest/src/core/context/faq.xmap
  
  Index: faq.xmap
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/core/context/faq.xmap,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- faq.xmap	9 Jan 2004 16:02:46 -0000	1.4
  +++ faq.xmap	5 Feb 2004 14:24:12 -0000	1.5
  @@ -115,14 +115,14 @@
             <map:when  test="{project:skins-dir}{forrest:skin}/xslt/fo/document2fo.xsl">
               <map:transform src="{project:skins-dir}{forrest:skin}/xslt/fo/document2fo.xsl">
                 <map:parameter name="numbersections" value="false"/>
  -              <map:parameter name="ctxbasedir" value="{realpath:.}/"/>
  +              <map:parameter name="imagesdir" value="{project:resources.images}/"/>
                 <map:parameter name="xmlbasedir" value="{project:content.xdocs}{1}"/>
               </map:transform>
             </map:when>
             <map:otherwise>
               <map:transform src="{forrest:home}context/skins/{forrest:skin}/xslt/fo/document2fo.xsl">
                 <map:parameter name="numbersections" value="false"/>
  -              <map:parameter name="ctxbasedir" value="{realpath:.}/"/>
  +              <map:parameter name="imagesdir" value="{project:resources.images}/"/>
                 <map:parameter name="xmlbasedir" value="{project:content.xdocs}{1}"/>
               </map:transform>
             </map:otherwise>
  
  
  
  1.11      +7 -7      xml-forrest/src/core/context/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/core/context/sitemap.xmap,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- sitemap.xmap	23 Jan 2004 09:55:26 -0000	1.10
  +++ sitemap.xmap	5 Feb 2004 14:24:12 -0000	1.11
  @@ -390,19 +390,19 @@
           <map:select type="exists">
             <map:when test="{project:skins-dir}{forrest:skin}/xslt/fo/document2fo.xsl">
               <map:transform src="{project:skins-dir}{forrest:skin}/xslt/fo/document2fo.xsl">
  -              <map:parameter name="ctxbasedir" value="{realpath:.}/"/>
  +              <map:parameter name="imagesdir" value="{project:resources.images}/"/>
                 <map:parameter name="xmlbasedir" value="{project:content.xdocs}{1}"/>
               </map:transform>
             </map:when>
             <map:when test="{forrest:home}context/skins/{forrest:skin}/xslt/fo/document2fo.xsl">
               <map:transform src="{forrest:home}context/skins/{forrest:skin}/xslt/fo/document2fo.xsl">
  -              <map:parameter name="ctxbasedir" value="{realpath:.}/"/>
  +              <map:parameter name="imagesdir" value="{project:resources.images}/"/>
                 <map:parameter name="xmlbasedir" value="{project:content.xdocs}{1}"/>
               </map:transform>
             </map:when>
             <map:otherwise>
               <map:transform src="{forrest:home}context/skins/common/xslt/fo/document2fo.xsl">
  -              <map:parameter name="ctxbasedir" value="{realpath:.}/"/>
  +              <map:parameter name="imagesdir" value="{project:resources.images}/"/>
                 <map:parameter name="xmlbasedir" value="{project:content.xdocs}{1}"/>
               </map:transform>
             </map:otherwise>
  @@ -418,19 +418,19 @@
           <map:select type="exists">
             <map:when test="{project:skins-dir}{forrest:skin}/xslt/svg/document2svg.xsl">
               <map:transform src="{project:skins-dir}{forrest:skin}/xslt/svg/document2svg.xsl">
  -              <map:parameter name="ctxbasedir" value="{realpath:.}/"/>
  +              <map:parameter name="imagesdir" value="{project:resources.images}/"/>
                 <map:parameter name="xmlbasedir" value="{project:content.xdocs}{1}"/>
               </map:transform>
             </map:when>
             <map:when test="{forrest:home}context/skins/{forrest:skin}/xslt/svg/document2svg.xsl">
               <map:transform src="{forrest:home}context/skins/{forrest:skin}/xslt/svg/document2svg.xsl">
  -              <map:parameter name="ctxbasedir" value="{realpath:.}/"/>
  +              <map:parameter name="imagesdir" value="{project:resources.images}/"/>
                 <map:parameter name="xmlbasedir" value="{project:content.xdocs}{1}"/>
               </map:transform>
             </map:when>
             <map:otherwise>
               <map:transform src="{forrest:home}context/skins/common/xslt/svg/document2svg.xsl">
  -              <map:parameter name="ctxbasedir" value="{realpath:.}/"/>
  +              <map:parameter name="imagesdir" value="{project:resources.images}/"/>
                 <map:parameter name="xmlbasedir" value="{project:content.xdocs}{1}"/>
               </map:transform>
             </map:otherwise>
  
  
  
  1.3       +3 -3      xml-forrest/src/core/context/skins/common/xslt/fo/document2fo.xsl
  
  Index: document2fo.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/core/context/skins/common/xslt/fo/document2fo.xsl,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- document2fo.xsl	4 Feb 2004 20:44:12 -0000	1.2
  +++ document2fo.xsl	5 Feb 2004 14:24:12 -0000	1.3
  @@ -14,7 +14,7 @@
   
     <!-- Section depth at which we stop numbering and just indent -->
     <xsl:param name="numbering-max-depth" select="'3'"/>
  -  <xsl:param name="ctxbasedir" select="."/>
  +  <xsl:param name="imagesdir" select="."/>
     <xsl:param name="xmlbasedir"/>
     <xsl:include href="pdfoutline.xsl"/>
     <xsl:include href="footerinfo.xsl"/>
  @@ -556,12 +556,12 @@
         <xsl:variable name="imgpath">
         <xsl:choose>
           <xsl:when test="starts-with(string(@src), 'images/') or contains(string(@src),
'../images')">
  -          <xsl:value-of select="concat($ctxbasedir, 'resources/images/' , substring-after(@src,
'images'))"/>
  +          <xsl:value-of select="concat($imagesdir, substring-after(@src, 'images'))"/>
           </xsl:when>
           <xsl:when test="starts-with(string(@src), 'http') ">
             <xsl:value-of select="@src"/>
           </xsl:when>
  -        <xsl:otherwise><xsl:value-of select="concat($ctxbasedir, $xmlbasedir,
@src)"/></xsl:otherwise>
  +        <xsl:otherwise><xsl:value-of select="concat($imagesdir, $xmlbasedir, @src)"/></xsl:otherwise>
         </xsl:choose>
         </xsl:variable>
         <fo:external-graphic src="{$imgpath}">
  
  
  

Mime
View raw message