pbwest 2002/11/20 22:57:42
Modified: src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
FObjectSets.java
Log:
Moved FOOTNOTE into inlineEntity because the spec. is so dodgy about fo:footnote.
Revision Changes Path
No revision
No revision
1.1.2.3 +6 -3 xml-fop/src/org/apache/fop/fo/Attic/FObjectSets.java
Index: FObjectSets.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/fo/Attic/FObjectSets.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- FObjectSets.java 13 Nov 2002 15:15:37 -0000 1.1.2.2
+++ FObjectSets.java 21 Nov 2002 06:57:42 -0000 1.1.2.3
@@ -61,6 +61,8 @@
inline.set(FObjectNames.LEADER);
inline.set(FObjectNames.BASIC_LINK);
inline.set(FObjectNames.MULTI_TOGGLE);
+ // Moved FOOTNOTE here because it may occur in static-content
+ inline.set(FObjectNames.FOOTNOTE);
inlineEntity = new ROBitSet(inline);
}
@@ -134,7 +136,8 @@
normalPcdataInline = new BitSet();
normalPcdataInline.or(inline);
normalPcdataInline.set(FObjectNames.FLOAT);
- normalPcdataInline.set(FObjectNames.FOOTNOTE);
+ // Removed FOOTNOTE because it may occur in static-content
+ //normalPcdataInline.set(FObjectNames.FOOTNOTE);
normalPcdataInlineSet = new ROBitSet(normalPcdataInline);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
