Return-Path: 
 <fop-commits-return-9598-apmail-xmlgraphics-fop-commits-archive=xmlgraphics.apache.org@xmlgraphics.apache.org>
Delivered-To: apmail-xmlgraphics-fop-commits-archive@www.apache.org
Received: (qmail 338 invoked from network); 14 Feb 2008 22:03:22 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 14 Feb 2008 22:03:22 -0000
Received: (qmail 91630 invoked by uid 500); 14 Feb 2008 22:03:08 -0000
Delivered-To: apmail-xmlgraphics-fop-commits-archive@xmlgraphics.apache.org
Received: (qmail 91596 invoked by uid 500); 14 Feb 2008 22:03:08 -0000
Mailing-List: contact fop-commits-help@xmlgraphics.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:fop-commits-help@xmlgraphics.apache.org>
List-Unsubscribe: <mailto:fop-commits-unsubscribe@xmlgraphics.apache.org>
List-Post: <mailto:fop-commits@xmlgraphics.apache.org>
List-Id: <fop-commits.xmlgraphics.apache.org>
Reply-To: fop-dev@xmlgraphics.apache.org
Delivered-To: mailing list fop-commits@xmlgraphics.apache.org
Received: (qmail 91444 invoked by uid 99); 14 Feb 2008 22:03:07 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 Feb 2008 14:03:07 -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; Thu, 14 Feb 2008 22:02:35 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 941181A987E; Thu, 14 Feb 2008 14:01:50 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r627882 [26/41] - in
 /xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking: ./
 examples/embedding/ examples/embedding/java/embedding/
 examples/embedding/java/embedding/intermediate/ examples/embedding/xml/xml/
 examples/fo/ examples/...
