diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/java/org/apache/fop/layoutmgr/TraitSetter.java | 14 | ||||
| -rw-r--r-- | src/java/org/apache/fop/render/pdf/PDFRenderer.java | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/java/org/apache/fop/layoutmgr/TraitSetter.java b/src/java/org/apache/fop/layoutmgr/TraitSetter.java index ee515ee21..005e00b7b 100644 --- a/src/java/org/apache/fop/layoutmgr/TraitSetter.java +++ b/src/java/org/apache/fop/layoutmgr/TraitSetter.java @@ -185,23 +185,23 @@ public class TraitSetter { public static void addMargins(Area curBlock, CommonBorderAndPadding bpProps, CommonMarginBlock marginProps) { - int spaceStart = marginProps.startIndent - - bpProps.getBorderStartWidth(false) - - bpProps.getPaddingStart(false); + int spaceStart = marginProps.startIndent + - bpProps.getBorderStartWidth(false) + - bpProps.getPaddingStart(false); if (spaceStart != 0) { curBlock.addTrait(Trait.SPACE_START, new Integer(spaceStart)); } - int spaceEnd = marginProps.endIndent - - bpProps.getBorderEndWidth(false) - - bpProps.getPaddingEnd(false); + int spaceEnd = marginProps.endIndent + - bpProps.getBorderEndWidth(false) + - bpProps.getPaddingEnd(false); if (spaceEnd != 0) { curBlock.addTrait(Trait.SPACE_END, new Integer(spaceEnd)); } } public static void addBreaks(Area curArea, LayoutProps layoutProps) { - curArea.addTrait(Trait.BREAK_AFTER, new Integer(layoutProps.breakAfter)); + curArea.addTrait(Trait.BREAK_AFTER, new Integer(layoutProps.breakAfter)); curArea.addTrait(Trait.BREAK_BEFORE, new Integer(layoutProps.breakBefore)); } } diff --git a/src/java/org/apache/fop/render/pdf/PDFRenderer.java b/src/java/org/apache/fop/render/pdf/PDFRenderer.java index 5debef993..b542f23ce 100644 --- a/src/java/org/apache/fop/render/pdf/PDFRenderer.java +++ b/src/java/org/apache/fop/render/pdf/PDFRenderer.java @@ -941,8 +941,8 @@ public class PDFRenderer extends PrintRenderer { int bl = currentBPPosition + bpMarginOffset + text.getOffset(); /* System.out.println("Text = " + text.getTextArea() + - "; text width: " + text.getWidth() + - "; BlockIP Position: " + currentBlockIPPosition + + "; text width: " + text.getWidth() + + "; BlockIP Position: " + currentBlockIPPosition + "; currentBPPosition: " + currentBPPosition + "; offset: " + text.getOffset()); */ @@ -954,14 +954,14 @@ public class PDFRenderer extends PrintRenderer { closeText(); pdf.append("1 0 0 -1 " + (rx / 1000f) + " " + (bl / 1000f) + " Tm " - + (text.getTextSpaceAdjust()/1000f) + " Tw [" + startText); + + (text.getTextSpaceAdjust() / 1000f) + " Tw [" + startText); prevWordY = bl; textOpen = true; } else { closeText(); pdf.append("1 0 0 -1 " + (rx / 1000f) + " " + (bl / 1000f) + " Tm " - + (text.getTextSpaceAdjust()/1000f) + " Tw [" + startText); + + (text.getTextSpaceAdjust() / 1000f) + " Tw [" + startText); textOpen = true; } prevWordWidth = text.getWidth(); |