Index: test/layoutengine/standard-testcases/markers_3.xml
===================================================================
--- test/layoutengine/standard-testcases/markers_3.xml	(revision 627324)
+++ test/layoutengine/standard-testcases/markers_3.xml	(revision )
@@ -55,7 +55,7 @@
           </fo:block>
         </fo:static-content>
         <fo:flow flow-name="xsl-region-body">
-          <fo:block>
+          <fo:block widows="1" orphans="1">
             <fo:block font-size="14pt" font-weight="bold">
               <fo:marker marker-class-name="PAGE">[PAGE]</fo:marker>
               <fo:marker marker-class-name="PS">[PS]</fo:marker>
@@ -96,7 +96,7 @@
           </fo:block>
         </fo:static-content>
         <fo:flow flow-name="xsl-region-body">
-          <fo:block>
+          <fo:block widows="1" orphans="1">
             <fo:block>sometext</fo:block>
             <fo:block>sometext</fo:block>
             <fo:block>sometext</fo:block>
Index: test/layoutengine/standard-testcases/flow_changing-ipd_table-after-break.xml
===================================================================
--- test/layoutengine/standard-testcases/flow_changing-ipd_table-after-break.xml	(revision 992029)
+++ test/layoutengine/standard-testcases/flow_changing-ipd_table-after-break.xml	(revision )
@@ -45,7 +45,7 @@
             <fo:table-body>
               <fo:table-row>
                 <fo:table-cell>
-                  <fo:block>
+                  <fo:block widows="1" orphans="1">
                     <fo:block id="before_break">Block before the page break.</fo:block>
                     <fo:block id="after_break">Block after the page break.</fo:block>
                   </fo:block>
Index: test/layoutengine/standard-testcases/block_padding_2.xml
===================================================================
--- test/layoutengine/standard-testcases/block_padding_2.xml	(revision 627324)
+++ test/layoutengine/standard-testcases/block_padding_2.xml	(revision )
@@ -49,16 +49,7 @@
       <penalty w="0" p="INF"/>
       <glue w="30000"/>
       
-      <box w="14400"/>
+      <box w="14400"/>      
-      
-      <penalty w="0" p="INF"/>
-      <glue w="30000"/> <!-- w="30000" is for the padding-after -->
-      <penalty w="0" p="0"/>
-      <glue w="-60000"/> <!-- difference between break and no-break situation -->
-      <box w="0"/>
-      <penalty w="0" p="INF"/>
-      <glue w="30000"/> <!-- w="30000" is for the padding-before -->
-      
       <box w="14400"/>
       
       <penalty w="0" p="INF"/>
@@ -90,15 +81,6 @@
       <glue w="30000"/>
       
       <box w="14400"/>
-
-      <penalty w="0" p="INF"/>
-      <glue w="30000"/>
-      <penalty w="0" p="0"/>
-      <glue w="-60000"/>
-      <box w="0"/>
-      <penalty w="0" p="INF"/>
-      <glue w="30000"/>
-      
       <box w="14400"/>
       
       <box w="0"/>
Index: test/layoutengine/standard-testcases/inline_block_nested_4.xml
===================================================================
--- test/layoutengine/standard-testcases/inline_block_nested_4.xml	(revision 627324)
+++ test/layoutengine/standard-testcases/inline_block_nested_4.xml	(revision )
@@ -52,19 +52,13 @@
   <checks>
     <element-list category="breaker">
       <box w="12000"/>
-      <penalty w="0" p="0"/>
       <box w="12000"/>
-      <penalty w="0" p="0"/>
       <box w="12000"/>
       <penalty w="0" p="0"/>
       <box w="12000"/>
-      <penalty w="0" p="0"/>
       <box w="12000"/>
-      <penalty w="0" p="0"/>
       <box w="12000"/>
-      <penalty w="0" p="1000"/>
-      <glue w="0"/>
-      <penalty w="0" p="-1000"/>
+      <skip>3</skip>
     </element-list>
     
     <!-- first block -->
