Added support for fo:markers on fo:inline and fo:basic-link.

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

1 files changed, 110 insertions, 0 deletions

diff --git a/test/layoutengine/standard-testcases/markers_inline-level.xml b/test/layoutengine/standard-testcases/markers_inline-level.xml
new file mode 100644
index 000000000..d16904d05
--- /dev/null
+++ b/test/layoutengine/standard-testcases/markers_inline-level.xml
@@ -0,0 +1,110 @@
+<?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 that an empty fo:title does not cause a
+NullPointerException and does not generate any text.
+    </p>
+  </info>
+  <fo>
+    <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+      <fo:layout-master-set>
+        <fo:simple-page-master master-name="page" page-height="5in" page-width="6in" margin-top=".5in" margin-bottom=".5in" margin-left=".9in" margin-right=".9in">
+          <fo:region-body margin-bottom=".5in" margin-top="2.5in" />
+          <fo:region-before region-name="header" extent="2.5in" />
+          <fo:region-after region-name="footer" extent=".5in" />
+        </fo:simple-page-master>
+      </fo:layout-master-set>
+      <fo:page-sequence master-reference="page">
+        <fo:static-content flow-name="header">
+          <fo:block font-size="6pt">
+            <fo:block>
+              H1 (boundary="document", position="first-including-carryover"): <fo:retrieve-marker retrieve-class-name="H1" retrieve-position="first-including-carryover" retrieve-boundary="document"/>
+            </fo:block>
+            <fo:block>
+              H1 (boundary="document", position="first-starting-within-page"): <fo:retrieve-marker retrieve-class-name="H1" retrieve-position="first-starting-within-page" retrieve-boundary="document"/>
+            </fo:block>
+            <fo:block>
+              H1 (boundary="document", position="last-ending-within-page"): <fo:retrieve-marker retrieve-class-name="H1" retrieve-position="last-ending-within-page" retrieve-boundary="document"/>
+            </fo:block>
+          </fo:block>
+        </fo:static-content>
+        <fo:flow flow-name="xsl-region-body">
+          <fo:block>
+            BLOCK TEXT 
+            <fo:inline font-weight="bold">
+              <fo:marker marker-class-name="H1">H1.1</fo:marker>
+              INLINE TEXT WITH MARKER H1.1
+            </fo:inline>
+            BLOCK TEXT BLOCK TEXT BLOCK TEXT BLOCK TEXT BLOCK TEXT BLOCK TEXT BLOCK TEXT 
+            BLOCK TEXT BLOCK TEXT BLOCK TEXT BLOCK TEXT BLOCK TEXT BLOCK TEXT BLOCK TEXT 
+            BLOCK TEXT BLOCK TEXT BLOCK TEXT BLOCK TEXT BLOCK TEXT BLOCK TEXT BLOCK TEXT 
+            <fo:inline font-weight="bold">
+              <fo:marker marker-class-name="H1">H1.2</fo:marker>
+              INLINE TEXT WITH MARKER H1.2
+            </fo:inline>
+            TEXT BLOCK TEXT BLOCK TEXT BLOCK TEXT
+            <fo:inline font-weight="bold" id="m13">
+              <fo:marker marker-class-name="H1">H1.3</fo:marker>
+              INLINE TEXT WITH MARKER H1.3 AND A NESTED BLOCK WITH MORE INLINES
+              <fo:block break-after="page">
+                BLOCK TEXT BLOCK TEXT BLOCK TEXT BLOCK TEXT BLOCK TEXT BLOCK TEXT BLOCK TEXT 
+                BLOCK TEXT BLOCK TEXT BLOCK TEXT BLOCK TEXT BLOCK TEXT BLOCK TEXT BLOCK TEXT 
+                BLOCK TEXT BLOCK TEXT BLOCK TEXT BLOCK TEXT BLOCK TEXT BLOCK TEXT BLOCK TEXT 
+              </fo:block>
+              <fo:block>
+                BLOCK TEXT BLOCK TEXT BLOCK TEXT BLOCK TEXT BLOCK TEXT BLOCK TEXT BLOCK TEXT 
+                <fo:inline id="m13a"><fo:marker marker-class-name="H1">H1.3a</fo:marker></fo:inline>
+                BLOCK TEXT BLOCK TEXT BLOCK TEXT BLOCK TEXT BLOCK TEXT BLOCK TEXT BLOCK TEXT 
+                BLOCK TEXT BLOCK TEXT BLOCK TEXT BLOCK TEXT BLOCK TEXT BLOCK TEXT BLOCK TEXT 
+              </fo:block>
+            </fo:inline>
+            BLOCK TEXT BLOCK TEXT BLOCK TEXT BLOCK TEXT 
+          </fo:block>
+        </fo:flow>
+      </fo:page-sequence>
+    </fo:root>
+  </fo>
+  <checks>
+    <!-- first page: only "H1.1" -->
+    <eval expected="H1.1" xpath="//pageViewport[@key='P1']//regionBefore/block[1]/block[1]/lineArea[1]/text[2]/word" />
+    <eval expected="H1.1" xpath="//pageViewport[@key='P1']//regionBefore/block[1]/block[2]/lineArea[1]/text[2]/word" />
+    <eval expected="H1.1" xpath="//pageViewport[@key='P1']//regionBefore/block[1]/block[3]/lineArea[1]/text[2]/word" />
+    <!-- second page: only "H1.2" -->
+    <eval expected="H1.2" xpath="//pageViewport[@key='P2']//regionBefore/block[1]/block[1]/lineArea[1]/text[2]/word" />
+    <eval expected="H1.2" xpath="//pageViewport[@key='P2']//regionBefore/block[1]/block[2]/lineArea[1]/text[2]/word" />
+    <eval expected="H1.2" xpath="//pageViewport[@key='P2']//regionBefore/block[1]/block[3]/lineArea[1]/text[2]/word" />
+    <!-- third and fourth page: only "H1.3" -->
+    <eval expected="H1.3" xpath="//pageViewport[@key='P3']//regionBefore/block[1]/block[1]/lineArea[1]/text[2]/word" />
+    <eval expected="H1.3" xpath="//pageViewport[@key='P3']//regionBefore/block[1]/block[2]/lineArea[1]/text[2]/word" />
+    <eval expected="H1.3" xpath="//pageViewport[@key='P3']//regionBefore/block[1]/block[3]/lineArea[1]/text[2]/word" />
+    <eval expected="H1.3" xpath="//pageViewport[@key='P4']//regionBefore/block[1]/block[1]/lineArea[1]/text[2]/word" />
+    <eval expected="H1.3" xpath="//pageViewport[@key='P4']//regionBefore/block[1]/block[2]/lineArea[1]/text[2]/word" />
+    <eval expected="H1.3" xpath="//pageViewport[@key='P4']//regionBefore/block[1]/block[3]/lineArea[1]/text[2]/word" />
+    <!-- fifth page: "H1.3" carries over from previous pages; "H1.3a" is starting and ending within page -->
+    <eval expected="H1.3" xpath="//pageViewport[@key='P5']//regionBefore/block[1]/block[1]/lineArea[1]/text[2]/word" />
+    <eval expected="H1.3a" xpath="//pageViewport[@key='P5']//regionBefore/block[1]/block[2]/lineArea[1]/text[2]/word" />
+    <eval expected="H1.3a" xpath="//pageViewport[@key='P5']//regionBefore/block[1]/block[3]/lineArea[1]/text[2]/word" />
+    <!-- last page: again, only "H1.3" -->
+    <eval expected="H1.3" xpath="//pageViewport[@key='P6']//regionBefore/block[1]/block[1]/lineArea[1]/text[2]/word" />
+    <eval expected="H1.3" xpath="//pageViewport[@key='P6']//regionBefore/block[1]/block[2]/lineArea[1]/text[2]/word" />
+    <eval expected="H1.3" xpath="//pageViewport[@key='P6']//regionBefore/block[1]/block[3]/lineArea[1]/text[2]/word" />
+  </checks>
+</testcase>