Return-Path: 
 <svn-return-7587-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org>
Delivered-To: apmail-forrest-svn-archive@www.apache.org
Received: (qmail 2446 invoked from network); 17 Feb 2008 17:38:38 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 17 Feb 2008 17:38:38 -0000
Received: (qmail 37383 invoked by uid 500); 17 Feb 2008 17:38:32 -0000
Delivered-To: apmail-forrest-svn-archive@forrest.apache.org
Received: (qmail 37350 invoked by uid 500); 17 Feb 2008 17:38:32 -0000
Mailing-List: contact svn-help@forrest.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:svn-help@forrest.apache.org>
list-unsubscribe: <mailto:svn-unsubscribe@forrest.apache.org>
List-Post: <mailto:svn@forrest.apache.org>
Reply-To: "Forrest Developers List" <dev@forrest.apache.org>
List-Id: <svn.forrest.apache.org>
Delivered-To: mailing list svn@forrest.apache.org
Received: (qmail 37341 invoked by uid 99); 17 Feb 2008 17:38:32 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 17 Feb 2008 09:38:32 -0800
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 17 Feb 2008 17:38:08 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id E60231A9832; Sun, 17 Feb 2008 09:38:16 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r628522 -
 /forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-main.ft
Date: Sun, 17 Feb 2008 17:38:15 -0000
To: svn@forrest.apache.org
From: ferdinand@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080217173816.E60231A9832@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: ferdinand
Date: Sun Feb 17 09:38:08 2008
New Revision: 628522

URL: http://svn.apache.org/viewvc?rev=628522&view=rev
Log:
Copying more fop94 fixes from original stylesheet

Modified:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-main.ft

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-main.ft
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-main.ft?rev=628522&r1=628521&r2=628522&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-main.ft (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.themes.core/themes/common/fo/content-main.ft Sun Feb 17 09:38:08 2008
@@ -424,12 +424,28 @@
               <xsl:attribute name="height">
                 <xsl:value-of select="@height"/>
               </xsl:attribute>
+               <xsl:attribute
+                    name="content-height">scale-to-fit</xsl:attribute>
             </xsl:if>
             <xsl:if test="@width">
               <xsl:attribute name="width">
                 <xsl:value-of select="@width"/>
               </xsl:attribute>
+                <xsl:attribute
+                    name="content-width">scale-to-fit</xsl:attribute>
             </xsl:if>
+              <!-- Work around for fop094 not supporting 
+                  scale-down-to-fit, to be replaces as soon as fop095 is released
+              -->
+              <xsl:if
+                  test=" not((@width|@height))">
+                  <xsl:attribute
+                      name="width">100%</xsl:attribute>
+                  <xsl:attribute
+                      name="content-width">scale-to-fit</xsl:attribute>
+                  <xsl:attribute
+                      name="content-height">100%</xsl:attribute>
+              </xsl:if>
           </fo:external-graphic>
 <!-- alt text -->
           <xsl:if test="$config/show-image-alt-text='true'">
@@ -525,12 +541,22 @@
           padding-end="4pt" color="#FFFFFF"
           background-color="{$background-color}"
           border="1pt solid {$border-color}">
-          <xsl:attribute name="number-columns-spanned">
-            <xsl:value-of select="@colspan"/>
-          </xsl:attribute>
-          <xsl:attribute name="number-rows-spanned">
-            <xsl:value-of select="@rowspan"/>
-          </xsl:attribute>
+            <xsl:if
+                test="@colspan!=''">
+                <xsl:attribute
+                    name="number-columns-spanned">
+                    <xsl:value-of
+                        select="@colspan" />
+                </xsl:attribute>
+            </xsl:if>
+            <xsl:if
+                test="@rowspan!=''">
+                <xsl:attribute
+                    name="number-rows-spanned">
+                    <xsl:value-of
+                        select="@rowspan" />
+                </xsl:attribute>
+            </xsl:if>
           <fo:block text-align="center">
             <xsl:apply-templates/>
           </fo:block>
@@ -546,12 +572,22 @@
           padding-end="4pt"
           background-color="{$background-color}"
           border="1pt solid {$border-color}">
-          <xsl:attribute name="number-columns-spanned">
-            <xsl:value-of select="@colspan"/>
-          </xsl:attribute>
-          <xsl:attribute name="number-rows-spanned">
-            <xsl:value-of select="@rowspan"/>
-          </xsl:attribute>
+            <xsl:if
+                test="@colspan!=''">
+                <xsl:attribute
+                    name="number-columns-spanned">
+                    <xsl:value-of
+                        select="@colspan" />
+                </xsl:attribute>
+            </xsl:if>
+            <xsl:if
+                test="@rowspan!=''">
+                <xsl:attribute
+                    name="number-rows-spanned">
+                    <xsl:value-of
+                        select="@rowspan" />
+                </xsl:attribute>
+            </xsl:if>
           <fo:block>
             <xsl:apply-templates/>
           </fo:block>