Index: test/layoutengine/standard-testcases/block_border_bug43917.xml
===================================================================
--- test/layoutengine/standard-testcases/block_border_bug43917.xml	(revision 627324)
+++ test/layoutengine/standard-testcases/block_border_bug43917.xml	(revision )
@@ -55,7 +55,6 @@
       <glue w="1000"/> <!-- border-before -->
       
       <box w="14400"/> <!-- Line 1 -->
-      <penalty w="0" p="0"/> <!--SpaceHandlingBreakPosition-->
       <box w="14400"/> <!-- Line 2 -->
       
       <penalty w="0" p="INF"/>
@@ -70,7 +69,6 @@
       <glue w="1000"/> <!-- border-before -->
       
       <box w="14400"/> <!-- Line 1 -->
-      <penalty w="0" p="0"/> <!--SpaceHandlingBreakPosition-->
       <box w="14400"/> <!-- Line 2 -->
       
       <penalty w="0" p="INF"/>
Index: test/layoutengine/standard-testcases/inline_block_nested_6.xml
===================================================================
--- test/layoutengine/standard-testcases/inline_block_nested_6.xml	(revision 807014)
+++ test/layoutengine/standard-testcases/inline_block_nested_6.xml	(revision )
@@ -49,14 +49,14 @@
   </fo>
   <checks>
     <element-list category="breaker">
-      <skip>5</skip>
+      <skip>3</skip>
       <!-- penalty between blocks b11 and b12, set by InlineLM in b1 -->
       <penalty w="0" p="0"/>
       <skip>5</skip>
       <!-- penalty between blocks b21 and b22, set by InlineLM in b2 -->
       <!-- keep-together.within-page="always" -->
       <penalty w="0" p="1000"/>
-      <skip>3</skip>
+      <skip>5</skip>
       <!-- penalty between blocks b31 and b32, set by InlineLM in b3 -->
       <!-- keep-with-next.within-page="always" -->
       <penalty w="0" p="1000"/>
Index: test/layoutengine/standard-testcases/table_border-collapse_separate_conditionals.xml
===================================================================
--- test/layoutengine/standard-testcases/table_border-collapse_separate_conditionals.xml	(revision 627324)
+++ test/layoutengine/standard-testcases/table_border-collapse_separate_conditionals.xml	(revision )
@@ -48,7 +48,7 @@
                   padding-after.conditionality="retain"
                   padding-before.length="2pt"
                   padding-before.conditionality="retain">
-                  <fo:block background-color="yellow">
+                  <fo:block background-color="yellow" widows="1" orphans="1">
                     <fo:block>Cell 1.1</fo:block>
                     <fo:block>Cell 1.1</fo:block>
                     <fo:block>Cell 1.1</fo:block>
@@ -60,7 +60,7 @@
                   border-before-width.conditionality="retain"
                   border-after-width.length="2pt"
                   border-after-width.conditionality="retain">
-                  <fo:block background-color="yellow">
+                  <fo:block background-color="yellow" widows="1" orphans="1">
                     <fo:block>Cell 1.2</fo:block>
                     <fo:block>Cell 1.2</fo:block>
                     <fo:block>Cell 1.2</fo:block>
@@ -87,7 +87,7 @@
                   border-before-width.conditionality="retain"
                   padding-after.length="5pt"
                   padding-after.conditionality="retain">
-                  <fo:block background-color="yellow">
+                  <fo:block background-color="yellow" widows="1" orphans="1">
                     <fo:block>Cell 1.1</fo:block>
                     <fo:block>Cell 1.1</fo:block>
                     <fo:block>Cell 1.1</fo:block>
@@ -99,7 +99,7 @@
                   border-after-width.conditionality="retain"
                   padding-before.length="7pt"
                   padding-before.conditionality="retain">
-                  <fo:block background-color="yellow">
+                  <fo:block background-color="yellow" widows="1" orphans="1">
                     <fo:block>Cell 1.2</fo:block>
                     <fo:block>Cell 1.2</fo:block>
                     <fo:block>Cell 1.2</fo:block>
@@ -130,7 +130,7 @@
                   padding-before.conditionality="retain"
                   padding-after.length="1pt"
                   padding-after.conditionality="retain">
