Bugzilla #53596: When PDF accessibility is enabled, the structure tree must contain information about the number of columns or rows spanned by a table cell.

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

1 files changed, 12 insertions, 0 deletions

diff --git a/src/java/org/apache/fop/render/pdf/PDFStructureTreeBuilder.java b/src/java/org/apache/fop/render/pdf/PDFStructureTreeBuilder.java
index 3839d47bc..0f8e74515 100644
--- a/src/java/org/apache/fop/render/pdf/PDFStructureTreeBuilder.java
+++ b/src/java/org/apache/fop/render/pdf/PDFStructureTreeBuilder.java
@@ -90,11 +90,23 @@ class PDFStructureTreeBuilder implements StructureTreeEventHandler {
         PDFStructElem parent = ancestors.getFirst();
         String role = attributes.getValue("role");
         PDFStructElem structElem = createStructureElement(name, parent, role);
+        setSpanAttributes(structElem, attributes);
         parent.addKid(structElem);
         ancestors.addFirst(structElem);
         return structElem;
     }
 
+    private void setSpanAttributes(PDFStructElem structElem, Attributes attributes) {
+        String columnSpan = attributes.getValue("number-columns-spanned");
+        if (columnSpan != null) {
+            structElem.setTableAttributeColSpan(Integer.parseInt(columnSpan));
+        }
+        String rowSpan = attributes.getValue("number-rows-spanned");
+        if (rowSpan != null) {
+            structElem.setTableAttributeRowSpan(Integer.parseInt(rowSpan));
+        }
+    }
+
     public void endNode(String name) {
         removeFirstAncestor();
     }