Index: test/layoutengine/disabled-testcases.xml =================================================================== --- test/layoutengine/disabled-testcases.xml (révision 425766) +++ test/layoutengine/disabled-testcases.xml (copie de travail) @@ -355,4 +355,24 @@ Long text cause an IndexOutOfBounds exception http://issues.apache.org/bugzilla/show_bug.cgi?id=39414 - \ No newline at end of file + + fo:float float="none" should be split + float_float_none_2.xml + When float="none", it should be possible to split an fo:float + element on several pages. + + + Before-floats when no stretch available + before-float_not-deferred_no-stretch_2.xml + Whereas there is room for placing the before-float on the same + page as its citation, the algorithm prefers to defer it to the following + page. + + + Before-floats deferred when no stretch available + before-float_deferred_no-stretch.xml + Instead of deferring a before-float on the following page, an + underfull page is created so that the citation be on the same page as the + float. + + Index: test/layoutengine/standard-testcases/before-float_deferred_stretch.xml =================================================================== --- test/layoutengine/standard-testcases/before-float_deferred_stretch.xml (révision 0) +++ test/layoutengine/standard-testcases/before-float_deferred_stretch.xml (révision 0) @@ -0,0 +1,107 @@ + + + + + +

+ Test for before-floats. On a two-page document, when some stretching is + allowed between blocks, when the float citation is on the first page and + there is not enough room for the float, it should be placed on the top of + the second page. +

+ + + + + + + + + + + + + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + + + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + + + This is a block with a float. This is a block with a float. + The float anchor is just behind this word + + This is the float content. This is the float content. This is + the float content. This is the float content. This is the + float content. This is the float content. This is the float + content. This is the float content. + + . + This is a block with a float. This is a block with a float. + This is a block with a float. + + + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + + + + + + + + + + + + + + + + + + + + + + + + + Index: test/layoutengine/standard-testcases/before-float_deferred_no-stretch.xml =================================================================== --- test/layoutengine/standard-testcases/before-float_deferred_no-stretch.xml (révision 0) +++ test/layoutengine/standard-testcases/before-float_deferred_no-stretch.xml (révision 0) @@ -0,0 +1,115 @@ + + + + + +

+ Test for before-floats. On a two-page document, when no stretching is + allowed between blocks, when the float citation is on the first page and + there is not enough room for the float, it should be placed on the top of + the second page. +

+

+ When no stretching is available, only "too short" nodes are created. When + there is not enough room to place the float, a too short node is created + with added demerits for the deferred float. This results in higher + demerits than for previous too short nodes, which then are preferred + whereas they create underfull pages. +

+ + + + + + + + + + + + + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + + + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + + + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + + + This is a block with a float. This is a block with a float. + The float anchor is just behind this word + + This is the float content. This is the float content. This is + the float content. This is the float content. This is the + float content. This is the float content. This is the float + content. This is the float content. + + . + This is a block with a float. This is a block with a float. + This is a block with a float. This is a block with a float. + This is a block with a float. This is a block with a float. + This is a block with a float. This is a block with a float. + + + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + + + + + + + + + + + + + + + + + + + + + + + + + Index: test/layoutengine/standard-testcases/before-float_not-deferred_stretch.xml =================================================================== --- test/layoutengine/standard-testcases/before-float_not-deferred_stretch.xml (révision 0) +++ test/layoutengine/standard-testcases/before-float_not-deferred_stretch.xml (révision 0) @@ -0,0 +1,99 @@ + + + + + +

+ Test for before-floats. On a two-page document, when some stretching is + allowed between blocks, when the float citation is on the first page and + there is enough room for the float, it should be placed on the top of the + first page. +

+ + + + + + + + + + + + + This is a block with a float. This is a block with a float. + The float anchor is just behind this word + + This is the float content. This is the float content. This is + the float content. This is the float content. This is the + float content. This is the float content. This is the float + content. This is the float content. + + . + This is a block with a float. This is a block with a float. + This is a block with a float. This is a block with a float. + + + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + + + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + + + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + + + + + + + + + + + + + + + + + + + + + Index: test/layoutengine/standard-testcases/float_float_none_1.xml =================================================================== --- test/layoutengine/standard-testcases/float_float_none_1.xml (révision 0) +++ test/layoutengine/standard-testcases/float_float_none_1.xml (révision 0) @@ -0,0 +1,80 @@ + + + + + +

+ This test checks that fo:float objects with a "float" property of + "none" are typeset in the normal flow of elements. +

+ + + + + + + + + + + + + This is a block containing no before-float. This is a block + containing no before-float. This is a block containing no + before-float. This is a block containing no before-float. This is + a block containing no before-float. This is a block containing no + before-float. + + + This is a block containing a before-float with "float" set to + "none". The float anchor is just behind this word + + This is the float content. This is the float content. This is + the float content. This is the float content. This is the + float content. This is the float content. This is the float + content. + + + This is the end of the block containing the float. This is the + end of the block containing the float. This is the end of the + block containing the float. + + + This is a block containing no before-float. This is a block + containing no before-float. This is a block containing no + before-float. This is a block containing no before-float. This is + a block containing no before-float. This is a block containing no + before-float. + + + + + + + + + + + + + + Index: test/layoutengine/standard-testcases/before-float_not-deferred_no-stretch_1.xml =================================================================== --- test/layoutengine/standard-testcases/before-float_not-deferred_no-stretch_1.xml (révision 0) +++ test/layoutengine/standard-testcases/before-float_not-deferred_no-stretch_1.xml (révision 0) @@ -0,0 +1,98 @@ + + + + + +

+ Test for before-floats. On a two-page document, when no stretching is + allowed between blocks, when the float citation is on the first page and + there is enough room for the float, it should be placed on the top of the + first page. +

