Merged revisions 718666,718705,719038,719110 via svnmerge from

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

........
  r718666 | adelmelle | 2008-11-18 17:58:54 +0000 (Tue, 18 Nov 2008) | 1 line
  
  Bugfix: do not reset TextLM.hasChanged, but combine (||) with previous value.
........
  r718705 | adelmelle | 2008-11-18 20:14:22 +0000 (Tue, 18 Nov 2008) | 1 line
  
  Change FontCache.changeLock to a boolean[1], so it can be serialized...
........
  r719038 | jeremias | 2008-11-19 19:46:45 +0000 (Wed, 19 Nov 2008) | 1 line
  
  Reduced warning on ascender+descender > EM box to DEBUG level, as this case is compensated for by additional code in guessVerticalMetricsFromGlyphBBox() and is therefore only confusing. I tested problematic fonts and they show an acceptable line layout. No semantics changed.
........
  r719110 | adelmelle | 2008-11-19 22:45:06 +0000 (Wed, 19 Nov 2008) | 3 lines
  
  Bugzilla 46240:
  Fixed a bug in combining break-before with a span change.
........


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

1 files changed, 59 insertions, 0 deletions

diff --git a/test/layoutengine/standard-testcases/block_break-before_bug46240.xml b/test/layoutengine/standard-testcases/block_break-before_bug46240.xml
new file mode 100644
index 000000000..c59dbb42e
--- /dev/null
+++ b/test/layoutengine/standard-testcases/block_break-before_bug46240.xml
@@ -0,0 +1,59 @@
+<?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>
+      Test for Bugzilla #46240: break-before breaks span-change.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+      <fo:layout-master-set>
+        <fo:simple-page-master page-height="841.8898pt" page-width="595.27563pt" master-name="page">
+          <fo:region-body margin-right="49.6063pt" margin-left="29.763779pt" margin-bottom="46.771652pt" margin-top="36.850395pt" column-count="2"/>
+        </fo:simple-page-master>
+        <fo:page-sequence-master master-name="contents">
+          <fo:single-page-master-reference master-reference="page"/>
+        </fo:page-sequence-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="contents" initial-page-number="2">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block id="block-1" span="all" break-before="odd-page" break-after="even-page">
+            <fo:inline font-size="16.0pt">xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx </fo:inline>
+          </fo:block>
+          <fo:block />
+        </fo:flow>
+      </fo:page-sequence>
+      <fo:page-sequence master-reference="contents">
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block id="block-2" span="all" break-before="even-page">
+            <fo:inline font-size="16.0pt">xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx xxx </fo:inline>
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <eval expected="5" xpath="count(//pageViewport)" />
+    <eval expected="3" xpath="count(//pageSequence[1]/pageViewport)" />
+    <eval expected="1" xpath="count(//block[@prod-id='block-1']/lineArea)" />
+    <eval expected="2" xpath="count(//pageSequence[2]/pageViewport)" />
+    <eval expected="1" xpath="count(//block[@prod-id='block-2']/lineArea)" />
+  </checks>
+</testcase>