forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r691220 - in /forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf: ./ resources/stylesheets/
Date Tue, 02 Sep 2008 12:50:21 GMT
Author: sjur
Date: Tue Sep  2 05:50:20 2008
New Revision: 691220

URL: http://svn.apache.org/viewvc?rev=691220&view=rev
Log:
Main commit to move all configuration and properties of the pdf output plugin FROM the plugin
itself INTO the user/project space.

There are two separate (sets of) properties now being exposed to the outside world:
* the reference to the pdf-config file used to tell FOP where to find custom font description
files
* the actual font specifications for the XSL transformation to the FO format (used as input
to the fo-to-pdf rendering)

Every single place in the XSL stylesheets with a font family specification is now specifyable
by the user on a per-project basis.

More details to come soon in updated plugin documentation.

Added:
    forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/helper-footerinfo.xsl
      - copied unchanged from r688179, forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/footerinfo.xsl
Removed:
    forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/footerinfo.xsl
Modified:
    forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/output.xmap
    forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/document-to-fo.xsl
    forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/helper-commonElements.xsl

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/output.xmap
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/output.xmap?rev=691220&r1=691219&r2=691220&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/output.xmap (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/output.xmap Tue Sep  2 05:50:20
2008
@@ -15,10 +15,22 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
+<!DOCTYPE map:sitemap [
+<!ENTITY % symbols-project
+  PUBLIC "-//Apache Forrest//ENTITIES Symbols Project v1.0//EN"
+  "symbols-project-v10.ent">
+  %symbols-project;
+<!ENTITY % symbols-core
+  PUBLIC "-//Apache Forrest//ENTITIES Symbols Core v1.0//EN"
+  "symbols-core-v10.ent">
+  %symbols-core;
+]>
 <map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
   <map:components>
     <map:serializers default="fo2pdf">
-        <map:serializer name="fo2pdf" src="org.apache.cocoon.blocks.fop.FOPNGSerializer"
mime-type="application/pdf" />
+      <map:serializer name="fo2pdf" src="org.apache.cocoon.blocks.fop.FOPNGSerializer"
mime-type="application/pdf">
+      	<user-config>&pdf-config-file;</user-config>
+      </map:serializer> 
     </map:serializers>
   </map:components>
   <map:pipelines>
@@ -31,6 +43,7 @@
                 </map:when>
                 <map:otherwise>
                     <map:aggregate element="site">
+                        <map:part src="cocoon://module.properties.properties"/>
                         <map:part src="cocoon://skinconf.xml"/>
                         <map:part src="cocoon://{1}{2}.xml"/>
                     </map:aggregate>
@@ -38,12 +51,9 @@
                     <map:transform type="xinclude"/>
                     <map:transform type="linkrewriter" src="cocoon://{1}linkmap-{2}.fo"/>
                     <map:transform src="{lm:pdf.transform.document.fo}">
-                        <map:parameter name="imagesdir" value="{properties:resources.images}/"/>
+                        <map:parameter name="imagesdir"  value="{properties:resources.images}/"/>
                         <map:parameter name="xmlbasedir" value="{properties:content.xdocs}{1}"/>
-                        <map:parameter name="serif"      value="{properties:output.pdf.fontFamily.serif}"/>
-                        <map:parameter name="sans-serif" value="{properties:output.pdf.fontFamily.sansSerif}"/>
-                        <map:parameter name="monospace"  value="{properties:output.pdf.fontFamily.monospace}"/>
-                        <map:parameter name="path" value="{1}"/>
+                        <map:parameter name="path"       value="{1}"/>
                     </map:transform>
                 </map:otherwise>
             </map:select>

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/document-to-fo.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/document-to-fo.xsl?rev=691220&r1=691219&r2=691220&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/document-to-fo.xsl
(original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/document-to-fo.xsl
Tue Sep  2 05:50:20 2008
@@ -18,10 +18,14 @@
 <xsl:stylesheet
     xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
     xmlns:fo="http://www.w3.org/1999/XSL/Format"
+    xmlns:prop="http://apache.org/forrest/properties/1.0"
     version="1.0">
   <xsl:variable
         name="config"
         select="//skinconfig" />
+  <xsl:variable
+        name="properties"
+        select="//prop:properties" />
 <!-- left, justify, right -->
   <xsl:variable
         name="text-align"
@@ -98,11 +102,175 @@
   <xsl:param
         name="numbering-max-depth"
         select="'3'" />
-<!-- Font-family parameters defined here. Default values specified,
+<!-- Generic font-family parameters defined here. Default values specified,
      but usually the values should be passed in from the calling sitemap. -->
-  <xsl:param name="serif"      select="'serif'" />
-  <xsl:param name="sans-serif" select="'sans-serif'" />
-  <xsl:param name="monospace"  select="'monospace'" />
+  <xsl:param name="serif">
+    <xsl:choose>
+      <xsl:when test="$properties/*[@name='output.pdf.fontFamily.serif']">
+        <xsl:value-of select="$properties/*[@name='output.pdf.fontFamily.serif']/@value"/>
+      </xsl:when>
+      <xsl:otherwise>serif</xsl:otherwise>
+    </xsl:choose>
+  </xsl:param>
+  <xsl:param name="sans-serif">
+    <xsl:choose>
+      <xsl:when test="$properties/*[@name='output.pdf.fontFamily.sansSerif']">
+        <xsl:value-of select="$properties/*[@name='output.pdf.fontFamily.sansSerif']/@value"/>
+      </xsl:when>
+      <xsl:otherwise>sans-serif</xsl:otherwise>
+    </xsl:choose>
+  </xsl:param>
+  <xsl:param name="monospace">
+    <xsl:choose>
+      <xsl:when test="$properties/*[@name='output.pdf.fontFamily.monospace']">
+        <xsl:value-of select="$properties/*[@name='output.pdf.fontFamily.monospace']/@value"/>
+      </xsl:when>
+      <xsl:otherwise>monospace</xsl:otherwise>
+    </xsl:choose>
+  </xsl:param>
+<!-- Classes of text types that typically go together, and share font family
+     properties; this can be used to specify the font family for all related
+     text types at once: -->
+  <xsl:param name="headerFooterFontFamily">
+    <xsl:choose>
+      <xsl:when test="$properties/*[@name='output.pdf.fontFamily.headerFooterFontFamily']">
+        <xsl:value-of select="$properties/*[@name='output.pdf.fontFamily.headerFooterFontFamily']/@value"/>
+      </xsl:when>
+      <xsl:otherwise><xsl:value-of select="$sans-serif"/></xsl:otherwise>
+    </xsl:choose>
+  </xsl:param>
+<!-- Specific font-family parameters defined here, to allow overrides of
+     specific content elements; default values taken from the generic ones
+     above: -->
+  <xsl:param name="rootFontFamily">
+    <xsl:choose>
+      <xsl:when test="$properties/*[@name='output.pdf.fontFamily.rootFontFamily']">
+        <xsl:value-of select="$properties/*[@name='output.pdf.fontFamily.rootFontFamily']/@value"/>
+      </xsl:when>
+      <xsl:otherwise><xsl:value-of select="$serif"/></xsl:otherwise>
+    </xsl:choose>
+  </xsl:param>
+  <xsl:param name="firstFooterFontFamily">
+    <xsl:choose>
+      <xsl:when test="$properties/*[@name='output.pdf.fontFamily.firstFooterFontFamily']">
+        <xsl:value-of select="$properties/*[@name='output.pdf.fontFamily.firstFooterFontFamily']/@value"/>
+      </xsl:when>
+      <xsl:otherwise><xsl:value-of select="$headerFooterFontFamily"/></xsl:otherwise>
+    </xsl:choose>
+  </xsl:param>
+  <xsl:param name="evenHeaderFontFamily">
+    <xsl:choose>
+      <xsl:when test="$properties/*[@name='output.pdf.fontFamily.evenHeaderFontFamily']">
+        <xsl:value-of select="$properties/*[@name='output.pdf.fontFamily.evenHeaderFontFamily']/@value"/>
+      </xsl:when>
+      <xsl:otherwise><xsl:value-of select="$headerFooterFontFamily"/></xsl:otherwise>
+    </xsl:choose>
+  </xsl:param>
+  <xsl:param name="evenFooterFontFamily">
+    <xsl:choose>
+      <xsl:when test="$properties/*[@name='output.pdf.fontFamily.evenFooterFontFamily']">
+        <xsl:value-of select="$properties/*[@name='output.pdf.fontFamily.evenFooterFontFamily']/@value"/>
+      </xsl:when>
+      <xsl:otherwise><xsl:value-of select="$headerFooterFontFamily"/></xsl:otherwise>
+    </xsl:choose>
+  </xsl:param>
+  <xsl:param name="oddHeaderFontFamily">
+    <xsl:choose>
+      <xsl:when test="$properties/*[@name='output.pdf.fontFamily.oddHeaderFontFamily']">
+        <xsl:value-of select="$properties/*[@name='output.pdf.fontFamily.oddHeaderFontFamily']/@value"/>
+      </xsl:when>
+      <xsl:otherwise><xsl:value-of select="$headerFooterFontFamily"/></xsl:otherwise>
+    </xsl:choose>
+  </xsl:param>
+  <xsl:param name="oddFooterFontFamily">
+    <xsl:choose>
+      <xsl:when test="$properties/*[@name='output.pdf.fontFamily.oddFooterFontFamily']">
+        <xsl:value-of select="$properties/*[@name='output.pdf.fontFamily.oddFooterFontFamily']/@value"/>
+      </xsl:when>
+      <xsl:otherwise><xsl:value-of select="$headerFooterFontFamily"/></xsl:otherwise>
+    </xsl:choose>
+  </xsl:param>
+  <xsl:param name="documentTitleFontFamily">
+    <xsl:choose>
+      <xsl:when test="$properties/*[@name='output.pdf.fontFamily.documentTitleFontFamily']">
+        <xsl:value-of select="$properties/*[@name='output.pdf.fontFamily.documentTitleFontFamily']/@value"/>
+      </xsl:when>
+      <xsl:otherwise><xsl:value-of select="$sans-serif"/></xsl:otherwise>
+    </xsl:choose>
+  </xsl:param>
+  <xsl:param name="versionFontFamily">
+    <xsl:choose>
+      <xsl:when test="$properties/*[@name='output.pdf.fontFamily.versionFontFamily']">
+        <xsl:value-of select="$properties/*[@name='output.pdf.fontFamily.versionFontFamily']/@value"/>
+      </xsl:when>
+      <xsl:otherwise><xsl:value-of select="$sans-serif"/></xsl:otherwise>
+    </xsl:choose>
+  </xsl:param>
+  <xsl:param name="authorsFontFamily">
+    <xsl:choose>
+      <xsl:when test="$properties/*[@name='output.pdf.fontFamily.authorsFontFamily']">
+        <xsl:value-of select="$properties/*[@name='output.pdf.fontFamily.authorsFontFamily']/@value"/>
+      </xsl:when>
+      <xsl:otherwise><xsl:value-of select="$sans-serif"/></xsl:otherwise>
+    </xsl:choose>
+  </xsl:param>
+  <xsl:param name="TOCTitleFontFamily">
+    <xsl:choose>
+      <xsl:when test="$properties/*[@name='output.pdf.fontFamily.TOCTitleFontFamily']">
+        <xsl:value-of select="$properties/*[@name='output.pdf.fontFamily.TOCTitleFontFamily']/@value"/>
+      </xsl:when>
+      <xsl:otherwise><xsl:value-of select="$sans-serif"/></xsl:otherwise>
+    </xsl:choose>
+  </xsl:param>
+  <!-- helper-commonElements.xsl font-family definitions: -->
+  <xsl:param name="sectionTitleFontFamily">
+    <xsl:choose>
+      <xsl:when test="$properties/*[@name='output.pdf.fontFamily.sectionTitleFontFamily']">
+        <xsl:value-of select="$properties/*[@name='output.pdf.fontFamily.sectionTitleFontFamily']/@value"/>
+      </xsl:when>
+      <xsl:otherwise><xsl:value-of select="$sans-serif"/></xsl:otherwise>
+    </xsl:choose>
+  </xsl:param>
+  <xsl:param name="sourceFontFamily">
+    <xsl:choose>
+      <xsl:when test="$properties/*[@name='output.pdf.fontFamily.sourceFontFamily']">
+        <xsl:value-of select="$properties/*[@name='output.pdf.fontFamily.sourceFontFamily']/@value"/>
+      </xsl:when>
+      <xsl:otherwise><xsl:value-of select="$monospace"/></xsl:otherwise>
+    </xsl:choose>
+  </xsl:param>
+  <xsl:param name="codeFontFamily">
+    <xsl:choose>
+      <xsl:when test="$properties/*[@name='output.pdf.fontFamily.codeFontFamily']">
+        <xsl:value-of select="$properties/*[@name='output.pdf.fontFamily.codeFontFamily']/@value"/>
+      </xsl:when>
+      <xsl:otherwise><xsl:value-of select="$monospace"/></xsl:otherwise>
+    </xsl:choose>
+  </xsl:param>
+  <xsl:param name="warningTitleFontFamily">
+    <xsl:choose>
+      <xsl:when test="$properties/*[@name='output.pdf.fontFamily.warningTitleFontFamily']">
+        <xsl:value-of select="$properties/*[@name='output.pdf.fontFamily.warningTitleFontFamily']/@value"/>
+      </xsl:when>
+      <xsl:otherwise><xsl:value-of select="$sans-serif"/></xsl:otherwise>
+    </xsl:choose>
+  </xsl:param>
+  <xsl:param name="noteTitleFontFamily">
+    <xsl:choose>
+      <xsl:when test="$properties/*[@name='output.pdf.fontFamily.noteTitleFontFamily']">
+        <xsl:value-of select="$properties/*[@name='output.pdf.fontFamily.noteTitleFontFamily']/@value"/>
+      </xsl:when>
+      <xsl:otherwise><xsl:value-of select="$sans-serif"/></xsl:otherwise>
+    </xsl:choose>
+  </xsl:param>
+  <xsl:param name="fixmeTitleFontFamily">
+    <xsl:choose>
+      <xsl:when test="$properties/*[@name='output.pdf.fontFamily.fixmeTitleFontFamily']">
+        <xsl:value-of select="$properties/*[@name='output.pdf.fontFamily.fixmeTitleFontFamily']/@value"/>
+      </xsl:when>
+      <xsl:otherwise><xsl:value-of select="$sans-serif"/></xsl:otherwise>
+    </xsl:choose>
+  </xsl:param>
 <!-- Other external parameters: -->
   <xsl:param
         name="imagesdir"
@@ -115,25 +283,25 @@
 
 <!-- Included stylesheets: -->
   <xsl:include
-        href="helper-pdfoutline.xsl" />
+        href="lm://pdf.transform.helper.pdfoutline" />
   <xsl:include
-        href="footerinfo.xsl" />
+        href="lm://pdf.transform.helper.footerinfo" />
   <xsl:include
         href="lm://pdf.transform.helper.pageBreaks" />
   <xsl:include
-        href="helper-pageNumber.xsl" />
+        href="lm://pdf.transform.helper.pageNumber" />
   <xsl:include
-        href="helper-commonElements.xsl" />
+        href="lm://pdf.transform.helper.commonElements" />
   <xsl:include
-        href="helper-layout.xsl" />
+        href="lm://pdf.transform.helper.layout" />
   <xsl:include
-        href="helper-xmpMetadata.xsl" />
+        href="lm://pdf.transform.helper.xmpMetadata" />
 
   <xsl:template
         match="/">
     <fo:root
             xmlns:fo="http://www.w3.org/1999/XSL/Format"
-            font-family="{$serif}" font-size="12pt">
+            font-family="{$rootFontFamily}" font-size="12pt">
       <fo:layout-master-set>
         <fo:simple-page-master
                     master-name="first-page"
@@ -254,7 +422,7 @@
     
     <fo:static-content
             flow-name="first-footer"
-            font-family="{$sans-serif}">
+            font-family="{$firstFooterFontFamily}">
       <fo:block
                 border-top="0.25pt solid"
                 padding-before="6pt"
@@ -277,7 +445,7 @@
     
     <fo:static-content
             flow-name="even-header"
-            font-family="{$sans-serif}">
+            font-family="{$evenHeaderFontFamily}">
       <fo:block
                 font-size="70%"
                 text-align="end"
@@ -288,7 +456,7 @@
     </fo:static-content>
     <fo:static-content
             flow-name="even-footer"
-            font-family="{$sans-serif}">
+            font-family="{$evenFooterFontFamily}">
       <fo:block
                 border-top="0.25pt solid"
                 padding-before="6pt"
@@ -314,7 +482,7 @@
     
     <fo:static-content
             flow-name="odd-header"
-            font-family="{$sans-serif}">
+            font-family="{$oddHeaderFontFamily}">
       <fo:block
                 font-size="70%"
                 font-style="italic">
@@ -333,7 +501,7 @@
     
     <fo:static-content
             flow-name="odd-footer"
-            font-family="{$sans-serif}">
+            font-family="{$oddFooterFontFamily}">
       <fo:block
                 border-top="0.25pt solid"
                 padding-before="6pt"
@@ -355,7 +523,7 @@
       <fo:block
               padding-before="24pt"
               padding-after="24pt"
-              font-family="{$sans-serif}"
+              font-family="{$documentTitleFontFamily}"
               font-size="24pt"
               font-weight="bold"
               id="{generate-id()}">
@@ -413,7 +581,7 @@
   </xsl:template>
   <xsl:template match="version">
     <fo:block
-            font-family="{$sans-serif}"
+            font-family="{$versionFontFamily}"
             font-weight="bold"
             font-size="smaller">
       <xsl:call-template name="insertPageBreaks"/>
@@ -434,7 +602,7 @@
   <xsl:template match="authors">
     <fo:block
             space-before="2em"
-            font-family="{$sans-serif}"
+            font-family="{$authorsFontFamily}"
             font-weight="bold"
             font-size="smaller">
       <xsl:call-template
@@ -450,8 +618,14 @@
   </xsl:template>
   <xsl:template match="body[count(//section) != 0]">
     <xsl:if test="$disable-toc != 'true' and $toc-max-depth > 0">
-      <fo:block font-family="{$sans-serif}" font-size="12pt" font-weight="bold"
-        space-after="0.5em" space-before="1em" text-align="justify" id="__toc__">
+      <fo:block
+              font-family="{$TOCTitleFontFamily}"
+              font-size="12pt"
+              font-weight="bold"
+              space-after="0.5em"
+              space-before="1em"
+              text-align="justify"
+              id="__toc__">
         <xsl:call-template name="insertPageBreaks"/>
         <!-- insert i18n stuff here -->
         <xsl:text>Table of contents</xsl:text>

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/helper-commonElements.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/helper-commonElements.xsl?rev=691220&r1=691219&r2=691220&view=diff
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/helper-commonElements.xsl
(original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.output.pdf/resources/stylesheets/helper-commonElements.xsl
Tue Sep  2 05:50:20 2008
@@ -31,8 +31,14 @@
     <xsl:variable name="size">
       <xsl:value-of select="12-number($level)"/>
     </xsl:variable>
-    <fo:block font-family="{$sans-serif}" font-size="{$size}pt" font-weight="bold"
-      space-before="12pt" space-after="8pt" margin="0" keep-with-next.within-column="always">
+    <fo:block
+            font-family="{$sectionTitleFontFamily}"
+            font-size="{$size}pt"
+            font-weight="bold"
+            space-before="12pt"
+            space-after="8pt"
+            margin="0"
+            keep-with-next.within-column="always">
       <xsl:call-template name="insertPageBreaks"/>
       <xsl:attribute name="id">
         <xsl:choose>
@@ -116,10 +122,17 @@
   <xsl:template match="source">
     <xsl:variable name="color"
       select="$config/colors/color[@name='code']/@value"/>
-    <fo:block font-family="{$monospace}" font-size="8pt" padding="6pt" margin="0"
-      background-color="{$color}" white-space-collapse="false"
-      linefeed-treatment="preserve" white-space-treatment="preserve"
-      wrap-option="wrap" text-align="start">
+    <fo:block
+            font-family="{$sourceFontFamily}"
+            font-size="8pt"
+            padding="6pt"
+            margin="0"
+            background-color="{$color}"
+            white-space-collapse="false"
+            linefeed-treatment="preserve"
+            white-space-treatment="preserve"
+            wrap-option="wrap"
+            text-align="start">
       <xsl:copy-of select="@id"/>
       <xsl:call-template name="insertPageBreaks"/>
       <xsl:apply-templates/>
@@ -240,7 +253,7 @@
     </fo:inline>
   </xsl:template>
   <xsl:template match="code">
-    <fo:inline font-family="{$monospace}">
+    <fo:inline font-family="{$codeFontFamily}">
       <xsl:copy-of select="@id"/>
       <xsl:apply-templates/>
     </fo:inline>
@@ -248,11 +261,23 @@
   <xsl:template match="warning">
     <xsl:variable name="color"
       select="$config/colors/color[@name='warning']/@value"/>
-    <fo:block margin-left="0.25in" margin-right="0.25in" padding-left="3pt"
-      padding-top="2pt" padding-bottom="1pt" font-size="9pt"
-      font-family="{$sans-serif}" space-before="10pt" border-before-style="solid"
-      border-start-style="solid" border-end-style="solid" border-color="{$color}"
-      background-color="{$color}" color="#ffffff" keep-with-previous.within-column="always"
keep-with-next.within-column="always">
+    <fo:block
+            margin-left="0.25in"
+            margin-right="0.25in"
+            padding-left="3pt"
+            padding-top="2pt"
+            padding-bottom="1pt"
+            font-size="9pt"
+            font-family="{$warningTitleFontFamily}"
+            space-before="10pt"
+            border-before-style="solid"
+            border-start-style="solid"
+            border-end-style="solid"
+            border-color="{$color}"
+            background-color="{$color}"
+            color="#ffffff"
+            keep-with-previous.within-column="always"
+            keep-with-next.within-column="always">
       <xsl:copy-of select="@id"/>
       <xsl:call-template name="insertPageBreaks"/>
       <xsl:choose>
@@ -274,11 +299,23 @@
   <xsl:template match="note">
     <xsl:variable name="color"
       select="$config/colors/color[@name='note']/@value"/>
-    <fo:block margin-left="0.25in" margin-right="0.25in" padding-left="3pt"
-      font-size="9pt" padding-top="2pt" padding-bottom="1pt" color="#ffffff"
-      font-family="{$sans-serif}" space-before="10pt" border-before-style="solid"
-      border-start-style="solid" border-end-style="solid" border-color="{$color}"
-      background-color="{$color}" keep-with-previous.within-column="always" keep-with-next.within-column="always">
+    <fo:block
+            margin-left="0.25in"
+            margin-right="0.25in"
+            padding-left="3pt"
+            padding-top="2pt"
+            padding-bottom="1pt"
+            font-size="9pt"
+            font-family="{$noteTitleFontFamily}"
+            space-before="10pt"
+            border-before-style="solid"
+            border-start-style="solid"
+            border-end-style="solid"
+            border-color="{$color}"
+            background-color="{$color}"
+            color="#ffffff"
+            keep-with-previous.within-column="always"
+            keep-with-next.within-column="always">
       <xsl:copy-of select="@id"/>
       <xsl:call-template name="insertPageBreaks"/>
       <xsl:choose>
@@ -301,11 +338,23 @@
   <xsl:template match="fixme">
     <xsl:variable name="color"
       select="$config/colors/color[@name='fixme']/@value"/>
-    <fo:block margin-left="0.25in" margin-right="0.25in" padding-left="3pt"
-      font-size="9pt" padding-top="2pt" padding-bottom="1pt" color="#FFFFFF"
-      font-family="{$sans-serif}" space-before="10pt" border-before-style="solid"
-      border-start-style="solid" border-end-style="solid" border-color="{$color}"
-      background-color="{$color}" keep-with-previous.within-column="always" keep-with-next.within-column="always">
+    <fo:block
+            margin-left="0.25in"
+            margin-right="0.25in"
+            padding-left="3pt"
+            padding-top="2pt"
+            padding-bottom="1pt"
+            font-size="9pt"
+            font-family="{$fixmeTitleFontFamily}"
+            space-before="10pt"
+            border-before-style="solid"
+            border-start-style="solid"
+            border-end-style="solid"
+            border-color="{$color}"
+            background-color="{$color}"
+            color="#FFFFFF"
+            keep-with-previous.within-column="always"
+            keep-with-next.within-column="always">
       <xsl:copy-of select="@id"/>
       <xsl:call-template name="insertPageBreaks"/>
       <!-- insert i18n stuff here --> FIXME (



Mime
View raw message