Return-Path: 
 <svn-return-2155-apmail-forrest-svn-archive=forrest.apache.org@forrest.apache.org>
Delivered-To: apmail-forrest-svn-archive@www.apache.org
Received: (qmail 6829 invoked from network); 5 May 2005 09:42:58 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 5 May 2005 09:42:58 -0000
Received: (qmail 92202 invoked by uid 500); 5 May 2005 09:45:12 -0000
Delivered-To: apmail-forrest-svn-archive@forrest.apache.org
Received: (qmail 92167 invoked by uid 500); 5 May 2005 09:45:12 -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>
Delivered-To: mailing list svn@forrest.apache.org
Received: (qmail 92135 invoked by uid 99); 5 May 2005 09:45:11 -0000
X-ASF-Spam-Status: No, hits=0.2 required=10.0
	tests=NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from minotaur.apache.org (HELO minotaur.apache.org)
 (209.237.227.194)
  by apache.org (qpsmtpd/0.28) with SMTP; Thu, 05 May 2005 02:45:11 -0700
Received: (qmail 6812 invoked by uid 65534); 5 May 2005 09:42:54 -0000
Message-ID: <20050505094254.6811.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Subject: svn commit: r168305 - in /forrest/trunk:
 main/webapp/skins/common/xslt/fo/document2fo.xsl site-author/status.xml
Date: Thu, 05 May 2005 09:42:54 -0000
To: svn@forrest.apache.org
From: rgardler@apache.org
X-Mailer: svnmailer-1.0.0-dev
X-Virus-Checked: Checked
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: rgardler
Date: Thu May  5 02:42:53 2005
New Revision: 168305

URL: http://svn.apache.org/viewcvs?rev=3D168305&view=3Drev
Log:
FO output honours colour settings in skinconf + handle links other than jus=
t 'link' (fix for 430, thanks to Florian G, Haas)

Modified:
    forrest/trunk/main/webapp/skins/common/xslt/fo/document2fo.xsl
    forrest/trunk/site-author/status.xml

Modified: forrest/trunk/main/webapp/skins/common/xslt/fo/document2fo.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/main/webapp/skins/common/x=
slt/fo/document2fo.xsl?rev=3D168305&r1=3D168304&r2=3D168305&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- forrest/trunk/main/webapp/skins/common/xslt/fo/document2fo.xsl (origina=
l)
+++ forrest/trunk/main/webapp/skins/common/xslt/fo/document2fo.xsl Thu May =
 5 02:42:53 2005
@@ -389,13 +389,20 @@
       <xsl:value-of select=3D"14-number($level)"/>
     </xsl:variable>
=20
+    <xsl:variable name=3D"heading-color" select=3D"//skinconfig/colors/col=
or[@name=3D'subheading']/@value"/>
+    <xsl:variable name=3D"heading-type" select=3D"//skinconfig/headings/@t=
ype"/>
+
     <fo:block
       font-family=3D"serif"
       font-size=3D"{$size}pt"
       font-weight=3D"bold"
       space-before=3D"12pt"
       space-after=3D"4pt">
-
+      <xsl:if test=3D"$heading-type =3D 'boxed'">
+        <xsl:attribute name=3D"background-color">
+          <xsl:value-of select=3D"$heading-color"/>
+        </xsl:attribute>
+      </xsl:if>
       <xsl:attribute name=3D"id">
         <xsl:choose>
           <xsl:when test=3D"normalize-space(@id)!=3D''">
@@ -421,6 +428,14 @@
=20
       <xsl:value-of select=3D"title"/>
     </fo:block>
+    <xsl:if test=3D"$heading-type =3D 'underlined'">
+      <!-- The non-breaking space in this block is required, otherwise
+      the block won't be rendered at all. -->=20
+      <fo:block
+        font-family=3D"serif"
+        font-size=3D"{10 div (number($level) +1 )}pt"
+        background-color=3D"{$heading-color}">&#160;</fo:block>
+    </xsl:if>
     <xsl:apply-templates>
       <xsl:with-param name=3D"level" select=3D"number($level)+1"/>
     </xsl:apply-templates>
