bckfnn 2004/09/22 01:27:21
Modified: src/java/org/apache/fop/render AbstractRenderer.java
Log:
Use content ipd/bpd instead of allocation width/height.
Revision Changes Path
1.34 +10 -10 xml-fop/src/java/org/apache/fop/render/AbstractRenderer.java
Index: AbstractRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/AbstractRenderer.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- AbstractRenderer.java 7 Sep 2004 20:47:11 -0000 1.33
+++ AbstractRenderer.java 22 Sep 2004 08:27:21 -0000 1.34
@@ -457,7 +457,7 @@
renderBlocks(bv, children);
currentIPPosition = saveIP;
- currentBPPosition = saveBP + bv.getHeight();
+ currentBPPosition = saveBP + bv.getAllocBPD();
}
}
@@ -491,7 +491,7 @@
currentBlockIPPosition =
currentIPPosition + line.getStartIndent();
renderLineArea(line);
- currentBPPosition += line.getHeight();
+ currentBPPosition += line.getAllocBPD();
}
}
}
@@ -506,7 +506,7 @@
if (children == null) {
handleBlockTraits(block);
// simply move position
- currentBPPosition += block.getHeight();
+ currentBPPosition += block.getAllocBPD();
} else if (block instanceof BlockViewport) {
renderBlockViewport((BlockViewport) block, children);
} else {
@@ -534,7 +534,7 @@
renderBlocks(block, children);
// stacked and relative blocks effect stacking
- currentBPPosition = saveBP + block.getHeight();
+ currentBPPosition = saveBP + block.getAllocBPD();
}
currentIPPosition = saveIP;
}
@@ -576,7 +576,7 @@
/** @see org.apache.fop.render.Renderer */
protected void renderCharacter(Character ch) {
- currentBlockIPPosition += ch.getWidth();
+ currentBlockIPPosition += ch.getAllocIPD();
}
/** @see org.apache.fop.render.Renderer */
@@ -585,17 +585,17 @@
// for the current block by the width or height of the space
// it may also have styling (only on this object) that needs
// handling
- currentBlockIPPosition += space.getWidth();
+ currentBlockIPPosition += space.getAllocIPD();
}
/** @see org.apache.fop.render.Renderer */
protected void renderLeader(Leader area) {
- currentBlockIPPosition += area.getWidth();
+ currentBlockIPPosition += area.getAllocIPD();
}
/** @see org.apache.fop.render.Renderer */
protected void renderText(TextArea text) {
- currentBlockIPPosition += text.getWidth();
+ currentBlockIPPosition += text.getAllocIPD();
}
/** @see org.apache.fop.render.Renderer */
@@ -605,7 +605,7 @@
while (iter.hasNext()) {
renderInlineArea((InlineArea) iter.next());
}
- currentBlockIPPosition = saveIP + ip.getWidth();
+ currentBlockIPPosition = saveIP + ip.getAllocIPD();
}
/** @see org.apache.fop.render.Renderer */
@@ -621,7 +621,7 @@
} else if (content instanceof ForeignObject) {
renderForeignObject((ForeignObject) content, contpos);
}
- currentBlockIPPosition += viewport.getWidth();
+ currentBlockIPPosition += viewport.getAllocIPD();
currentBPPosition = saveBP;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