-                  <fo:block background-color="yellow">
+                  <fo:block background-color="yellow" widows="1" orphans="1">
                     <fo:block>Cell 1.1</fo:block>
                     <fo:block>Cell 1.1</fo:block>
                     <fo:block>Cell 1.1</fo:block>
@@ -138,7 +138,7 @@
                   </fo:block>
                 </fo:table-cell>
                 <fo:table-cell border="4pt solid blue" padding="2pt">
-                  <fo:block background-color="yellow">
+                  <fo:block background-color="yellow" widows="1" orphans="1">
                     <fo:block>Cell 1.2</fo:block>
                     <fo:block>Cell 1.2</fo:block>
                     <fo:block>Cell 1.2</fo:block>
@@ -165,7 +165,7 @@
                   border-after-width.conditionality="retain"
                   padding-after.length="9pt"
                   padding-after.conditionality="retain">
-                  <fo:block background-color="yellow">
+                  <fo:block background-color="yellow" widows="1" orphans="1">
                     <fo:block>Cell 1.1</fo:block>
                     <fo:block>Cell 1.1</fo:block>
                     <fo:block>Cell 1.1</fo:block>
@@ -177,7 +177,7 @@
                   border-before-width.conditionality="retain"
                   padding-before.length="11pt"
                   padding-before.conditionality="retain">
-                  <fo:block background-color="yellow">
+                  <fo:block background-color="yellow" widows="1" orphans="1">
                     <fo:block>Cell 1.2</fo:block>
                     <fo:block>Cell 1.2</fo:block>
                     <fo:block>Cell 1.2</fo:block>
@@ -201,7 +201,7 @@
             <fo:table-column column-width="proportional-column-width(1)" number-columns-repeated="2"/>
             <fo:table-body>
               <fo:table-row>
-                <fo:table-cell border="2pt solid blue">
+                <fo:table-cell border="2pt solid blue" widows="1" orphans="1">
                   <fo:block>Cell 1.1</fo:block>
                   <fo:block>Cell 1.1</fo:block>
                   <fo:block>Cell 1.1</fo:block>
Index: test/layoutengine/standard-testcases/inline_block-level_nested_1.xml
===================================================================
--- test/layoutengine/standard-testcases/inline_block-level_nested_1.xml	(revision 815383)
+++ test/layoutengine/standard-testcases/inline_block-level_nested_1.xml	(revision )
@@ -77,23 +77,17 @@
   <checks>
     <element-list category="breaker">
       <box w="14400"/>
-      <penalty w="0" p="0"/>
       <box w="14400"/>
-      <penalty w="0" p="0"/>
       <box w="14400"/>
       <penalty w="0" p="0"/>
       <glue w="6000" aux="true"/>
       <box w="14400"/>
-      <penalty w="0" p="0"/>
       <box w="14400"/>
-      <penalty w="0" p="0"/>
       <box w="14400"/>
       <penalty w="0" p="0"/>
       <glue w="6000" aux="true"/>
       <box w="14400"/>
-      <penalty w="0" p="0"/>
       <box w="14400"/>
-      <penalty w="0" p="0"/>
       <box w="14400"/>
       <skip>3</skip>
     </element-list>
Index: test/layoutengine/standard-testcases/table_border-collapse_collapse_conditionals.xml
===================================================================
--- test/layoutengine/standard-testcases/table_border-collapse_collapse_conditionals.xml	(revision 627324)
+++ test/layoutengine/standard-testcases/table_border-collapse_collapse_conditionals.xml	(revision )
@@ -43,7 +43,7 @@
             <fo:table-body>
               <fo:table-row border="5pt solid red">
                 <fo:table-cell border="7pt solid blue" padding="2pt">
-                  <fo:block background-color="yellow">
+                  <fo:block background-color="yellow" widows="1" orphans="1">
                     <fo:block>Cell 1.1</fo:block>
                     <fo:block>Cell 1.1</fo:block>
                   </fo:block>
@@ -54,7 +54,7 @@
                   border-before-width.conditionality="retain"
                   padding-after.length="7pt"
                   padding-after.conditionality="retain">