Date: Thu, 14 Feb 2008 21:57:53 -0000
To: fop-commits@xmlgraphics.apache.org
From: spepping@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080214220150.941181A987E@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/color_1.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_basic.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_bmp.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_bmp.xml?rev=627882&r1=627881&r2=627882&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_bmp.xml (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_bmp.xml Thu Feb 14 13:55:44 2008
@@ -1,57 +1,57 @@
-<?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.
-    </p>
-  </info>
-  <fo>
-    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
-      <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" white-space-collapse="true">
-        <fo:flow flow-name="xsl-region-body">
-          <fo:block>BMP external-graphic 300dpi</fo:block>
-          <fo:block>
-            <fo:external-graphic src="../../resources/images/bgimg300dpi.bmp"/>EOG
-          </fo:block>
-          <fo:block>BMP external-graphic 72dpi</fo:block>
-          <fo:block>
-            <fo:external-graphic src="../../resources/images/bgimg72dpi.bmp"/>EOG
-          </fo:block>
-          <fo:block>EOF</fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-    </fo:root>
-  </fo>
-  <checks>
-    <eval expected="46091" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
-    <eval expected="46091" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
-    <eval expected="46091" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
-    <eval expected="46091" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
-    <eval expected="192043" xpath="//flow/block[4]/lineArea/viewport/@ipd"/>
-    <eval expected="192043" xpath="//flow/block[4]/lineArea/viewport/@ipda"/>
-    <eval expected="192043" xpath="//flow/block[4]/lineArea/viewport/@bpd"/>
-    <eval expected="192043" xpath="//flow/block[4]/lineArea/viewport/@bpda"/>
-  </checks>
-</testcase>
+<?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.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+      <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" white-space-collapse="true">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block>BMP external-graphic 300dpi</fo:block>
+          <fo:block>
+            <fo:external-graphic src="../../resources/images/bgimg300dpi.bmp"/>EOG
+          </fo:block>
+          <fo:block>BMP external-graphic 72dpi</fo:block>
+          <fo:block>
+            <fo:external-graphic src="../../resources/images/bgimg72dpi.bmp"/>EOG
+          </fo:block>
+          <fo:block>EOF</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="46091" tolerance="5" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
+    <eval expected="46091" tolerance="5" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
+    <eval expected="46091" tolerance="5" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
+    <eval expected="46091" tolerance="5" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
+    <eval expected="192043" tolerance="5" xpath="//flow/block[4]/lineArea/viewport/@ipd"/>
+    <eval expected="192043" tolerance="5" xpath="//flow/block[4]/lineArea/viewport/@ipda"/>
+    <eval expected="192043" tolerance="5" xpath="//flow/block[4]/lineArea/viewport/@bpd"/>
+    <eval expected="192043" tolerance="5" xpath="//flow/block[4]/lineArea/viewport/@bpda"/>
+  </checks>
+</testcase>

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_bmp.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_bmp.xml
------------------------------------------------------------------------------
    svn:keywords = Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_border_padding.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_breaking.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_bug37815.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_content-height_content-width.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_content-height_content-width.xml?rev=627882&r1=627881&r2=627882&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_content-height_content-width.xml (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_content-height_content-width.xml Thu Feb 14 13:55:44 2008
@@ -1,50 +1,50 @@
-<?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 with relative content-height
-    </p>
-  </info>
-  <fo>
-    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
-      <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" white-space-collapse="true">
-        <fo:flow flow-name="xsl-region-body">
-          <fo:block>plain external-graphic</fo:block>
-          <fo:block>
-            <fo:external-graphic src="../../resources/images/bgimg300dpi.jpg" content-height="200%" content-width="200%" />EOG
-          </fo:block>
-          <fo:block>EOF</fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-    </fo:root>
-  </fo>
-  <checks>
-    <eval expected="360000" xpath="//flow/block[2]/@ipd"/>
-    <eval expected="92160" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
-    <eval expected="92160" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
-    <eval expected="92160" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
-    <eval expected="92160" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
-  </checks>
-</testcase>
+<?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 with relative content-height
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+      <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" white-space-collapse="true">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block>plain external-graphic</fo:block>
+          <fo:block>
+            <fo:external-graphic src="../../resources/images/bgimg300dpi.jpg" content-height="200%" content-width="200%" />EOG
+          </fo:block>
+          <fo:block>EOF</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="360000" xpath="//flow/block[2]/@ipd"/>
+    <eval expected="92160" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
+    <eval expected="92160" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
+    <eval expected="92160" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
+    <eval expected="92160" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
+  </checks>
+</testcase>

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_content-height_content-width.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_content-height_content-width.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_content-height_content-width_2.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_display-align.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_emf.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_emf.xml?rev=627882&r1=627881&r2=627882&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_emf.xml (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_emf.xml Thu Feb 14 13:55:44 2008
@@ -41,9 +41,9 @@
     </fo:root>
   </fo>
   <checks>
-    <eval expected="56692" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
-    <eval expected="56692" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
-    <eval expected="56692" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
-    <eval expected="56692" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
+    <eval expected="56692" tolerance="40" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
+    <eval expected="56692" tolerance="40" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
+    <eval expected="56692" tolerance="40" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
+    <eval expected="56692" tolerance="40" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
   </checks>
 </testcase>

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_emf.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_eps.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_eps.xml?rev=627882&r1=627881&r2=627882&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_eps.xml (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_eps.xml Thu Feb 14 13:55:44 2008
@@ -1,49 +1,49 @@
-<?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.
-    </p>
-  </info>
-  <fo>
-    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
-      <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" white-space-collapse="true">
-        <fo:flow flow-name="xsl-region-body">
-          <fo:block>EPS external-graphic</fo:block>
-          <fo:block>
-            <fo:external-graphic src="../../resources/images/barcode.eps"/>EOG
-          </fo:block>
-          <fo:block>EOF</fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-    </fo:root>
-  </fo>
-  <checks>
-    <eval expected="136000" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
-    <eval expected="136000" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
-    <eval expected="43000" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
-    <eval expected="43000" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
-  </checks>
-</testcase>
+<?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.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+      <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" white-space-collapse="true">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block>EPS external-graphic</fo:block>
+          <fo:block>
+            <fo:external-graphic src="../../resources/images/barcode.eps"/>EOG
+          </fo:block>
+          <fo:block>EOF</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="135655" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
+    <eval expected="135655" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
+    <eval expected="42525" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
+    <eval expected="42525" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
+  </checks>
+</testcase>

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_eps.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_eps.xml
------------------------------------------------------------------------------
    svn:keywords = Revision Id

Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_gif.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_gif.xml?rev=627882&r1=627881&r2=627882&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_gif.xml (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_gif.xml Thu Feb 14 13:55:44 2008
@@ -1,49 +1,49 @@
-<?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.
-    </p>
-  </info>
-  <fo>
-    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
-      <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" white-space-collapse="true">
-        <fo:flow flow-name="xsl-region-body">
-          <fo:block>GIF external-graphic</fo:block>
-          <fo:block>
-            <fo:external-graphic src="../../resources/images/bgimg72dpi.gif"/>EOG
-          </fo:block>
-          <fo:block>EOF</fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-    </fo:root>
-  </fo>
-  <checks>
-    <eval expected="192000" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
-    <eval expected="192000" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
-    <eval expected="192000" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
-    <eval expected="192000" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
-  </checks>
-</testcase>
+<?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.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+      <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" white-space-collapse="true">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block>GIF external-graphic</fo:block>
+          <fo:block>
+            <fo:external-graphic src="../../resources/images/bgimg72dpi.gif"/>EOG
+          </fo:block>
+          <fo:block>EOF</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="192000" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
+    <eval expected="192000" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
+    <eval expected="192000" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
+    <eval expected="192000" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
+  </checks>
+</testcase>

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_gif.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_gif.xml
------------------------------------------------------------------------------
    svn:keywords = Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_invalid.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_jpeg.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_jpeg.xml?rev=627882&r1=627881&r2=627882&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_jpeg.xml (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_jpeg.xml Thu Feb 14 13:55:44 2008
@@ -1,57 +1,57 @@
-<?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.
-    </p>
-  </info>
-  <fo>
-    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
-      <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" white-space-collapse="true">
-        <fo:flow flow-name="xsl-region-body">
-          <fo:block>JPEG external-graphic 300dpi</fo:block>
-          <fo:block>
-            <fo:external-graphic src="../../resources/images/bgimg300dpi.jpg"/>EOG
-          </fo:block>
-          <fo:block>JPEG external-graphic 72dpi</fo:block>
-          <fo:block>
-            <fo:external-graphic src="../../resources/images/bgimg72dpi.jpg"/>EOG
-          </fo:block>
-          <fo:block>EOF</fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-    </fo:root>
-  </fo>
-  <checks>
-    <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
-    <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
-    <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
-    <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
-    <eval expected="192000" xpath="//flow/block[4]/lineArea/viewport/@ipd"/>
-    <eval expected="192000" xpath="//flow/block[4]/lineArea/viewport/@ipda"/>
-    <eval expected="192000" xpath="//flow/block[4]/lineArea/viewport/@bpd"/>
-    <eval expected="192000" xpath="//flow/block[4]/lineArea/viewport/@bpda"/>
-  </checks>
-</testcase>
+<?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.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+      <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" white-space-collapse="true">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block>JPEG external-graphic 300dpi</fo:block>
+          <fo:block>
+            <fo:external-graphic src="../../resources/images/bgimg300dpi.jpg"/>EOG
+          </fo:block>
+          <fo:block>JPEG external-graphic 72dpi</fo:block>
+          <fo:block>
+            <fo:external-graphic src="../../resources/images/bgimg72dpi.jpg"/>EOG
+          </fo:block>
+          <fo:block>EOF</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
+    <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
+    <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
+    <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
+    <eval expected="192000" xpath="//flow/block[4]/lineArea/viewport/@ipd"/>
+    <eval expected="192000" xpath="//flow/block[4]/lineArea/viewport/@ipda"/>
+    <eval expected="192000" xpath="//flow/block[4]/lineArea/viewport/@bpd"/>
+    <eval expected="192000" xpath="//flow/block[4]/lineArea/viewport/@bpda"/>
+  </checks>
+</testcase>

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_jpeg.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_jpeg.xml
------------------------------------------------------------------------------
    svn:keywords = Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_overflow_hidden.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_oversized.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_oversized.xml?rev=627882&r1=627881&r2=627882&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_oversized.xml (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_oversized.xml Thu Feb 14 13:55:44 2008
@@ -1,53 +1,53 @@
-<?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. An oversized image is to be squeezed into page using min/opt/max values.
-    </p>
-  </info>
-  <fo>
-    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
-      <fo:layout-master-set>
-        <fo:simple-page-master master-name="normal" page-width="21cm" page-height="29.7cm" margin="2cm">
-          <fo:region-body background-color="yellow"/>
-        </fo:simple-page-master>
-      </fo:layout-master-set>
-      <fo:page-sequence master-reference="normal" white-space-collapse="true">
-        <fo:flow flow-name="xsl-region-body">
-          <fo:block font-size="8pt">This first block is only to force an infinite loop if the image is not scaled down.</fo:block>
-          <!-- TODO If you remove the above block, the image is placed on the page although it's too big. No warnings. -->
-          <fo:block>
-            <fo:external-graphic src="../../resources/images/big-image.png" 
-                inline-progression-dimension.maximum="100%" block-progression-dimension.maximum="100%"
-                content-width="scale-to-fit" content-height="scale-to-fit" overflow="hidden"/>
-          </fo:block>
-          <fo:block>EOF</fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-    </fo:root>
-  </fo>
-  <checks>
-    <eval expected="0 0 595275 841889" xpath="//pageViewport/@bounds"/>
-    <eval expected="481891" xpath="//regionBody/@ipda"/>
-    <eval expected="728505" xpath="//regionBody/@bpda"/>
-    <eval expected="481891" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
-    <eval expected="728505" xpath="//flow/block[2]/lineArea/viewport/@bpda + //flow/block[1]/@bpda"/>
-  </checks>
-</testcase>
+<?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. An oversized image is to be squeezed into page using min/opt/max values.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="normal" page-width="21cm" page-height="29.7cm" margin="2cm">
+          <fo:region-body background-color="yellow"/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal" white-space-collapse="true">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block font-size="8pt">This first block is only to force an infinite loop if the image is not scaled down.</fo:block>
+          <!-- TODO If you remove the above block, the image is placed on the page although it's too big. No warnings. -->
+          <fo:block>
+            <fo:external-graphic src="../../resources/images/big-image.png" 
+                inline-progression-dimension.maximum="100%" block-progression-dimension.maximum="100%"
+                content-width="scale-to-fit" content-height="scale-to-fit" overflow="hidden"/>
+          </fo:block>
+          <fo:block>EOF</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="0 0 595275 841889" xpath="//pageViewport/@bounds"/>
+    <eval expected="481891" xpath="//regionBody/@ipda"/>
+    <eval expected="728505" xpath="//regionBody/@bpda"/>
+    <eval expected="481891" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
+    <eval expected="728505" xpath="//flow/block[2]/lineArea/viewport/@bpda + //flow/block[1]/@bpda"/>
+  </checks>
+</testcase>

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_oversized.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_oversized.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_png.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_png.xml?rev=627882&r1=627881&r2=627882&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_png.xml (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_png.xml Thu Feb 14 13:55:44 2008
@@ -1,58 +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.
-    </p>
-  </info>
-  <fo>
-    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
-      <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" white-space-collapse="true">
-        <fo:flow flow-name="xsl-region-body">
-          <fo:block>PNG external-graphic 300dpi</fo:block>
-          <fo:block>
-            <fo:external-graphic src="../../resources/images/bgimg300dpi.png"/>EOG
-          </fo:block>
-          <fo:block>PNG external-graphic 72dpi</fo:block>
-          <fo:block>
-            <fo:external-graphic src="../../resources/images/bgimg72dpi.png"/>EOG
-          </fo:block>
-          <fo:block>EOF</fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-    </fo:root>
-  </fo>
-  <checks>
-    <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
-    <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
-    <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
-    <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
-    <!-- Due to unit computations there is a little difference to the expected 192000 -->
-    <eval expected="191975" xpath="//flow/block[4]/lineArea/viewport/@ipd"/>
-    <eval expected="191975" xpath="//flow/block[4]/lineArea/viewport/@ipda"/>
-    <eval expected="191975" xpath="//flow/block[4]/lineArea/viewport/@bpd"/>
-    <eval expected="191975" xpath="//flow/block[4]/lineArea/viewport/@bpda"/>
-  </checks>
-</testcase>
+<?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.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+      <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" white-space-collapse="true">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block>PNG external-graphic 300dpi</fo:block>
+          <fo:block>
+            <fo:external-graphic src="../../resources/images/bgimg300dpi.png"/>EOG
+          </fo:block>
+          <fo:block>PNG external-graphic 72dpi</fo:block>
+          <fo:block>
+            <fo:external-graphic src="../../resources/images/bgimg72dpi.png"/>EOG
+          </fo:block>
+          <fo:block>EOF</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="46080" tolerance="5" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
+    <eval expected="46080" tolerance="5" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
+    <eval expected="46080" tolerance="5" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
+    <eval expected="46080" tolerance="5" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
+    <!-- Due to unit computations there is a little difference to the expected 192000 -->
+    <eval expected="191975" tolerance="5" xpath="//flow/block[4]/lineArea/viewport/@ipd"/>
+    <eval expected="191975" tolerance="5" xpath="//flow/block[4]/lineArea/viewport/@ipda"/>
+    <eval expected="191975" tolerance="5" xpath="//flow/block[4]/lineArea/viewport/@bpd"/>
+    <eval expected="191975" tolerance="5" xpath="//flow/block[4]/lineArea/viewport/@bpda"/>
+  </checks>
+</testcase>

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_png.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_png.xml
------------------------------------------------------------------------------
    svn:keywords = Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_rfc2397.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_src_uri.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_src_uri.xml?rev=627882&r1=627881&r2=627882&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_src_uri.xml (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_src_uri.xml Thu Feb 14 13:55:44 2008
@@ -1,83 +1,83 @@
-<?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 URI references to external-graphics.
-    </p>
-  </info>
-  <fo>
-    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
-      <fo:layout-master-set>
-        <fo:simple-page-master master-name="normal" page-width="210mm" page-height="297mm">
-          <fo:region-body/>
-        </fo:simple-page-master>
-      </fo:layout-master-set>
-      <fo:page-sequence master-reference="normal" white-space-collapse="true">
-        <fo:flow flow-name="xsl-region-body">
-          <fo:block>plain external-graphic (relative URI)</fo:block>
-          <fo:block>
-            <fo:external-graphic src="../../resources/images/bgimg300dpi.jpg"/>EOG
-          </fo:block>
-          <fo:block>plain external-graphic (relative URI with scheme)</fo:block>
-          <fo:block>
-            <fo:external-graphic src="file:../../resources/images/bgimg300dpi.jpg"/>EOG
-          </fo:block>
-          <!-- Commented out until portable solution found
-          <fo:block>plain external-graphic (absolute URI)</fo:block>
-          <fo:block>
-            <fo:external-graphic src="/home/mm/fop-trunk/test/resources/images/bgimg300dpi.jpg"/>EOG
-          </fo:block>
-          <fo:block>plain external-graphic (absolute URI with scheme)</fo:block>
-          <fo:block>
-            <fo:external-graphic src="file:/home/mm/fop-trunk/test/resources/images/bgimg300dpi.jpg"/>EOG
-          </fo:block>
-          -->
-          <fo:block>plain external-graphic (relative URI using url(...) function)</fo:block>
-          <fo:block>
-            <fo:external-graphic src="url(../../resources/images/bgimg300dpi.jpg)"/>EOG
-          </fo:block>
-          <fo:block>plain external-graphic (absolute HTTP URI)</fo:block>
-          <fo:block>
-            <fo:external-graphic src="http://xml.apache.org/fop/images/logo.jpg"/>EOG
-          </fo:block>
-          <fo:block>EOF</fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-    </fo:root>
-  </fo>
-  <checks>
-    <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
-    <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
-    <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
-    <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
-    <eval expected="46080" xpath="//flow/block[4]/lineArea/viewport/@ipd"/>
-    <eval expected="46080" xpath="//flow/block[4]/lineArea/viewport/@ipda"/>
-    <eval expected="46080" xpath="//flow/block[4]/lineArea/viewport/@bpd"/>
-    <eval expected="46080" xpath="//flow/block[4]/lineArea/viewport/@bpda"/>
-    <eval expected="46080" xpath="//flow/block[6]/lineArea/viewport/@ipd"/>
-    <eval expected="46080" xpath="//flow/block[6]/lineArea/viewport/@ipda"/>
-    <eval expected="46080" xpath="//flow/block[6]/lineArea/viewport/@bpd"/>
-    <eval expected="46080" xpath="//flow/block[6]/lineArea/viewport/@bpda"/>
-    <eval expected="120000" xpath="//flow/block[8]/lineArea/viewport/@ipd"/>
-    <eval expected="120000" xpath="//flow/block[8]/lineArea/viewport/@ipda"/>
-    <eval expected="65000" xpath="//flow/block[8]/lineArea/viewport/@bpd"/>
-    <eval expected="65000" xpath="//flow/block[8]/lineArea/viewport/@bpda"/>
-  </checks>
-</testcase>
+<?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 URI references to external-graphics.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="normal" page-width="210mm" page-height="297mm">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal" white-space-collapse="true">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block>plain external-graphic (relative URI)</fo:block>
+          <fo:block>
+            <fo:external-graphic src="../../resources/images/bgimg300dpi.jpg"/>EOG
+          </fo:block>
+          <fo:block>plain external-graphic (relative URI with scheme)</fo:block>
+          <fo:block>
+            <fo:external-graphic src="file:../../resources/images/bgimg300dpi.jpg"/>EOG
+          </fo:block>
+          <!-- Commented out until portable solution found
+          <fo:block>plain external-graphic (absolute URI)</fo:block>
+          <fo:block>
+            <fo:external-graphic src="/home/mm/fop-trunk/test/resources/images/bgimg300dpi.jpg"/>EOG
+          </fo:block>
+          <fo:block>plain external-graphic (absolute URI with scheme)</fo:block>
+          <fo:block>
+            <fo:external-graphic src="file:/home/mm/fop-trunk/test/resources/images/bgimg300dpi.jpg"/>EOG
+          </fo:block>
+          -->
+          <fo:block>plain external-graphic (relative URI using url(...) function)</fo:block>
+          <fo:block>
+            <fo:external-graphic src="url(../../resources/images/bgimg300dpi.jpg)"/>EOG
+          </fo:block>
+          <fo:block>plain external-graphic (absolute HTTP URI)</fo:block>
+          <fo:block>
+            <fo:external-graphic src="http://xml.apache.org/fop/images/logo.jpg"/>EOG
+          </fo:block>
+          <fo:block>EOF</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
+    <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
+    <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
+    <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
+    <eval expected="46080" xpath="//flow/block[4]/lineArea/viewport/@ipd"/>
+    <eval expected="46080" xpath="//flow/block[4]/lineArea/viewport/@ipda"/>
+    <eval expected="46080" xpath="//flow/block[4]/lineArea/viewport/@bpd"/>
+    <eval expected="46080" xpath="//flow/block[4]/lineArea/viewport/@bpda"/>
+    <eval expected="46080" xpath="//flow/block[6]/lineArea/viewport/@ipd"/>
+    <eval expected="46080" xpath="//flow/block[6]/lineArea/viewport/@ipda"/>
+    <eval expected="46080" xpath="//flow/block[6]/lineArea/viewport/@bpd"/>
+    <eval expected="46080" xpath="//flow/block[6]/lineArea/viewport/@bpda"/>
+    <eval expected="120000" xpath="//flow/block[8]/lineArea/viewport/@ipd"/>
+    <eval expected="120000" xpath="//flow/block[8]/lineArea/viewport/@ipda"/>
+    <eval expected="65000" xpath="//flow/block[8]/lineArea/viewport/@bpd"/>
+    <eval expected="65000" xpath="//flow/block[8]/lineArea/viewport/@bpda"/>
+  </checks>
+</testcase>

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_src_uri.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_src_uri.xml
------------------------------------------------------------------------------
    svn:keywords = Revision Id

Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_svg.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_svg.xml?rev=627882&r1=627881&r2=627882&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_svg.xml (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_svg.xml Thu Feb 14 13:55:44 2008
@@ -1,82 +1,82 @@
-<?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.
-    </p>
-  </info>
-  <fo>
-    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
-      <fo:layout-master-set>
-        <fo:simple-page-master master-name="normal" page-width="10in" page-height="15in">
-          <fo:region-body/>
-        </fo:simple-page-master>
-      </fo:layout-master-set>
-      <fo:page-sequence master-reference="normal" white-space-collapse="true">
-        <fo:flow flow-name="xsl-region-body">
-          <fo:block text-align="left">2 inch wide SVG external-graphic on LHS</fo:block>
-          <fo:block text-align="left">
-            <fo:external-graphic src="../../resources/images/img.svg" content-width="2in" scaling="uniform" />EOG
-          </fo:block>
-          <fo:block text-align="right">4 inch wide SVG external-graphic on RHS</fo:block>
-          <fo:block text-align="right">
-            <fo:external-graphic src="../../resources/images/img.svg" content-width="4in" scaling="uniform" />EOG
-          </fo:block>
-          <fo:block text-align="center">6 inch wide SVG external-graphic in center, non-uniformly squeezed to a height of 4in.</fo:block>
-          <fo:block text-align="center">
-            <fo:external-graphic src="../../resources/images/img.svg" content-width="6in" content-height="4in" scaling="non-uniform" />EOG
-          </fo:block>
-          <fo:block text-align="left">SVG external-graphic with an intrinsic size (16ptx16pt)</fo:block>
-          <fo:block text-align="left">
-            <fo:external-graphic src="../../resources/images/img-w-size.svg"/>EOG
-          </fo:block>
-          <fo:block>EOF</fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-    </fo:root>
-  </fo>
-  <checks>
-    <eval expected="144000" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
-    <eval expected="144000" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
-    <eval expected="144000" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
-    <eval expected="144000" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
-    <eval expected="0 0 144000 144000" xpath="//flow/block[2]/lineArea/viewport/@pos"/>
-    
-    <eval expected="288000" xpath="//flow/block[4]/lineArea/viewport/@ipd"/>
-    <eval expected="288000" xpath="//flow/block[4]/lineArea/viewport/@ipda"/>
-    <eval expected="288000" xpath="//flow/block[4]/lineArea/viewport/@bpd"/>
-    <eval expected="288000" xpath="//flow/block[4]/lineArea/viewport/@bpda"/>
-    <eval expected="0 0 288000 288000" xpath="//flow/block[4]/lineArea/viewport/@pos"/>
-
-    <eval expected="432000" xpath="//flow/block[6]/lineArea/viewport/@ipd"/>
-    <eval expected="432000" xpath="//flow/block[6]/lineArea/viewport/@ipda"/>
-    <eval expected="288000" xpath="//flow/block[6]/lineArea/viewport/@bpd"/>
-    <eval expected="288000" xpath="//flow/block[6]/lineArea/viewport/@bpda"/>
-    <eval expected="0 0 432000 288000" xpath="//flow/block[6]/lineArea/viewport/@pos"/>
-
-    <!-- TODO: This evaluates nicely to 16000mpt with 72dpi in the FOUserAgent but will result 
-         in 16080 for 300dpi which is caused by rounding errors because pixels are used internally. -->
-    <eval expected="16000" xpath="//flow/block[8]/lineArea/viewport/@ipd"/>
-    <eval expected="16000" xpath="//flow/block[8]/lineArea/viewport/@ipda"/>
-    <eval expected="16000" xpath="//flow/block[8]/lineArea/viewport/@bpd"/>
-    <eval expected="16000" xpath="//flow/block[8]/lineArea/viewport/@bpda"/>
-    <eval expected="0 0 16000 16000" xpath="//flow/block[8]/lineArea/viewport/@pos"/>
-  </checks>
-</testcase>
+<?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.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="normal" page-width="10in" page-height="15in">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal" white-space-collapse="true">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block text-align="left">2 inch wide SVG external-graphic on LHS</fo:block>
+          <fo:block text-align="left">
+            <fo:external-graphic src="../../resources/images/img.svg" content-width="2in" scaling="uniform" />EOG
+          </fo:block>
+          <fo:block text-align="right">4 inch wide SVG external-graphic on RHS</fo:block>
+          <fo:block text-align="right">
+            <fo:external-graphic src="../../resources/images/img.svg" content-width="4in" scaling="uniform" />EOG
+          </fo:block>
+          <fo:block text-align="center">6 inch wide SVG external-graphic in center, non-uniformly squeezed to a height of 4in.</fo:block>
+          <fo:block text-align="center">
+            <fo:external-graphic src="../../resources/images/img.svg" content-width="6in" content-height="4in" scaling="non-uniform" />EOG
+          </fo:block>
+          <fo:block text-align="left">SVG external-graphic with an intrinsic size (16ptx16pt)</fo:block>
+          <fo:block text-align="left">
+            <fo:external-graphic src="../../resources/images/img-w-size.svg"/>EOG
+          </fo:block>
+          <fo:block>EOF</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="144000" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
+    <eval expected="144000" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
+    <eval expected="144000" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
+    <eval expected="144000" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
+    <eval expected="0 0 144000 144000" xpath="//flow/block[2]/lineArea/viewport/@pos"/>
+    
+    <eval expected="288000" xpath="//flow/block[4]/lineArea/viewport/@ipd"/>
+    <eval expected="288000" xpath="//flow/block[4]/lineArea/viewport/@ipda"/>
+    <eval expected="288000" xpath="//flow/block[4]/lineArea/viewport/@bpd"/>
+    <eval expected="288000" xpath="//flow/block[4]/lineArea/viewport/@bpda"/>
+    <eval expected="0 0 288000 288000" xpath="//flow/block[4]/lineArea/viewport/@pos"/>
+
+    <eval expected="432000" xpath="//flow/block[6]/lineArea/viewport/@ipd"/>
+    <eval expected="432000" xpath="//flow/block[6]/lineArea/viewport/@ipda"/>
+    <eval expected="288000" xpath="//flow/block[6]/lineArea/viewport/@bpd"/>
+    <eval expected="288000" xpath="//flow/block[6]/lineArea/viewport/@bpda"/>
+    <eval expected="0 0 432000 288000" xpath="//flow/block[6]/lineArea/viewport/@pos"/>
+
+    <!-- TODO: This evaluates nicely to 16000mpt with 72dpi in the FOUserAgent but will result 
+         in 16080 for 300dpi which is caused by rounding errors because pixels are used internally. -->
+    <eval expected="16000" xpath="//flow/block[8]/lineArea/viewport/@ipd"/>
+    <eval expected="16000" xpath="//flow/block[8]/lineArea/viewport/@ipda"/>
+    <eval expected="16000" xpath="//flow/block[8]/lineArea/viewport/@bpd"/>
+    <eval expected="16000" xpath="//flow/block[8]/lineArea/viewport/@bpda"/>
+    <eval expected="0 0 16000 16000" xpath="//flow/block[8]/lineArea/viewport/@pos"/>
+  </checks>
+</testcase>

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_svg.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_svg.xml
------------------------------------------------------------------------------
    svn:keywords = Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_svgz.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_tiff.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_tiff.xml?rev=627882&r1=627881&r2=627882&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_tiff.xml (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_tiff.xml Thu Feb 14 13:55:44 2008
@@ -1,73 +1,73 @@
-<?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.
-    </p>
-  </info>
-  <fo>
-    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
-      <fo:layout-master-set>
-        <fo:simple-page-master master-name="normal" page-width="8in" page-height="8in">
-          <fo:region-body/>
-        </fo:simple-page-master>
-      </fo:layout-master-set>
-      <fo:page-sequence master-reference="normal" white-space-collapse="true">
-        <fo:flow flow-name="xsl-region-body">
-          <fo:block>TIFF external-graphic 300dpi</fo:block>
-          <fo:block>
-            <fo:external-graphic src="../../resources/images/bgimg300dpi.tif"/>EOG
-          </fo:block>
-          <fo:block>TIFF external-graphic 72dpi</fo:block>
-          <fo:block>
-            <fo:external-graphic src="../../resources/images/bgimg72dpi.tif"/>EOG
-          </fo:block>
-          <fo:block>TIFF external-graphic (CCITT group 4 encoding)</fo:block>
-          <fo:block>
-            <fo:external-graphic src="../../resources/images/tiff_group4.tif"/>EOG
-          </fo:block>
-          <fo:block>TIFF external-graphic (CCITT group 4 encoding, multiple strips)</fo:block>
-          <fo:block>
-            <fo:external-graphic src="../../resources/images/tiff_group4-multi-strip.tif"/>EOG
-          </fo:block>
-          <fo:block>EOF</fo:block>
-        </fo:flow>
-      </fo:page-sequence>
-    </fo:root>
-  </fo>
-  <checks>
-    <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
-    <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
-    <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
-    <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
-    <eval expected="192000" xpath="//flow/block[4]/lineArea/viewport/@ipd"/>
-    <eval expected="192000" xpath="//flow/block[4]/lineArea/viewport/@ipda"/>
-    <eval expected="192000" xpath="//flow/block[4]/lineArea/viewport/@bpd"/>
-    <eval expected="192000" xpath="//flow/block[4]/lineArea/viewport/@bpda"/>
-    <eval expected="550588" xpath="//flow/block[6]/lineArea/viewport/@ipd"/>
-    <eval expected="550588" xpath="//flow/block[6]/lineArea/viewport/@ipda"/>
-    <eval expected="66705" xpath="//flow/block[6]/lineArea/viewport/@bpd"/>
-    <eval expected="66705" xpath="//flow/block[6]/lineArea/viewport/@bpda"/>
-    <eval expected="550588" xpath="//flow/block[8]/lineArea/viewport/@ipd"/>
-    <eval expected="550588" xpath="//flow/block[8]/lineArea/viewport/@ipda"/>
-    <eval expected="66705" xpath="//flow/block[8]/lineArea/viewport/@bpd"/>
-    <eval expected="66705" xpath="//flow/block[8]/lineArea/viewport/@bpda"/>
-  </checks>
-</testcase>
+<?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.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="normal" page-width="8in" page-height="8in">
+          <fo:region-body/>
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="normal" white-space-collapse="true">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block>TIFF external-graphic 300dpi</fo:block>
+          <fo:block>
+            <fo:external-graphic src="../../resources/images/bgimg300dpi.tif"/>EOG
+          </fo:block>
+          <fo:block>TIFF external-graphic 72dpi</fo:block>
+          <fo:block>
+            <fo:external-graphic src="../../resources/images/bgimg72dpi.tif"/>EOG
+          </fo:block>
+          <fo:block>TIFF external-graphic (CCITT group 4 encoding)</fo:block>
+          <fo:block>
+            <fo:external-graphic src="../../resources/images/tiff_group4.tif"/>EOG
+          </fo:block>
+          <fo:block>TIFF external-graphic (CCITT group 4 encoding, multiple strips)</fo:block>
+          <fo:block>
+            <fo:external-graphic src="../../resources/images/tiff_group4-multi-strip.tif"/>EOG
+          </fo:block>
+          <fo:block>EOF</fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="46080" tolerance="5" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
+    <eval expected="46080" tolerance="5" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
+    <eval expected="46080" tolerance="5" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
+    <eval expected="46080" tolerance="5" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
+    <eval expected="192000" tolerance="5" xpath="//flow/block[4]/lineArea/viewport/@ipd"/>
+    <eval expected="192000" tolerance="5" xpath="//flow/block[4]/lineArea/viewport/@ipda"/>
+    <eval expected="192000" tolerance="5" xpath="//flow/block[4]/lineArea/viewport/@bpd"/>
+    <eval expected="192000" tolerance="5" xpath="//flow/block[4]/lineArea/viewport/@bpda"/>
+    <eval expected="550588" tolerance="5" xpath="//flow/block[6]/lineArea/viewport/@ipd"/>
+    <eval expected="550588" tolerance="5" xpath="//flow/block[6]/lineArea/viewport/@ipda"/>
+    <eval expected="66705" tolerance="5" xpath="//flow/block[6]/lineArea/viewport/@bpd"/>
+    <eval expected="66705" tolerance="5" xpath="//flow/block[6]/lineArea/viewport/@bpda"/>
+    <eval expected="550588" tolerance="5" xpath="//flow/block[8]/lineArea/viewport/@ipd"/>
+    <eval expected="550588" tolerance="5" xpath="//flow/block[8]/lineArea/viewport/@ipda"/>
+    <eval expected="66705" tolerance="5" xpath="//flow/block[8]/lineArea/viewport/@bpd"/>
+    <eval expected="66705" tolerance="5" xpath="//flow/block[8]/lineArea/viewport/@bpda"/>
+  </checks>
+</testcase>

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_tiff.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_tiff.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/footnote_basic.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/footnote_bug37880.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/footnote_footnote-separator.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/footnote_in_list.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/footnote_in_table.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/footnote_large.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/footnote_overflow-to-empty-page.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/footnote_overflow-to-multiple-pages.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/footnote_positioning_1.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/footnote_positioning_2.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/footnote_positioning_3.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/footnote_positioning_4.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/footnote_positioning_5.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/footnote_space-resolution.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/foreign-attributes.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/fox_destination_1.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/fox_external-document_1.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/fox_external-document_1.xml?rev=627882&r1=627881&r2=627882&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/fox_external-document_1.xml (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/fox_external-document_1.xml Thu Feb 14 13:55:44 2008
@@ -1,53 +1,53 @@
-<?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 the basics of fox:external-document.
-    </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>
-      <fox:external-document id="img" src="../../resources/images/bgimg72dpi.png"/>
-    </fo:root>
-  </fo>
-  <checks>
-    <eval expected="1" xpath="count(/areaTree/pageSequence)"/>
-    <eval expected="1" xpath="count(//pageViewport)"/>
-    <eval expected="1" xpath="/areaTree/pageSequence/pageViewport/@formatted-nr"/>
-    <eval expected="1" xpath="/areaTree/pageSequence/pageViewport/@nr"/>
-    <eval expected="0 0 191975 191975" xpath="/areaTree/pageSequence/pageViewport/@bounds"/>
-    
-    <eval expected="191975" xpath="//regionViewport/@ipd"/>
-    <eval expected="191975" xpath="//regionViewport/@bpd"/>
-    <eval expected="191975" xpath="//lineArea/@ipd"/>
-    <eval expected="191975" xpath="//lineArea/@bpd"/>
-    <eval expected="191975" xpath="//viewport/@ipd"/>
-    <eval expected="191975" xpath="//viewport/@bpd"/>
-    <eval expected="0 0 191975 191975" xpath="//viewport/@pos"/>
-    <eval expected="img" xpath="//viewport/@prod-id"/>
-    <eval expected="img" xpath="//image/@prod-id"/>
-  </checks>
-</testcase>
+<?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 the basics of fox:external-document.
+    </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>
+      <fox:external-document id="img" src="../../resources/images/bgimg72dpi.png"/>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="1" xpath="count(/areaTree/pageSequence)"/>
+    <eval expected="1" xpath="count(//pageViewport)"/>
+    <eval expected="1" xpath="/areaTree/pageSequence/pageViewport/@formatted-nr"/>
+    <eval expected="1" xpath="/areaTree/pageSequence/pageViewport/@nr"/>
+    <eval expected="0 0 191976 191976" xpath="/areaTree/pageSequence/pageViewport/@bounds"/>
+    
+    <eval expected="191976" xpath="//regionViewport/@ipd"/>
+    <eval expected="191976" xpath="//regionViewport/@bpd"/>
+    <eval expected="191976" xpath="//lineArea/@ipd"/>
+    <eval expected="191976" xpath="//lineArea/@bpd"/>
+    <eval expected="191976" xpath="//viewport/@ipd"/>
+    <eval expected="191976" xpath="//viewport/@bpd"/>
+    <eval expected="0 0 191976 191976" xpath="//viewport/@pos"/>
+    <eval expected="img" xpath="//viewport/@prod-id"/>
+    <eval expected="img" xpath="//image/@prod-id"/>
+  </checks>
+</testcase>

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/fox_external-document_1.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/fox_external-document_1.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Id
+Revision Id



---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org