Author: vhennebert
Date: Thu Oct 15 16:25:08 2009
New Revision: 825555
URL: http://svn.apache.org/viewvc?rev=825555&view=rev
Log:
Added mappings for yet unimplemented FOs.
Return /NonStruct instead of null if no mapping is found for a given object, in
order to at least generate a valid PDF
Modified:
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pdf/FOToPDFRoleMap.java
Modified:
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pdf/FOToPDFRoleMap.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pdf/FOToPDFRoleMap.java?rev=825555&r1=825554&r2=825555&view=diff
==============================================================================
---
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pdf/FOToPDFRoleMap.java
(original)
+++
xmlgraphics/fop/branches/Temp_Accessibility/src/java/org/apache/fop/render/pdf/FOToPDFRoleMap.java
Thu Oct 15 16:25:08 2009
@@ -28,18 +28,24 @@
/**
* This class provides the standard mappings from Formatting Objects to PDF
structure types.
*/
-public final class FOToPDFRoleMap {
+final class FOToPDFRoleMap {
private static final Map STANDARD_MAPPINGS = new java.util.HashMap();
private static final PDFName TFOOT = new PDFName("TFoot");
private static final PDFName THEAD = new PDFName("THead");
+ private static final PDFName NON_STRUCT = new PDFName("NonStruct");
static {
addMapping("block", "P");
- addMapping("block-container", "Div");
- PDFName st = new PDFName("Span");
+ PDFName st = new PDFName("Div");
+ addMapping("block-container", st);
+ addMapping("inline-container", st);
+ addMapping("table-and-caption", st);
+ addMapping("float", st);
+
+ st = new PDFName("Span");
addMapping("inline", st);
addMapping("wrapper", st);
addMapping("character", st);
@@ -58,6 +64,7 @@
addMapping("external-graphic", st);
addMapping("instream-foreign-object", st);
+ addMapping("table-caption", "Caption");
addMapping("table", "Table");
addMapping("table-body", "TBody");
addMapping("table-header", THEAD);
@@ -98,8 +105,9 @@
Mapper mapper = (Mapper)STANDARD_MAPPINGS.get(fo);
if (mapper != null) {
return mapper.getStructureType(parent);
+ } else {
+ return NON_STRUCT;
}
- return null;
}
private interface Mapper {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