-                  <fo:block background-color="yellow">
+                  <fo:block background-color="yellow" widows="1" orphans="1">
                     <fo:block>Cell 1.2</fo:block>
                     <fo:block>Cell 1.2</fo:block>
                     <fo:block>Cell 1.2</fo:block>
@@ -66,7 +66,7 @@
                 border-before-width.length="5pt"
                 border-before-width.conditionality="retain">
                 <fo:table-cell border="4pt solid green" padding="2pt">
-                  <fo:block background-color="yellow">
+                  <fo:block background-color="yellow" widows="1" orphans="1">
                     <fo:block>Cell 2.1</fo:block>
                     <fo:block>Cell 2.1</fo:block>
                   </fo:block>
@@ -105,7 +105,7 @@
                 border-before-width.length="5pt"
                 border-before-width.conditionality="retain">
                 <fo:table-cell border="4pt solid green" padding="2pt">
-                  <fo:block background-color="yellow">
+                  <fo:block background-color="yellow" widows="1" orphans="1">
                     <fo:block>Cell 2.1</fo:block>
                     <fo:block>Cell 2.1</fo:block>
                   </fo:block>
@@ -115,7 +115,7 @@
                 border-before-width.length="5pt"
                 border-before-width.conditionality="retain">
                 <fo:table-cell border="4pt solid green" padding="2pt">
-                  <fo:block background-color="yellow">
+                  <fo:block background-color="yellow" widows="1" orphans="1">
                     <fo:block>Cell 3.1</fo:block>
                     <fo:block>Cell 3.1</fo:block>
                   </fo:block>
Index: test/layoutengine/standard-testcases/wrapper_inline_block.xml
===================================================================
--- test/layoutengine/standard-testcases/wrapper_inline_block.xml	(revision 627324)
+++ test/layoutengine/standard-testcases/wrapper_inline_block.xml	(revision )
@@ -40,9 +40,7 @@
     <!-- Just check if this really results in 3 lines. -->
     <element-list category="breaker">
       <box w="14400"/>
-      <penalty w="0" p="0"/>
       <box w="14400"/>
-      <penalty w="0" p="0"/>
       <box w="14400"/>
       <skip>3</skip>
     </element-list>
Index: test/layoutengine/standard-testcases/flow_changing-ipd_no-restartable.xml
===================================================================
--- test/layoutengine/standard-testcases/flow_changing-ipd_no-restartable.xml	(revision 827047)
+++ test/layoutengine/standard-testcases/flow_changing-ipd_no-restartable.xml	(revision )
@@ -53,7 +53,7 @@
             <fo:table-body>
               <fo:table-row>
                 <fo:table-cell>
-                  <fo:block>
+                  <fo:block widows="1" orphans="1">
                     <fo:block>Before page break</fo:block>
                     <fo:block>After page break</fo:block>
                   </fo:block>
@@ -70,7 +70,7 @@
             <fo:table-body>
               <fo:table-row>
                 <fo:table-cell>
-                  <fo:block>
+                  <fo:block widows="1" orphans="1">
                     <fo:block>Before page break</fo:block>
                     <fo:block>After page break</fo:block>
                   </fo:block>
@@ -122,7 +122,7 @@
             <fo:table-body>
               <fo:table-row>
                 <fo:table-cell>
-                  <fo:block>
+                  <fo:block widows="1" orphans="1">
                     <fo:block>Before page break</fo:block>
                     <fo:block>After page break</fo:block>
                   </fo:block>
Index: test/layoutengine/standard-testcases/block_space-before_space-after_4.xml
===================================================================
--- test/layoutengine/standard-testcases/block_space-before_space-after_4.xml	(revision 627324)
+++ test/layoutengine/standard-testcases/block_space-before_space-after_4.xml	(revision )
@@ -48,16 +48,14 @@
       <penalty w="0" p="INF"/>
       <glue w="5000"/>
       <box w="10000"/>
-      <penalty w="0" p="0"/>
-      
       <box w="10000"/>
       <penalty w="0" p="0"/>
 
-      <!-- skip two more lines -->
+      <!-- skip one line -->
       <skip>2</skip>
