Return-Path: 
 <svn-return-7552-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org>
Delivered-To: apmail-forrest-svn-archive@www.apache.org
Received: (qmail 68261 invoked from network); 12 Feb 2008 20:14:43 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 12 Feb 2008 20:14:43 -0000
Received: (qmail 79723 invoked by uid 500); 12 Feb 2008 20:14:37 -0000
Delivered-To: apmail-forrest-svn-archive@forrest.apache.org
Received: (qmail 79685 invoked by uid 500); 12 Feb 2008 20:14:37 -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 79675 invoked by uid 99); 12 Feb 2008 20:14:37 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 12 Feb 2008 12:14:37 -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; Tue, 12 Feb 2008 20:14:00 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id C67921A9838; Tue, 12 Feb 2008 12:14:19 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r627076 -
 /forrest/branches/UpdateFOPto094/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/document-to-fo.xsl
Date: Tue, 12 Feb 2008 20:14:19 -0000
To: svn@forrest.apache.org
From: ferdinand@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080212201419.C67921A9838@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: ferdinand
Date: Tue Feb 12 12:14:17 2008
New Revision: 627076

URL: http://svn.apache.org/viewvc?rev=627076&view=rev
Log:
Fixed and adjusted underlining of headings.

Modified:
    forrest/branches/UpdateFOPto094/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/document-to-fo.xsl

Modified: forrest/branches/UpdateFOPto094/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/document-to-fo.xsl
URL: http://svn.apache.org/viewvc/forrest/branches/UpdateFOPto094/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/document-to-fo.xsl?rev=627076&r1=627075&r2=627076&view=diff
==============================================================================
--- forrest/branches/UpdateFOPto094/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/document-to-fo.xsl (original)
+++ forrest/branches/UpdateFOPto094/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/document-to-fo.xsl Tue Feb 12 12:14:17 2008
@@ -489,13 +489,13 @@
             id="{@id}" />
         <xsl:apply-templates />
     </xsl:template>
+    
     <xsl:template
         match="section">
         <xsl:param
             name="level">0</xsl:param>
         <xsl:variable
             name="size">
-            <!-- 14pt for level 1 12pt for level 2 -->
             <xsl:value-of
                 select="12-number($level)" />
         </xsl:variable>
@@ -516,19 +516,7 @@
             space-after="8pt"
             margin="0">
             <xsl:call-template
-                name="insertPageBreaks" />
-            <xsl:if
-                test="$heading-type = 'boxed'">
-                <xsl:attribute
-                    name="background-color">
-                    <xsl:value-of
-                        select="$heading-color" />
-                </xsl:attribute>
-                <xsl:attribute
-                    name="padding-left">3pt</xsl:attribute>
-                <xsl:attribute
-                    name="padding-top">4pt</xsl:attribute>
-            </xsl:if>
+            name="insertPageBreaks" />
             <xsl:attribute
                 name="id">
                 <xsl:choose>
@@ -544,6 +532,29 @@
                 </xsl:choose>
             </xsl:attribute>
             <xsl:if
+                test="$heading-type = 'boxed'">
+                <xsl:attribute
+                    name="background-color">
+                    <xsl:value-of
+                        select="$heading-color" />
+                </xsl:attribute>
+                <xsl:attribute
+                    name="padding-left">3pt</xsl:attribute>
+                <xsl:attribute
+                    name="padding-top">4pt</xsl:attribute>
+            </xsl:if>
+            <xsl:if
+                test="$heading-type = 'underlined'">
+                <xsl:attribute
+                    name="border-bottom-style">solid</xsl:attribute>
+                <xsl:attribute
+                    name="border-bottom-width"><xsl:value-of select="2+(2-number($level))*2"/>pt</xsl:attribute>
+                <xsl:attribute
+                    name="border-bottom-color"><xsl:value-of select="$heading-color"/>
+                </xsl:attribute>
+            </xsl:if>
+            
+            <xsl:if
                 test="$numbersections = 'true' and number($level) &lt; $numbering-max-depth+1">
                 <xsl:number
                     format="1.1.1.1.1.1.1"
@@ -564,15 +575,7 @@
             <xsl:value-of
                 select="title" />
         </fo:block>
-        <xsl:if
-            test="$heading-type = 'underlined'">
-            <!-- The non-breaking space in this block is required, otherwise
-      the block won't be rendered at all. -->
-            <fo:block
-                font-family="serif"
-                font-size="{10 div (number($level) +1 )}pt"
-                background-color="{$heading-color}">&#160;</fo:block>
-        </xsl:if>
+        
         <fo:block
             background-color="{$background-color}">
             <xsl:apply-templates>