From: Jeremias Maerki <jeremias@apache.org>
Date: Mon, 18 Jul 2005 10:51:00 +0000 (+0000)
Subject: No more warnings about unexpected FOText inside markers.
X-Git-Tag: fop-0_90-alpha1~490
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2d5e70fa412d2a2a5d405d84a9239668a11aeda2;p=xmlgraphics-fop.git

No more warnings about unexpected FOText inside markers.

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

diff --git a/src/java/org/apache/fop/fo/FOText.java b/src/java/org/apache/fop/fo/FOText.java
index 393c20871..4014e2fb8 100644
--- a/src/java/org/apache/fop/fo/FOText.java
+++ b/src/java/org/apache/fop/fo/FOText.java
@@ -31,6 +31,8 @@ import org.apache.fop.fo.properties.CommonHyphenation;
 import org.apache.fop.fo.properties.CommonTextDecoration;
 import org.apache.fop.fo.properties.Property;
 import org.apache.fop.fo.properties.SpaceProperty;
+
+// SAX
 import org.xml.sax.Locator;
 
 /**
@@ -214,8 +216,11 @@ public class FOText extends FONode {
             ancestorFONode = ancestorFONode.parent;
             if (ancestorFONode instanceof org.apache.fop.fo.pagination.Title) {
                 return;
+            } else if (ancestorFONode instanceof org.apache.fop.fo.flow.Marker) {
+                return;
             } else if (ancestorFONode instanceof Root) {
-                getLogger().warn("Unexpected: fo:text with no fo:block ancestor");
+                getLogger().warn("Unexpected: fo:text with no fo:block ancestor. The text is: " 
+                        + new String(ca));
                 return;
             } else if (ancestorFONode instanceof Block) {
                 this.ancestorBlock = (Block)ancestorFONode;