From 61a8216891526346dc7370d4b194107ba383bb61 Mon Sep 17 00:00:00 2001 From: Simon Steiner Date: Tue, 28 Jul 2015 14:46:09 +0000 Subject: FOP-2499: PDF/UA warnings for nested elements git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1693102 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/fop/pdf/PDFStructElem.java | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) (limited to 'src/java/org/apache/fop') diff --git a/src/java/org/apache/fop/pdf/PDFStructElem.java b/src/java/org/apache/fop/pdf/PDFStructElem.java index ac755bd4b..19864f6e3 100644 --- a/src/java/org/apache/fop/pdf/PDFStructElem.java +++ b/src/java/org/apache/fop/pdf/PDFStructElem.java @@ -21,7 +21,9 @@ package org.apache.fop.pdf; import java.io.IOException; import java.io.OutputStream; + import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Locale; @@ -244,13 +246,30 @@ public class PDFStructElem extends StructureHierarchyMember } public int output(OutputStream stream) throws IOException { - if (getDocument().getProfile().getPDFUAMode().isEnabled() - && entries.containsKey("Alt") && "".equals(get("Alt"))) { - put("Alt", "No alternate text specified"); + if (getDocument().getProfile().getPDFUAMode().isEnabled()) { + if (entries.containsKey("Alt") && "".equals(get("Alt"))) { + put("Alt", "No alternate text specified"); + } else if (kids != null) { + for (PDFObject kid : kids) { + if (kid instanceof PDFStructElem + && !(kid instanceof Placeholder) + && structureType.toString().equals("P") + && isBSLE(((PDFStructElem) kid).getStructureType().toString())) { + structureType = StandardStructureTypes.Grouping.DIV; + put("S", StandardStructureTypes.Grouping.DIV.getName()); + break; + } + } + } } return super.output(stream); } + private boolean isBSLE(String type) { + String[] blseValues = {"Table", "L", "P"}; + return Arrays.asList(blseValues).contains(type); + } + /** * Class representing a placeholder for a PDF Structure Element. */ -- cgit v1.2.3