@@ -485,10 +500,11 @@
   </xsl:template>
=20
   <xsl:template match=3D"source">
+    <xsl:variable name=3D"color" select=3D"//skinconfig/colors/color[@name=
=3D'code']/@value"/>
     <fo:block
       font-family=3D"monospace"
       font-size=3D"10pt"
-      background-color=3D"#f0f0f0"
+      background-color=3D"{$color}"
       white-space-collapse=3D"false"
       linefeed-treatment=3D"preserve"
       white-space-treatment=3D"preserve"
@@ -604,6 +620,7 @@
   </xsl:template>
=20
   <xsl:template match=3D"warning">
+    <xsl:variable name=3D"color" select=3D"//skinconfig/colors/color[@name=
=3D'warning']/@value"/>
     <fo:block
       margin-left=3D"0.25in"
       margin-right=3D"0.25in"
@@ -614,8 +631,8 @@
       border-before-style=3D"solid"
       border-start-style=3D"solid"
       border-end-style=3D"solid"
-      border-color=3D"#D00000"
-      background-color=3D"#D00000"
+      border-color=3D"{$color}"
+      background-color=3D"{$color}"
       color=3D"#ffffff">
       <xsl:choose>
         <xsl:when test=3D"@label"><xsl:value-of select=3D"@label"/></xsl:w=
hen>
@@ -630,7 +647,7 @@
       border-after-style=3D"solid"
       border-start-style=3D"solid"
       border-end-style=3D"solid"
-      border-color=3D"#D00000"
+      border-color=3D"{$color}"
       background-color=3D"#fff0f0"
       padding-start=3D"3pt"
       padding-end=3D"3pt"
@@ -642,6 +659,7 @@
   </xsl:template>
=20
   <xsl:template match=3D"note">
+    <xsl:variable name=3D"color" select=3D"//skinconfig/colors/color[@name=
=3D'note']/@value"/>
     <fo:block
       margin-left=3D"0.25in"
       margin-right=3D"0.25in"
@@ -653,8 +671,8 @@
       border-before-style=3D"solid"
       border-start-style=3D"solid"
       border-end-style=3D"solid"
-      border-color=3D"#A0C9F5"
-      background-color=3D"#A0C9F5">
+      border-color=3D"{$color}"
+      background-color=3D"{$color}">
       <xsl:choose>
         <xsl:when test=3D"@label"><xsl:value-of select=3D"@label"/></xsl:w=
hen>
         <!-- insert i18n stuff here -->
@@ -670,7 +688,7 @@
       border-after-style=3D"solid"
       border-start-style=3D"solid"
       border-end-style=3D"solid"
-      border-color=3D"#A0C9F5"
+      border-color=3D"{$color}"
       background-color=3D"#F0F0FF"
       padding-start=3D"3pt"
       padding-end=3D"3pt"
@@ -681,6 +699,7 @@
   </xsl:template>
=20
   <xsl:template match=3D"fixme">
+    <xsl:variable name=3D"color" select=3D"//skinconfig/colors/color[@name=
=3D'fixme']/@value"/>
     <fo:block
       margin-left=3D"0.25in"
       margin-right=3D"0.25in"
@@ -692,8 +711,8 @@
       border-before-style=3D"solid"
       border-start-style=3D"solid"
       border-end-style=3D"solid"
-      border-color=3D"#C6C650"
-      background-color=3D"#C6C650">
+      border-color=3D"{$color}"
+      background-color=3D"{$color}">
       <!-- insert i18n stuff here -->
       FIXME (<xsl:value-of select=3D"@author"/>): <xsl:value-of select=3D"=
title"/>
     </fo:block>
@@ -706,7 +725,7 @@
       border-after-style=3D"solid"
       border-start-style=3D"solid"
       border-end-style=3D"solid"
-      border-color=3D"#C6C650"
+      border-color=3D"{$color}"
       background-color=3D"#FFF0F0"
       padding-start=3D"3pt"
       padding-end=3D"3pt"
@@ -716,15 +735,16 @@
     </fo:block>
   </xsl:template>