-      <skip>2</skip>
       
       <box w="10000"/>
+      <box w="10000"/>
       
       <skip>3</skip>
     </element-list>
@@ -69,8 +67,8 @@
     <eval expected="1" xpath="count(//pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block)"/>
     <eval expected="1" xpath="count(//pageViewport[@nr=3]/page/regionViewport/regionBody/mainReference/span/flow/block)"/>
     <eval expected="2" xpath="count(//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/block)"/>
-    <eval expected="2" xpath="count(//pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/block)"/>
-    <eval expected="1" xpath="count(//pageViewport[@nr=3]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/block)"/>
+    <eval expected="1" xpath="count(//pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/block)"/>
+    <eval expected="2" xpath="count(//pageViewport[@nr=3]/page/regionViewport/regionBody/mainReference/span/flow/block[1]/block)"/>
     
   </checks>
 </testcase>
Index: test/layoutengine/standard-testcases/markers_2.xml
===================================================================
--- test/layoutengine/standard-testcases/markers_2.xml	(revision 627324)
+++ test/layoutengine/standard-testcases/markers_2.xml	(revision )
@@ -55,7 +55,7 @@
           </fo:block-container>
         </fo:static-content>
         <fo:flow flow-name="xsl-region-body">
-          <fo:block>
+          <fo:block widows="1" orphans="1">
             <fo:marker marker-class-name="part1">
               <fo:block background-color="black" color="white" text-align="center">1</fo:block>
             </fo:marker>
@@ -68,7 +68,7 @@
             <fo:block>text1</fo:block>
             <fo:block>text1</fo:block>
           </fo:block>
-          <fo:block>
+          <fo:block widows="1" orphans="1">
             <fo:marker marker-class-name="part2">
               <fo:block background-color="black" color="white" text-align="center">2</fo:block>
             </fo:marker>
@@ -78,7 +78,7 @@
             <fo:block>text2</fo:block>
             <fo:block>text2</fo:block>
           </fo:block>
-          <fo:block>
+          <fo:block widows="1" orphans="1">
             <fo:marker marker-class-name="part3">
               <fo:block background-color="black" color="white" text-align="center">3</fo:block>
             </fo:marker>
Index: test/layoutengine/standard-testcases/block_space-before_space-after_7.xml
===================================================================
--- test/layoutengine/standard-testcases/block_space-before_space-after_7.xml	(revision 627324)
+++ test/layoutengine/standard-testcases/block_space-before_space-after_7.xml	(revision )
@@ -47,7 +47,8 @@
       <glue w="7000"/>
       <box w="14400"/>
       
-      <penalty w="0" p="0"/>
+      <box w="0"/>
+      <penalty w="0" p="INF"/>
       
       <glue w="6000"/>
       <box w="14400"/>
Index: test/layoutengine/standard-testcases/region-body_column-count_bug37828.xml
===================================================================
--- test/layoutengine/standard-testcases/region-body_column-count_bug37828.xml	(revision 627324)
+++ test/layoutengine/standard-testcases/region-body_column-count_bug37828.xml	(revision )
@@ -62,9 +62,9 @@
     <eval expected="57600" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span[2]/flow[1]/@bpd"/>
     <eval expected="57600" xpath="//pageViewport[@nr=1]/page/regionViewport/regionBody/mainReference/span[2]/flow[2]/@bpd"/>
 
-    <eval expected="14400" xpath="//pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span[1]/@bpd"/>
-    <eval expected="14400" xpath="//pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span[1]/flow[1]/@bpd"/>
-    <eval expected="14400" xpath="//pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span[1]/flow[2]/@bpd"/>
+    <eval expected="28800" xpath="//pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span[1]/@bpd"/>
+    <eval expected="28800" xpath="//pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span[1]/flow[1]/@bpd"/>
+    <eval expected="0" xpath="//pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span[1]/flow[2]/@bpd"/>
     <eval expected="14400" xpath="//pageViewport[@nr=2]/page/regionViewport/regionBody/mainReference/span[2]/@bpd"/>
   </checks>
 </testcase>
