Return-Path: 
 <forrest-cvs-return-1010-apmail-xml-forrest-dev-archive=xml.apache.org@xml.apache.org>
Delivered-To: apmail-xml-forrest-dev-archive@xml.apache.org
Received: (qmail 67914 invoked by uid 500); 15 Jun 2003 12:35:17 -0000
Mailing-List: contact forrest-cvs-help@xml.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:forrest-cvs-help@xml.apache.org>
list-unsubscribe: <mailto:forrest-cvs-unsubscribe@xml.apache.org>
list-post: <mailto:forrest-cvs@xml.apache.org>
Reply-To: forrest-dev@xml.apache.org
Delivered-To: mailing list forrest-cvs@xml.apache.org
Received: (qmail 67903 invoked from network); 15 Jun 2003 12:35:17 -0000
Received: from icarus.apache.org (208.185.179.13)
  by daedalus.apache.org with SMTP; 15 Jun 2003 12:35:17 -0000
Received: (qmail 89281 invoked by uid 1352); 15 Jun 2003 12:35:17 -0000
Date: 15 Jun 2003 12:35:17 -0000
Message-ID: <20030615123517.89280.qmail@icarus.apache.org>
From: jefft@apache.org
To: xml-forrest-cvs@apache.org
Subject: cvs commit: xml-forrest/src/resources/stylesheets
 relativize-linkmap.xsl
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

jefft       2003/06/15 05:35:17

  Modified:    src/resources/stylesheets relativize-linkmap.xsl
  Log:
  Cleaner handling of images
  
  Revision  Changes    Path
  1.5       +10 -6     xml-forrest/src/resources/stylesheets/relativize-linkmap.xsl
  
  Index: relativize-linkmap.xsl
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/stylesheets/relativize-linkmap.xsl,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- relativize-linkmap.xsl	15 Jun 2003 08:29:01 -0000	1.4
  +++ relativize-linkmap.xsl	15 Jun 2003 12:35:17 -0000	1.5
  @@ -44,7 +44,7 @@
   <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
   
     <xsl:param name="path"/>
  -  <xsl:param name="site-root" select="'http://localhost:8787/forrest/'"/>
  +  <xsl:param name="site-root"/>
   
     <xsl:include href="dotdots.xsl"/>
   
  @@ -62,14 +62,18 @@
           <xsl:when test="starts-with(., 'http:') or starts-with(., 'https:')">
             <xsl:value-of select="."/>
           </xsl:when>
  +        <xsl:when test="contains(., '.png') or
  +          contains(., '.jpeg') or
  +          contains(., '.jpg') or
  +          contains(., '.tif')">
  +          <!-- Image links are always relative -->
  +          <xsl:value-of select="$root"/><xsl:value-of select="."/>
  +        </xsl:when>
  +
   
           <!-- PDFs can handle inline images, but everything else must become an
           external link -->
  -        <xsl:when test="contains($path, '.pdf') and not(
  -        contains(., '.png') or
  -        contains(., '.jpeg') or
  -        contains(., '.jpg') or
  -        contains(., '.tif'))">
  +        <xsl:when test="contains($path, '.pdf')">
   
             <!-- Links to outside a PDF are all absolute -->
             <xsl:value-of select="concat($site-root, .)"/>