Merged revisions 652821-652822,652835,653036,653045,653048,653106,653144,653202,653204,653311,653564 via svnmerge from

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

........
  r652821 | adelmelle | 2008-05-02 17:58:26 +0100 (Fri, 02 May 2008) | 6 lines
  
  Cleanup/Correction after r657673
  -> added missing file FObj.java
  -> pushed retrieve-class-name upwards to AbstractRetrieveMarker as a common property
  -> corrected use of property-name "retrieve-class-name" in source and testcase
  -> improved consistency in code-style
........
  r652822 | adelmelle | 2008-05-02 18:00:33 +0100 (Fri, 02 May 2008) | 1 line
  
  Expand imports...
........
  r652835 | adelmelle | 2008-05-02 18:28:25 +0100 (Fri, 02 May 2008) | 3 lines
  
  Bugzilla 42703:
  Fixed a regression introduced by the fix for Bugzilla 44286
........
  r653036 | adelmelle | 2008-05-03 11:21:45 +0100 (Sat, 03 May 2008) | 2 lines
  
  Cleanup: improve code-readibility
........
  r653045 | adelmelle | 2008-05-03 11:51:16 +0100 (Sat, 03 May 2008) | 2 lines
  
  Tweak/correction: save local hash-code (as originally intended...)
........
  r653048 | adelmelle | 2008-05-03 11:55:07 +0100 (Sat, 03 May 2008) | 2 lines
  
  Tweaks: make fobj member final; have default implementations for some methods throw an UnsupportedOperationException instead of merely logging an error
........
  r653106 | acumiskey | 2008-05-03 20:07:18 +0100 (Sat, 03 May 2008) | 1 line
  
  Fixed the build. Assignment on final variable fobj.
........
  r653144 | acumiskey | 2008-05-03 22:29:09 +0100 (Sat, 03 May 2008) | 1 line
  
  Fix that preserves the final status of the fobj member variable.
........
  r653202 | adelmelle | 2008-05-04 12:37:31 +0100 (Sun, 04 May 2008) | 2 lines
  
  Change private element-generating methods to add the elements to a passed List  (improves code-readability and reduces the amount of temporary LinkedList instances)
........
  r653204 | adelmelle | 2008-05-04 14:04:28 +0100 (Sun, 04 May 2008) | 4 lines
  
  Further refinements:
  -> use cached auxiliary position where possible (analogous to BlockStackingLM)
  -> consolidate makeXXXPenalty() helpers
........
  r653311 | jeremias | 2008-05-05 07:50:54 +0100 (Mon, 05 May 2008) | 6 lines
  
  Bugzilla #43650:
  PCL Renderer: Improved page format selection so it doesn't interfere with duplex printing.
  Submitted by: Thomas Margreiter <tm.at.felder.at>
  
  Note:
  I've only been able to verify that the change doesn't have any negative effects on simplex printers.
........
  r653564 | adelmelle | 2008-05-05 20:27:10 +0100 (Mon, 05 May 2008) | 2 lines
  
  Correction of indentation
........


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

2 files changed, 31 insertions, 2 deletions

diff --git a/test/fotree/testcases/table_retrieve-table-marker.fo b/test/fotree/testcases/table_retrieve-table-marker.fo
index 3697fcd19..138d4d2fb 100644
--- a/test/fotree/testcases/table_retrieve-table-marker.fo
+++ b/test/fotree/testcases/table_retrieve-table-marker.fo
@@ -35,8 +35,8 @@
           <fo:table-row>
             <fo:table-cell number-columns-spanned="2">
               <fo:block>
-                <fo:retrieve-table-marker marker-class-name="mc1">
-                  <test:assert property="marker-class-name" expected="mc1" />
+                <fo:retrieve-table-marker retrieve-class-name="mc1">
+                  <test:assert property="retrieve-class-name" expected="mc1" />
                   <test:assert property="retrieve-position-within-table" expected="FIRST_STARTING" />
                   <test:assert property="retrieve-boundary-within-table" expected="TABLE" />
                 </fo:retrieve-table-marker>
diff --git a/test/layoutengine/standard-testcases/marker_white-space-treatment_bug42703.xml b/test/layoutengine/standard-testcases/marker_white-space-treatment_bug42703.xml
index 0eb80f982..50ef57bb2 100644
--- a/test/layoutengine/standard-testcases/marker_white-space-treatment_bug42703.xml
+++ b/test/layoutengine/standard-testcases/marker_white-space-treatment_bug42703.xml
@@ -57,6 +57,33 @@
             text with the marker
           </fo:block>
          </fo:block>
+         </fo:flow>
+       </fo:page-sequence>
+       <fo:page-sequence master-reference="all-pages">
+          <fo:static-content flow-name="xsl-region-before">
+          <fo:block color="blue" font-size="25pt">
+            <fo:block>marker1 content:
+              <fo:inline color="green"><fo:retrieve-marker 
+              retrieve-class-name="marker1" 
+              retrieve-boundary="page"					
+              /></fo:inline>
+            </fo:block>
+            <fo:block>marker1 content:
+              <fo:inline color="green"><fo:retrieve-marker 
+              retrieve-class-name="marker1" 
+              retrieve-boundary="page"					
+              /></fo:inline>
+            </fo:block>
+          </fo:block>
+          </fo:static-content>
+          <fo:flow flow-name="xsl-region-body">
+             <fo:block font-size="20pt">
+          <fo:block margin-top="2cm">
+            <fo:marker marker-class-name="marker1"> Block<fo:inline> with inline element </fo:inline>.
+            </fo:marker>
+            text with the marker
+          </fo:block>
+         </fo:block>
           </fo:flow>
        </fo:page-sequence>
     </fo:root>
@@ -64,5 +91,7 @@
   <checks>
     <eval expected="4" xpath="count((//regionBefore//inlineparent)[1]/text[1]/space)" />
     <eval expected="4" xpath="count((//regionBefore//inlineparent)[1]/text[2]/space)" />
+    <eval expected="4" xpath="count((//regionBefore//inlineparent)[2]/text[1]/space)" />
+    <eval expected="4" xpath="count((//regionBefore//inlineparent)[2]/text[2]/space)" />
   </checks>
 </testcase>