poky-doc-tools: Update to work with fop >= 0.95

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

handbook/poky-doc-tools/README

@@ -1,7 +1,7 @@
 poky-doc-tools
 ==============
 
-Simple tools to wrap fop to create oh branded PDF's from docbook sources.
+Simple tools to wrap fop to create Poky branded PDF's from docbook sources.
 (based on OH doc tools)
 
 Dependencies
@@ -9,15 +9,10 @@ Dependencies
 
 Sun Java, make sure the java in your path is the *sun* java.
 
-xlstproc, nwalsh style sheets.
+xlstproc, nwalsh style sheets, fop
 
 FOP, installed - see http://www.sagehill.net/docbookxsl/InstallingAnFO.html.
-Also a 'fop' binary, eg I have;
+Updated to work with (fop > 0.95)
-
-% cat ~/bin/fop
-#!/bin/sh
-java org.apache.fop.apps.Fop "$@"
-
 
 
 

handbook/poky-doc-tools/common/fop-config.xml.in

@@ -1,33 +1,58 @@
-<configuration>
+<fop version="1.0">
-  <entry>
-  <!--
-   Set the baseDir so common/openedhand.svg references in plans still
-   work ok. Note, relative file references to current dir should still work.
-   -->	
-    <key>baseDir</key>
-    <value>@datadir@</value>
-  </entry>
-  <fonts>
-    <font  metrics-file="@datadir@/common/VeraMono.xml"
-           kerning="yes" 
-           embed-file="@datadir@/common/VeraMono.ttf">
-      <font-triplet name="veramono" style="normal" weight="normal"/>
-    </font>
 
-    <font  metrics-file="@datadir@/common/VeraMoBd.xml"
+  <!-- Strict user configuration -->
-           kerning="yes" 
+  <strict-configuration>true</strict-configuration>
-           embed-file="@datadir@/common/VeraMoBd.ttf">
-      <font-triplet name="veramono" style="normal" weight="bold"/>
-    </font>
 
-    <font  metrics-file="@datadir@/common/Vera.xml"
+  <!-- Strict FO validation -->
-           kerning="yes" 
+  <strict-validation>true</strict-validation>
-           embed-file="@datadir@/common/Vera.ttf">
+
-     <font-triplet name="verasans" style="normal" weight="normal"/>
+   <!--
-     <font-triplet name="verasans" style="normal" weight="bold"/>
+    Set the baseDir so common/openedhand.svg references in plans still
-     <font-triplet name="verasans" style="italic" weight="normal"/>
+    work ok. Note, relative file references to current dir should still work.
-     <font-triplet name="verasans" style="italic" weight="bold"/>
+    -->	
-    </font>
+  <base>@datadir@</base>
+  <font-base>@datadir@/common</font-base>
+ 
+  <!-- Source resolution in dpi (dots/pixels per inch) for determining the
+       size of pixels in SVG and bitmap images, default: 72dpi -->
+  <!-- <source-resolution>72</source-resolution> -->
+  <!-- Target resolution in dpi (dots/pixels per inch) for specifying the
+       target resolution for generated bitmaps, default: 72dpi -->
+  <!-- <target-resolution>72</target-resolution> -->
+ 
+  <!-- default page-height and page-width, in case
+       value is specified as auto -->
+  <default-page-settings height="11in" width="8.26in"/> 
+ 
+  <!-- <use-cache>false</use-cache> -->
+ 
+  <renderers>
+    <renderer mime="application/pdf">
+      <fonts>
+        <font  metrics-file="VeraMono.xml"
+               kerning="yes" 
+               embed-url="VeraMono.ttf">
+          <font-triplet name="veramono" style="normal" weight="normal"/>
+        </font>
+
+        <font  metrics-file="VeraMoBd.xml"
+               kerning="yes" 
+               embed-url="VeraMoBd.ttf">
+          <font-triplet name="veramono" style="normal" weight="bold"/>
+        </font>
+
+        <font  metrics-file="Vera.xml"
+               kerning="yes" 
+               embed-url="Vera.ttf">
+          <font-triplet name="verasans" style="normal" weight="normal"/>
+          <font-triplet name="verasans" style="normal" weight="bold"/>
+          <font-triplet name="verasans" style="italic" weight="normal"/>
+          <font-triplet name="verasans" style="italic" weight="bold"/>
+        </font>
+        
+        <auto-detect/>
+      </fonts>
+    </renderer>
+  </renderers>
+</fop>
 
-  </fonts>
-</configuration>

handbook/poky-doc-tools/common/poky-db-pdf.xsl

@@ -54,7 +54,7 @@
  
   <!-- general settings -->
 
-  <xsl:param name="fop.extensions" select="1"></xsl:param>
+  <xsl:param name="fop1.extensions" select="1"></xsl:param>
   <xsl:param name="paper.type" select="'A4'"></xsl:param>
   <xsl:param name="section.autolabel" select="1"></xsl:param>
   <xsl:param name="body.font.family" select="'verasans'"></xsl:param>