updated for Table tags structure, #28

Author: Intelligent2013

fop-core/src/main/java/org/apache/fop/pdf/PDFStructElem.java

@@ -26,8 +26,10 @@
 import java.util.*;
 
 import org.apache.fop.accessibility.StructureTreeElement;
+import org.apache.fop.fo.extensions.InternalElementMapping;
 import org.apache.fop.pdf.StandardStructureAttributes.Table;
 import org.apache.fop.util.LanguageTags;
+import org.xml.sax.Attributes;
 
 /**
  * Class representing a PDF Structure Element.
@@ -255,22 +257,29 @@ protected boolean attachKids() {
         return kidsAttached;
     }
 
-    public void setTableAttributeColSpan(int colSpan) {
-        setTableAttributeRowColumnSpan("ColSpan", colSpan);
+    public void setTableAttributeColSpan(int colSpan, Attributes attributes) {
+        setTableAttributeRowColumnSpan("ColSpan", colSpan, attributes);
     }
 
-    public void setTableAttributeRowSpan(int rowSpan) {
-        setTableAttributeRowColumnSpan("RowSpan", rowSpan);
+    public void setTableAttributeRowSpan(int rowSpan, Attributes attributes) {
+        setTableAttributeRowColumnSpan("RowSpan", rowSpan, attributes);
     }
 
-    private void setTableAttributeRowColumnSpan(String typeSpan, int span) {
+    private void setTableAttributeRowColumnSpan(String typeSpan, int span, Attributes attributes) {
         PDFDictionary attribute = new PDFDictionary();
         attribute.put("O", Table.NAME);
         attribute.put(typeSpan, span);
-        if (attributes == null) {
-            attributes = new ArrayList<PDFDictionary>(attribute.entries.size());
+        String scopeAttribute = attributes.getValue(InternalElementMapping.URI,
+                InternalElementMapping.SCOPE);
+        Table.Scope scope = (scopeAttribute == null)
+                ? Table.Scope.COLUMN
+                : Table.Scope.valueOf(scopeAttribute.toUpperCase(Locale.ENGLISH));
+        attribute.put("Scope", scope.getName());
+
+        if (this.attributes == null) {
+            this.attributes = new ArrayList<PDFDictionary>(attribute.entries.size());
         }
-        attributes.add(attribute);
+        this.attributes.add(attribute);
     }
 
     public List<PDFObject> getKids() {
@@ -281,7 +290,7 @@ public int output(OutputStream stream) throws IOException {
         if (getDocument() != null && getDocument().getProfile().getPDFUAMode().isEnabled()) {
             if (entries.containsKey("Alt") && "".equals(get("Alt"))) {
                 put("Alt", "No alternate text specified");
-            } else if (kids != null) {
+            } else if (kids != null && structureType != null) {
                 for (PDFObject kid : kids) {
                     if (kid instanceof PDFStructElem && isBSLE(((PDFStructElem) kid))) {
                         structureType = StandardStructureTypes.Grouping.DIV;

fop-core/src/main/java/org/apache/fop/render/pdf/PDFStructureTreeBuilder.java

@@ -19,12 +19,11 @@
 
 package org.apache.fop.render.pdf;
 
-import java.util.LinkedList;
-import java.util.Locale;
-import java.util.Map;
+import java.util.*;
 
 import javax.xml.XMLConstants;
 
+import org.apache.fop.pdf.*;
 import org.xml.sax.Attributes;
 import org.xml.sax.helpers.AttributesImpl;
 
@@ -34,16 +33,9 @@
 import org.apache.fop.fo.extensions.ExtensionElementMapping;
 import org.apache.fop.fo.extensions.InternalElementMapping;
 import org.apache.fop.fo.pagination.Flow;
-import org.apache.fop.pdf.PDFFactory;
-import org.apache.fop.pdf.PDFParentTree;
-import org.apache.fop.pdf.PDFStructElem;
-import org.apache.fop.pdf.PDFStructTreeRoot;
 import org.apache.fop.pdf.StandardStructureAttributes.Table.Scope;
-import org.apache.fop.pdf.StandardStructureTypes;
 import org.apache.fop.pdf.StandardStructureTypes.Grouping;
 import org.apache.fop.pdf.StandardStructureTypes.Table;
-import org.apache.fop.pdf.StructureHierarchyMember;
-import org.apache.fop.pdf.StructureType;
 import org.apache.fop.util.LanguageTags;
 import org.apache.fop.util.XMLUtil;
 
@@ -314,11 +306,11 @@ protected void registerStructureElement(PDFStructElem structureElement, PDFFacto
         protected void setAttributes(PDFStructElem structElem, Attributes attributes) {
             String columnSpan = attributes.getValue("number-columns-spanned");
             if (columnSpan != null) {
-                structElem.setTableAttributeColSpan(Integer.parseInt(columnSpan));
+                structElem.setTableAttributeColSpan(Integer.parseInt(columnSpan), attributes);
             }
             String rowSpan = attributes.getValue("number-rows-spanned");
             if (rowSpan != null) {
-                structElem.setTableAttributeRowSpan(Integer.parseInt(rowSpan));
+                structElem.setTableAttributeRowSpan(Integer.parseInt(rowSpan), attributes);
             }
         }