FOP-3264: Footnote accessibility should use reference typeHEADmain

2 files changed, 5 insertions, 2 deletions

diff --git a/fop-core/src/main/java/org/apache/fop/pdf/PDFStructElem.java b/fop-core/src/main/java/org/apache/fop/pdf/PDFStructElem.java
index cc299fa1d..838703a77 100644
--- a/fop-core/src/main/java/org/apache/fop/pdf/PDFStructElem.java
+++ b/fop-core/src/main/java/org/apache/fop/pdf/PDFStructElem.java
@@ -267,6 +267,9 @@ public class PDFStructElem extends StructureHierarchyMember implements Structure
     }
 
     public int output(OutputStream stream) throws IOException {
+        if (structureType == StandardStructureTypes.InlineLevelStructure.NOTE) {
+            put("ID", "Note ID " + getObjectNumber().getNumber());
+        }
         if (getDocument() != null && getDocument().getProfile().getPDFUAMode().isEnabled()) {
             if (entries.containsKey("Alt") && "".equals(get("Alt"))) {
                 put("Alt", "No alternate text specified");
diff --git a/fop-core/src/main/java/org/apache/fop/render/pdf/PDFStructureTreeBuilder.java b/fop-core/src/main/java/org/apache/fop/render/pdf/PDFStructureTreeBuilder.java
index 949fdb22d..4080b5bb1 100644
--- a/fop-core/src/main/java/org/apache/fop/render/pdf/PDFStructureTreeBuilder.java
+++ b/fop-core/src/main/java/org/apache/fop/render/pdf/PDFStructureTreeBuilder.java
@@ -94,8 +94,8 @@ public class PDFStructureTreeBuilder implements StructureTreeEventHandler {
         addBuilder("basic-link",                new LinkBuilder());
         // Out-of-Line Formatting Objects
         addBuilder("float",                     StandardStructureTypes.Grouping.DIV);
-        addBuilder("footnote",                  StandardStructureTypes.InlineLevelStructure.NOTE);
-        addBuilder("footnote-body",             StandardStructureTypes.Grouping.SECT);
+        addBuilder("footnote",                  StandardStructureTypes.InlineLevelStructure.REFERENCE);
+        addBuilder("footnote-body",             StandardStructureTypes.InlineLevelStructure.NOTE);
         // Other Formatting Objects
         addBuilder("wrapper",                   StandardStructureTypes.InlineLevelStructure.SPAN);
         addBuilder("marker",                    StandardStructureTypes.Grouping.PRIVATE);