+

+ When no stretching is available, only "too short" nodes are created. There + is no feasible break. The result regarding floats should be the same, + however. +

+ + + + + + + + + + + + This is a block with a float. This is a block with a float. + The float anchor is just behind this word + + This is the float content. This is the float content. This is + the float content. This is the float content. This is the float + content. This is the float content. This is the float content. + This is the float content. + + . + This is a block with a float. This is a block with a float. + This is a block with a float. This is a block with a float. + + + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + + + + + + + + + + + + + + + + + + + + + + Index: test/layoutengine/standard-testcases/float_float_none_2.xml =================================================================== --- test/layoutengine/standard-testcases/float_float_none_2.xml (révision 0) +++ test/layoutengine/standard-testcases/float_float_none_2.xml (révision 0) @@ -0,0 +1,82 @@ + + + + + + +

+ This test checks that fo:float objects with a "float" property of + "none" are typeset in the normal flow of elements, and normally broken + across pages. +

+ + + + + + + + + + + + + This is a block containing no fo:float. This is a block + containing no fo:float. This is a block containing no fo:float. + This is a block containing no fo:float. This is a block + containing no fo:float. This is a block containing no fo:float. + This is a block containing no fo:float. This is a block + containing no fo:float. + + + This is a block containing an fo:float with "float" set to + "none", which will be split on two pages. The float anchor is + just behind this word + + This is the float content. This is the float content. This is + the float content. This is the float content. This is the + float content. This is the float content. This is the float + content. + + + This is the end of the block containing the float. This is the + end of the block containing the float. This is the end of the + block containing the float. + + + This is a block containing no fo:float. This is a block + containing no fo:float. This is a block containing no fo:float. + This is a block containing no fo:float. This is a block + containing no fo:float. This is a block containing no fo:float. + + + + + + + + + + + + + Index: test/layoutengine/standard-testcases/before-float_not-deferred_no-stretch_2.xml =================================================================== --- test/layoutengine/standard-testcases/before-float_not-deferred_no-stretch_2.xml (révision 0) +++ test/layoutengine/standard-testcases/before-float_not-deferred_no-stretch_2.xml (révision 0) @@ -0,0 +1,95 @@ + + + + + +

+ This test does not work. There is a before-float and a block of normal + text with no stretching. Normally the float should be on the first page. +

+

+ Without the before-float, the normal content would fit on one page. With + the float, two pages are necessary. As there is no available stretching + the algorithm can only create "too short" nodes. In such a case it prefers + to defer the float on the last page, instead of putting it on the first + page and splitting the normal content on two pages. This should be + corrected eventually. +

+ + + + + + + + + + + + This is a block with a float. This is a block with a float. + The float anchor is just behind this word + + This is the float content. This is the float content. This is + the float content. This is the float content. This is the float + content. This is the float content. This is the float content. + This is the float content. + + . + This is a block with a float. This is a block with a float. + This is a block with a float. This is a block with a float. + + + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + + + + + + + + + + + + + + + + + + + + Index: test/layoutengine/standard-testcases/before-float_complex.xml =================================================================== --- test/layoutengine/standard-testcases/before-float_complex.xml (révision 0) +++ test/layoutengine/standard-testcases/before-float_complex.xml (révision 0) @@ -0,0 +1,199 @@ + + + + + +

+ Test for before-floats. This a complex documents with several floats; some + may be put on the same page as their citation, others not. +

+ + + + + + + + + + + + + This is a block with a float. This is a block with a float. + This float has the number 1 + + This is the float content. This is the float content. This is + the float content. This is the float content. This is the + float content. This was the float number 1. + + . + This is a block with a float. This is a block with a float. + This is a block with a float. + + + This is a block with a float. This is a block with a float. + This float has the number 2 + + This is the float content. This is the float content. This is + the float content. This is the float content. This is the + float content. This was the float number 2. + + . + This is a block with a float. This is a block with a float. + This is a block with a float. + + + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + + + This is a block with a float. This is a block with a float. + This float has the number 3 + + This is the float content. This is the float content. This is + the float content. This is the float content. This is the + float content. This was the float number 3. + + . + This is a block with a float. This is a block with a float. + This is a block with a float. + + + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + + + This is a block with a float. This is a block with a float. + This float has the number 4 + + This is the float content. This is the float content. This is + the float content. This is the float content. This is the + float content. This was the float number 4. + + . + This is a block with a float. This is a block with a float. + This is a block with a float. + + + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + + + This is a block with a float. This is a block with a float. + This float has the number 5 + + This is the float content. This is + the float content. This is the float content. This is the + float content. This is the float content. This is the float + content. This is the float content. This is the float content. + This is the float content. This is the float content. This is + the float content. This is the float content. This is the + float content. This is the float content. This is the float + content. This is the float content. This is the float content. + This was the float number 5. + + . + This is a block with a float. This is a block with a float. + This is a block with a float. + + + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + + + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + + + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + + + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: test/layoutengine/standard-testcases/before-float_basic.xml =================================================================== --- test/layoutengine/standard-testcases/before-float_basic.xml (révision 0) +++ test/layoutengine/standard-testcases/before-float_basic.xml (révision 0) @@ -0,0 +1,76 @@ + + + + + +

+ This test checks that a before-float on a simple one-page document is + rightly placed on the top of the page. +

+ + + + + + + + + + + + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + + + This is a block with a float. This is a block with a float. + The float anchor is just behind this word + + This is the float content. This is the float content. This is + the float content. This is the float content. This is the float + content. This is the float content. This is the float content. + This is the float content. + + . + This is a block with a float. This is a block with a float. + This is a block with a float. This is a block with a float. + + + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + This is a block without a float. This is a block without a float. + + + + + + + + + + + + + + +