Subject: [PATCH 16/20] Simplify references to the text

---
 src/java/org/apache/fop/pdf/PDFStructElem.java |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/src/java/org/apache/fop/pdf/PDFStructElem.java b/src/java/org/apache/fop/pdf/PDFStructElem.java
index b0c1856..5e4185a 100644
--- a/src/java/org/apache/fop/pdf/PDFStructElem.java
+++ b/src/java/org/apache/fop/pdf/PDFStructElem.java
@@ -176,6 +176,24 @@ public class PDFStructElem extends PDFDictionary {
             kids.add(k);
         }
 
+        PDFPage page = (PDFPage) get("Pg");
+
+        /* simplify text references */
+        for (int i=0;i<kids.length();i++) {
+            Object e = kids.get(i);
+            if (e instanceof PDFDictionary) {
+                PDFDictionary dict = (PDFDictionary) e;
+                PDFName type = (PDFName) dict.get("Type");
+                if (type != null && "/MCR".equals(type.toString())) {
+                    if (page == null) {
+                        page = (PDFPage) dict.get("Pg");
+                        setPage(page);
+                        kids.set(i, dict.get("MCID"));
+                    } else if (page.equals(dict.get("Pg")))
+                        kids.set(i, dict.get("MCID"));
+                }
+            }
+        }
         /* prepare child nodes */
         Iterator i = kids.iterator();
         while (i.hasNext()) {
-- 
1.6.4.2