=20
-  <xsl:template match=3D"link">
+  <xsl:template match=3D"link|fork|jump|a">
+    <xsl:variable name=3D"color" select=3D"//skinconfig/colors/color[@name=
 =3D 'body']/@link"/>
     <xsl:choose>
       <xsl:when test=3D"starts-with(@href, '#')">
-        <fo:basic-link color=3D"blue" text-decoration=3D"underline" intern=
al-destination=3D"{substring(@href,2)}">
+        <fo:basic-link color=3D"{$color}" text-decoration=3D"underline" in=
ternal-destination=3D"{substring(@href,2)}">
           <xsl:apply-templates/>
         </fo:basic-link>
       </xsl:when>
       <xsl:otherwise>
-        <fo:basic-link color=3D"blue" text-decoration=3D"underline" extern=
al-destination=3D"{@href}"><xsl:apply-templates/></fo:basic-link>
+        <fo:basic-link color=3D"{$color}" text-decoration=3D"underline" ex=
ternal-destination=3D"{@href}"><xsl:apply-templates/></fo:basic-link>
         <xsl:if test=3D"$show-external-urls =3D 'true' and @href !=3D stri=
ng(.)">
           (<xsl:value-of select=3D"@href"/>)
         </xsl:if>
@@ -833,12 +853,16 @@
   </xsl:template>
=20
   <xsl:template match=3D"th">
+      <xsl:variable name=3D"border-color" select=3D"//skinconfig/colors/co=
lor[@name =3D 'table']/@value"/>
+      <xsl:variable name=3D"background-color" select=3D"$border-color"/>
       <fo:table-cell
         padding-before=3D"4pt"
         padding-after=3D"4pt"
         padding-start=3D"4pt"
         padding-end=3D"4pt"
-        background-color=3D"#A0C9F5">
+        color=3D"#FFFFFF"
+        background-color=3D"{$background-color}"
+        border=3D"1pt solid {$border-color}">
         <xsl:attribute name=3D"number-columns-spanned">
           <xsl:value-of select=3D"@colspan"/>
         </xsl:attribute>
@@ -853,12 +877,15 @@
   </xsl:template>
=20
   <xsl:template match=3D"td">
+    <xsl:variable name=3D"border-color" select=3D"//skinconfig/colors/colo=
r[@name =3D 'table']/@value"/>
+    <xsl:variable name=3D"background-color" select=3D"//skinconfig/colors/=
color[@name =3D 'table-cell']/@value"/>
     <fo:table-cell
       padding-before=3D"4pt"
       padding-after=3D"4pt"
       padding-start=3D"4pt"
       padding-end=3D"4pt"
-      border=3D"1pt solid #A0C9F5">
+      background-color=3D"{$background-color}"
+      border=3D"1pt solid {$border-color}">
       <xsl:attribute name=3D"number-columns-spanned">
           <xsl:value-of select=3D"@colspan"/>
         </xsl:attribute>

Modified: forrest/trunk/site-author/status.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/site-author/status.xml?rev=
=3D168305&r1=3D168304&r2=3D168305&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- forrest/trunk/site-author/status.xml (original)
+++ forrest/trunk/site-author/status.xml Thu May  5 02:42:53 2005
@@ -47,6 +47,15 @@
=20
   <changes>
     <release version=3D"0.7-dev" date=3D"not yet released">
+      <action dev=3D"" dev=3D"RDG" type=3D"update" context=3D"FO"
+        fixes-bug=3D"FOR-430" thanks-to=3D"Florian G. Haas">
+        * Uses skinconf.xml to determine background and border color for n=
otes, warnings, and fixmes;
+        * Uses skinconf.xml to determine background and border color for t=
able cells (headers and data);
+        * Honors headings type set in skinconf.xml (clean|underlined|boxed=
) and colors headings accordingly;
+        * Uses skinconf.xml to determine font color for links.
+
+        In addition, this patch extends the "link" template to also apply =
to the "fork", "jump", and "a" elements.
+      </action>
       <action dev=3D"DC" type=3D"add" context=3D"docs">
 <!-- Please keep this action at the top -->
         Added document to facilitate