bckfnn 2004/09/22 01:29:45
Modified: src/java/org/apache/fop/render/ps PSRenderer.java
src/java/org/apache/fop/render/awt AWTRenderer.java
src/java/org/apache/fop/render/svg SVGRenderer.java
src/java/org/apache/fop/render/xml XMLRenderer.java
Log:
Use content ipd/bpd instead of allocation width/height.
Revision Changes Path
1.31 +9 -9 xml-fop/src/java/org/apache/fop/render/ps/PSRenderer.java
Index: PSRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/ps/PSRenderer.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- PSRenderer.java 9 Jul 2004 17:27:12 -0000 1.30
+++ PSRenderer.java 22 Sep 2004 08:29:44 -0000 1.31
@@ -522,8 +522,8 @@
saveGraphicsState();
int x = bv.getXOffset() + containingIPPosition;
int y = bv.getYOffset() + containingBPPosition;
- int width = bv.getWidth();
- int height = bv.getHeight();
+ int width = bv.getIPD();
+ int height = bv.getBPD();
clip(x, y, width, height);
}
@@ -556,11 +556,11 @@
double[] vals = ctm.toArray();
//boolean aclock = vals[2] == 1.0;
if (vals[2] == 1.0) {
- ctm = ctm.translate(-saveBP - bv.getHeight(), -saveIP);
+ ctm = ctm.translate(-saveBP - bv.getBPD(), -saveIP);
} else if (vals[0] == -1.0) {
- ctm = ctm.translate(-saveIP - bv.getWidth(), -saveBP -
bv.getHeight());
+ ctm = ctm.translate(-saveIP - bv.getIPD(), -saveBP -
bv.getBPD());
} else {
- ctm = ctm.translate(saveBP, saveIP - bv.getWidth());
+ ctm = ctm.translate(saveBP, saveIP - bv.getIPD());
}
}
@@ -573,8 +573,8 @@
saveGraphicsState();
int x = bv.getXOffset();
int y = bv.getYOffset();
- int width = bv.getWidth();
- int height = bv.getHeight();
+ int width = bv.getIPD();
+ int height = bv.getBPD();
clip(x, y, width, height);
}
@@ -599,7 +599,7 @@
currentIPPosition = saveIP;
currentBPPosition = saveBP;
- currentBPPosition += (int)(bv.getHeight());
+ currentBPPosition += (int)(bv.getAllocBPD());
}
currentFontName = saveFontName;
}
@@ -663,7 +663,7 @@
float startx = currentIPPosition;
float starty = currentBPPosition;
drawBackAndBorders(block, startx, starty,
- block.getWidth(), block.getHeight());
+ block.getIPD(), block.getBPD());
}
/**
1.31 +1 -1 xml-fop/src/java/org/apache/fop/render/awt/AWTRenderer.java
Index: AWTRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/awt/AWTRenderer.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- AWTRenderer.java 9 Sep 2004 07:29:40 -0000 1.30
+++ AWTRenderer.java 22 Sep 2004 08:29:45 -0000 1.31
@@ -459,7 +459,7 @@
graphics.drawString(s, 220, 200);
// TODO: render text decorations
- currentBlockIPPosition += text.getWidth();
+ currentBlockIPPosition += text.getAllocIPD();
}
/** @see org.apache.fop.render.AbstractRenderer */
1.18 +1 -1 xml-fop/src/java/org/apache/fop/render/svg/SVGRenderer.java
Index: SVGRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/svg/SVGRenderer.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- SVGRenderer.java 9 Jul 2004 20:05:41 -0000 1.17
+++ SVGRenderer.java 22 Sep 2004 08:29:45 -0000 1.18
@@ -380,7 +380,7 @@
currentBlockIPPosition / 1000,
(currentBPPosition + area.getOffset()
- area.getRuleThickness() / 2) / 1000,
- (currentBlockIPPosition + area.getWidth()) / 1000,
+ (currentBlockIPPosition + area.getIPD()) / 1000,
(currentBPPosition + area.getOffset()
- area.getRuleThickness() / 2) / 1000);
line.setAttributeNS(null, "style", style);
1.28 +5 -6 xml-fop/src/java/org/apache/fop/render/xml/XMLRenderer.java
Index: XMLRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/xml/XMLRenderer.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- XMLRenderer.java 9 Sep 2004 07:29:40 -0000 1.27
+++ XMLRenderer.java 22 Sep 2004 08:29:45 -0000 1.28
@@ -331,9 +331,8 @@
* @see org.apache.fop.render.AbstractRenderer#renderBlock(Block)
*/
protected void renderBlock(Block block) {
- String prop = " width=\"" + block.getWidth() +
- "\" ipd=\"" + block.getIPD() +
- "\" height=\"" + block.getHeight() + "\"";
+ String prop = " ipd=\"" + block.getIPD() +
+ "\" bpd=\"" + block.getBPD() + "\"";
Map map = block.getTraits();
if (map != null) {
prop = prop + " props=\"" + getPropString(map) + "\"";
@@ -352,7 +351,7 @@
if (map != null) {
prop = " props=\"" + getPropString(map) + "\"";
}
- writeStartTag("<lineArea height=\"" + line.getHeight() + "\""
+ writeStartTag("<lineArea bpd=\"" + line.getBPD() + "\""
+ prop + ">");
super.renderLineArea(line);
writeEndTag("</lineArea>");
@@ -414,7 +413,7 @@
* @see org.apache.fop.render.Renderer#renderInlineSpace(Space)
*/
protected void renderInlineSpace(Space space) {
- writeElement("<space width=\"" + space.getWidth() + "\"/>");
+ writeElement("<space ipd=\"" + space.getIPD() + "\"/>");
}
/**
@@ -470,7 +469,7 @@
style = "ridge";
break;
}
- writeElement("<leader width=\"" + area.getWidth()
+ writeElement("<leader ipd=\"" + area.getIPD()
+ "\" ruleStyle=\"" + style
+ "\" ruleThickness=\"" + area.getRuleThickness()
+ "\"/>");
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
