pbwest 2002/11/13 07:15:37
Modified: src/org/apache/fop/fo Tag: FOP_0-20-0_Alt-Design
FObjectSets.java
Log:
Reversed the sense of normal and outOfLine objects sets.
outOfLine sets now (sensibly) refer to the fo:s available as descendents
of out-of-line objects.
Revision Changes Path
No revision
No revision
1.1.2.2 +33 -14 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.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- FObjectSets.java 7 Nov 2002 23:32:32 -0000 1.1.2.1
+++ FObjectSets.java 13 Nov 2002 15:15:37 -0000 1.1.2.2
@@ -44,6 +44,7 @@
/** The set of FOs comprising the inline entity.
* See 6.14 Formatting Object Content. */
private static final BitSet inline;
+
/** The publicly accessible inline entity set.
* See 6.14 Formatting Object Content. */
public static final ROBitSet inlineEntity;
@@ -63,25 +64,42 @@
inlineEntity = new ROBitSet(inline);
}
+ /** The set of FOs available wherever %block; is allowed
+ * including within descendents of out-of-line FOs.
+ * See 6.14 Formatting Object Content. */
+ private static final BitSet outOfLineBlock;
+
+ /** The publicly accessible set of FOs available wherever
+ * %block; is allowed, including within descendents from
+ * out-of-line FOs.
+ * See 6.14 Formatting Object Content. */
+ public static final ROBitSet outOfLineBlockSet;
+ static {
+ outOfLineBlock = (BitSet)(block.clone());
+ outOfLineBlock.set(FObjectNames.FLOAT);
+ outOfLineBlockSet = new ROBitSet(outOfLineBlock);
+ }
+
/** The set of FOs available wherever #PCDATA|%block;|%inline; is allowed
* including within descendents of out-of-line FOs.
* See 6.14 Formatting Object Content. */
- private static final BitSet pcdataBlockInline;
+ private static final BitSet outOfLinePcdataBlockInline;
/** The publicly accessible set of FOs available wherever
* #PCDATA|%block;|%inline; is allowed, including within descendents from
* out-of-line FOs.
* See 6.14 Formatting Object Content. */
- public static final ROBitSet pcdataBlockInlineSet;
+ public static final ROBitSet outOfLinePcdataBlockInlineSet;
static {
- pcdataBlockInline = new BitSet();
- pcdataBlockInline.set(FObjectNames.WRAPPER);;
- pcdataBlockInline.set(FObjectNames.RETRIEVE_MARKER);;
- pcdataBlockInline.set(FObjectNames.MULTI_SWITCH);;
- pcdataBlockInline.set(FObjectNames.MULTI_PROPERTIES);;
- pcdataBlockInline.or(block);;
- pcdataBlockInline.or(inline);;
- pcdataBlockInlineSet = new ROBitSet(pcdataBlockInline);
+ outOfLinePcdataBlockInline = new BitSet();
+ outOfLinePcdataBlockInline.set(FObjectNames.WRAPPER);
+ outOfLinePcdataBlockInline.set(FObjectNames.RETRIEVE_MARKER);
+ outOfLinePcdataBlockInline.set(FObjectNames.MULTI_SWITCH);
+ outOfLinePcdataBlockInline.set(FObjectNames.MULTI_PROPERTIES);
+ outOfLinePcdataBlockInline.or(block);
+ outOfLinePcdataBlockInline.or(inline);
+ outOfLinePcdataBlockInlineSet =
+ new ROBitSet(outOfLinePcdataBlockInline);
}
/**
@@ -96,9 +114,10 @@
public static final ROBitSet normalPcdataBlockInlineSet;
static {
normalPcdataBlockInline = new BitSet();
- normalPcdataBlockInline.or(pcdataBlockInline);
+ normalPcdataBlockInline.or(outOfLinePcdataBlockInline);
normalPcdataBlockInline.set(FObjectNames.FLOAT);
- normalPcdataBlockInlineSet = new ROBitSet(normalPcdataBlockInline);
+ normalPcdataBlockInlineSet =
+ new ROBitSet(normalPcdataBlockInline);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
