Merged revisions 708192,708838,708848,708851 via svnmerge from

https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk

........
  r708192 | cbowditch | 2008-10-27 14:12:36 +0000 (Mon, 27 Oct 2008) | 1 line

  added FAQ for Font Cache Warning
........
  r708838 | jeremias | 2008-10-29 08:56:00 +0000 (Wed, 29 Oct 2008) | 1 line

  Test case for WMF images. Useful also for visual testing.
........
  r708848 | jeremias | 2008-10-29 09:32:07 +0000 (Wed, 29 Oct 2008) | 1 line

  Adding variant with fox:conversion-mode="bitmap" for visual testing.
........
  r708851 | jeremias | 2008-10-29 09:40:44 +0000 (Wed, 29 Oct 2008) | 1 line

  Added a variant with fox:conversion-mode="bitmap" for visual testing.
........

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_AFPGOCAResources@708875 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/documentation/content/xdocs/faq.xml b/src/documentation/content/xdocs/faq.xml
index ac2693d8b64abf8645158ee9bf57250a20263fe1..f05f0712634b6c3478edaf2de8612220c2eecfc0 100644 (file)
--- a/src/documentation/content/xdocs/faq.xml
+++ b/src/documentation/content/xdocs/faq.xml
@@ -426,6 +426,28 @@ public class DefaultErrorListener implements ErrorListener {
 }]]></source>
       </answer>
     </faq>
+    <faq>
+      <question>The following message appears after recently upgrading FOP:
+        "I/O exception while reading font cache (org.apache.fop.fonts.EmbedFontInfo;
+        local class incompatible: stream classdesc serialVersionUID =
+        -9075848379822693399, local class serialVersionUID = 8755432068669997367).
+        Discarding font cache file."</question>
+      <answer>
+        <p>
+          This message is a warning that FOP failed to read from the Font cache. 
+          Which means any Font auto detection or Font directories will be re-scanned. 
+          So this failure doesn't break anything.
+        </p>
+        <p>
+           To avoid the warning you can simply delete the
+           old Font Cache file, which according to [1] lives in ${base}\conf\font.cache.
+           Or you can disable Font Caching altogether using the option "use-cache"
+        </p>
+        <p>
+          [1] http://xmlgraphics.apache.org/fop/0.94/configuration.html#general-elements
+        </p>
+      </answer>
+    </faq>
   </part>
   <part id="part-output">
     <title>Problems with FOP output</title>

diff --git a/test/layoutengine/standard-testcases/external-graphic_svg.xml b/test/layoutengine/standard-testcases/external-graphic_svg.xml
index 80c3e5afc382718d6e84e9257495938056f622cf..8ec53ea3d62e8fc68607221841e5ef32461d8336 100644 (file)
--- a/test/layoutengine/standard-testcases/external-graphic_svg.xml
+++ b/test/layoutengine/standard-testcases/external-graphic_svg.xml
@@ -23,7 +23,8 @@
     </p>
   </info>
   <fo>
-    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"
+          xmlns:fox="http://xmlgraphics.apache.org/fop/extensions">
       <fo:layout-master-set>
         <fo:simple-page-master master-name="normal" page-width="10in" page-height="15in">
           <fo:region-body/>
@@ -47,6 +48,11 @@
           <fo:block text-align="left">
             <fo:external-graphic src="../../resources/images/img-w-size.svg"/>EOG
           </fo:block>
+          <fo:block text-align="left">SVG external-graphic with an intrinsic size and fox:conversion-mode="bitmap"</fo:block>
+          <fo:block text-align="left">
+            <fo:external-graphic src="../../resources/images/img-w-size.svg"
+              fox:conversion-mode="bitmap"/>EOG
+          </fo:block>
           <fo:block>EOF</fo:block>
         </fo:flow>
       </fo:page-sequence>

diff --git a/test/layoutengine/standard-testcases/external-graphic_wmf.xml b/test/layoutengine/standard-testcases/external-graphic_wmf.xml
new file mode 100644 (file)
index 0000000..f95a16b
--- /dev/null
+++ b/test/layoutengine/standard-testcases/external-graphic_wmf.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- $Id$ -->
+<testcase>
+  <info>
+    <p>
+      This test checks external-graphics and in particular WMF images.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
+          xmlns:fox="http://xmlgraphics.apache.org/fop/extensions">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block>WMF external-graphic</fo:block>
+          <fo:block>
+            <fo:external-graphic src="../../resources/images/testChart.wmf" content-width="25%"/>EOG
+          </fo:block>
+          <fo:block>
+            <!-- the same image but with conversion-mode="bitmap" -->
+            <fo:external-graphic src="../../resources/images/testChart.wmf" content-width="25%"
+              fox:conversion-mode="bitmap"/>EOG
+          </fo:block>
+          <fo:block>EOF</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="198000" tolerance="10" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
+    <eval expected="198000" tolerance="10" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
+    <eval expected="153000" tolerance="10" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
+    <eval expected="153000" tolerance="10" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
+
+    <eval expected="198000" tolerance="10" xpath="//flow/block[3]/lineArea/viewport/@ipda"/>
+    <eval expected="153000" tolerance="10" xpath="//flow/block[3]/lineArea/viewport/@bpda"/>
+  </checks>
+</testcase>