FOP-2475: Tagged PDF footnote separator incorrect order

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

2 files changed, 8 insertions, 3 deletions

diff --git a/src/java/org/apache/fop/render/pdf/PDFStructureTreeBuilder.java b/src/java/org/apache/fop/render/pdf/PDFStructureTreeBuilder.java
index f89d574e3..b00c60a9b 100644
--- a/src/java/org/apache/fop/render/pdf/PDFStructureTreeBuilder.java
+++ b/src/java/org/apache/fop/render/pdf/PDFStructureTreeBuilder.java
@@ -47,7 +47,7 @@ import org.apache.fop.pdf.StructureType;
 import org.apache.fop.util.LanguageTags;
 import org.apache.fop.util.XMLUtil;
 
-class PDFStructureTreeBuilder implements StructureTreeEventHandler {
+public class PDFStructureTreeBuilder implements StructureTreeEventHandler {
 
     private static final String ROLE = "role";
 
@@ -347,7 +347,7 @@ class PDFStructureTreeBuilder implements StructureTreeEventHandler {
                 new AttributesImpl(), pdfFactory, eventBroadcaster);
     }
 
-    private static PDFStructElem createStructureElement(String name, StructureHierarchyMember parent,
+    public static PDFStructElem createStructureElement(String name, StructureHierarchyMember parent,
                 Attributes attributes, PDFFactory pdfFactory, EventBroadcaster eventBroadcaster) {
             StructureElementBuilder builder = BUILDERS.get(name);
             if (builder == null) {
diff --git a/src/java/org/apache/fop/render/pdf/PageSequenceStructElem.java b/src/java/org/apache/fop/render/pdf/PageSequenceStructElem.java
index 09d5b81a2..c660d2496 100644
--- a/src/java/org/apache/fop/render/pdf/PageSequenceStructElem.java
+++ b/src/java/org/apache/fop/render/pdf/PageSequenceStructElem.java
@@ -27,7 +27,7 @@ import org.apache.fop.pdf.PDFObject;
 import org.apache.fop.pdf.PDFStructElem;
 import org.apache.fop.pdf.StructureType;
 
-class PageSequenceStructElem extends PDFStructElem {
+public class PageSequenceStructElem extends PDFStructElem {
 
     private List<PDFStructElem> regionBefores = new ArrayList<PDFStructElem>();
 
@@ -37,6 +37,8 @@ class PageSequenceStructElem extends PDFStructElem {
 
     private List<PDFStructElem> regionEnds = new ArrayList<PDFStructElem>();
 
+    private List<PDFStructElem> footnoteSeparator = new ArrayList<PDFStructElem>();
+
     PageSequenceStructElem(PDFObject parent, StructureType structureType) {
         super(parent, structureType);
     }
@@ -50,6 +52,8 @@ class PageSequenceStructElem extends PDFStructElem {
             regionStarts.add(content);
         } else if (flowName.equals("xsl-region-end")) {
             regionEnds.add(content);
+        } else if (flowName.equals("xsl-footnote-separator")) {
+            footnoteSeparator.add(content);
         } else {
             addKid(content);
         }
@@ -63,6 +67,7 @@ class PageSequenceStructElem extends PDFStructElem {
         addRegions(k, regionStarts);
         addRegions(k, kids);
         addRegions(k, regionEnds);
+        addRegions(k, footnoteSeparator);
         addRegions(k, regionAfters);
         put("K", k);
         return true;