Index: test/layoutengine/standard-testcases/block_space-before_space-after_6.xml
===================================================================
--- test/layoutengine/standard-testcases/block_space-before_space-after_6.xml	(revision 627324)
+++ test/layoutengine/standard-testcases/block_space-before_space-after_6.xml	(revision )
@@ -33,7 +33,7 @@
       <fo:page-sequence master-reference="normal" id="ex1">
         <fo:flow flow-name="xsl-region-body">
           <fo:block>first line</fo:block>
-          <fo:block space-before="10pt">
+          <fo:block space-before="10pt" orphans="1" widows="1">
             <fo:block>before break</fo:block>
             <fo:block>after break</fo:block>
           </fo:block>
@@ -42,7 +42,8 @@
       <fo:page-sequence master-reference="normal" id="ex2">
         <fo:flow flow-name="xsl-region-body">
           <fo:block>first line</fo:block>
-          <fo:block space-before="10pt" space-before.conditionality="retain">
+          <fo:block space-before="10pt" space-before.conditionality="retain"
+                    orphans="1" widows="1">
             <fo:block>before break</fo:block>
             <fo:block>after break</fo:block>
           </fo:block>
Index: test/layoutengine/standard-testcases/flow_changing-ipd_last-page.xml
===================================================================
--- test/layoutengine/standard-testcases/flow_changing-ipd_last-page.xml	(revision 915406)
+++ test/layoutengine/standard-testcases/flow_changing-ipd_last-page.xml	(revision )
@@ -45,7 +45,7 @@
       <fo:page-sequence master-reference="pages" font-size="8pt" line-height="10pt">
         <fo:flow flow-name="xsl-region-body" text-align="justify">
           <fo:block space-after="140pt">First block</fo:block>
-          <fo:block id="surrounding">
+          <fo:block id="surrounding" widows="1" orphans="1">
             <fo:block id="before">Block before the page break.</fo:block>
             <fo:block id="after">Block after the page break.</fo:block>
           </fo:block>
Index: test/layoutengine/standard-testcases/inline_block_nested_1.xml
===================================================================
--- test/layoutengine/standard-testcases/inline_block_nested_1.xml	(revision 627324)
+++ test/layoutengine/standard-testcases/inline_block_nested_1.xml	(revision )
@@ -39,9 +39,7 @@
   <checks>
     <element-list category="breaker">
       <box w="14400"/>
-      <penalty w="0" p="0"/>
       <box w="0" aux="true"/> <!-- this is from the empty block -->
-      <penalty w="0" p="0"/>
       <box w="14400"/>
       <skip>3</skip>
     </element-list>
Index: test/layoutengine/standard-testcases/block_space-before_space-after_bug38102.xml
===================================================================
--- test/layoutengine/standard-testcases/block_space-before_space-after_bug38102.xml	(revision 627324)
+++ test/layoutengine/standard-testcases/block_space-before_space-after_bug38102.xml	(revision )
@@ -113,7 +113,8 @@
     <element-list category="breaker" id="block">
       <box w="14400"/>
       
-      <penalty w="0" p="0"/>
+      <box w="0"/>
+      <penalty w="0" p="INF"/>
       
       <glue w="16000" y="0" z="0"/>
       <box w="14400"/>
@@ -127,7 +128,6 @@
       <box w="14400"/>
       <penalty w="0" p="0"/>
       <box w="14400"/>
-      <penalty w="0" p="0"/>
       <box w="14400"/>
       
       <skip>3</skip>
Index: test/layoutengine/standard-testcases/block_space-before_space-after_9a.xml
===================================================================
--- test/layoutengine/standard-testcases/block_space-before_space-after_9a.xml	(revision 627324)
+++ test/layoutengine/standard-testcases/block_space-before_space-after_9a.xml	(revision )
@@ -59,9 +59,7 @@
     <element-list category="breaker" index="1">
       <box w="0"/> <!-- SpaceHandlingPosition -->
       
-      <box w="0"/> <!-- empty block used to cause the break-before -->
+      <box w="0"/> <!-- empty block used to cause the break-before -->      
-      <penalty w="0" p="0"/>
-      
       <box w="14400"/>
       
       <box w="0"/>