diff options
| author | Jeremias Maerki <jeremias@apache.org> | 2008-12-19 14:26:37 +0000 |
|---|---|---|
| committer | Jeremias Maerki <jeremias@apache.org> | 2008-12-19 14:26:37 +0000 |
| commit | e8383ed28560a67758a45f0b421021b210d6ca1f (patch) | |
| tree | 0c2243e9cc93e7255b34707c5a9f260629274866 /src/java/org/apache/fop/render | |
| parent | 34ecb4c0e098856c1249025865c05ea34b46b51e (diff) | |
| parent | d928079360d10cb230640a6b2a4992f6ee87b16d (diff) | |
| download | xmlgraphics-fop-e8383ed28560a67758a45f0b421021b210d6ca1f.tar.gz xmlgraphics-fop-e8383ed28560a67758a45f0b421021b210d6ca1f.zip | |
Merge from Trunk revisions 724690 - 728025.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_AreaTreeNewDesign@728031 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org/apache/fop/render')
3 files changed, 10 insertions, 7 deletions
diff --git a/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java b/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java index 2e04f2d85..54f6170db 100644 --- a/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java +++ b/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java @@ -26,7 +26,14 @@ import java.awt.geom.Rectangle2D; import java.util.List; import java.util.Map; +import org.w3c.dom.Document; + import org.apache.batik.parser.AWTTransformProducer; + +import org.apache.xmlgraphics.image.loader.ImageSize; +import org.apache.xmlgraphics.util.QName; +import org.apache.xmlgraphics.util.UnitConv; + import org.apache.fop.area.Area; import org.apache.fop.area.Block; import org.apache.fop.area.BlockViewport; @@ -42,10 +49,6 @@ import org.apache.fop.fo.Constants; import org.apache.fop.fo.extensions.ExtensionElementMapping; import org.apache.fop.fonts.FontMetrics; import org.apache.fop.traits.BorderProps; -import org.apache.xmlgraphics.image.loader.ImageSize; -import org.apache.xmlgraphics.util.QName; -import org.apache.xmlgraphics.util.UnitConv; -import org.w3c.dom.Document; /** * Abstract base class for renderers like PDF and PostScript where many painting operations @@ -383,7 +386,7 @@ public abstract class AbstractPathOrientedRenderer extends PrintRenderer { endTextObject(); float sx1 = startx; - float sx2 = (slant[START] ? sx1 + borderWidth[AFTER] - clipw[AFTER] : sx1); + float sx2 = (slant[START] ? sx1 + borderWidth[START] - clipw[START] : sx1); float ex1 = startx + width; float ex2 = (slant[AFTER] ? ex1 - borderWidth[END] + clipw[END] : ex1); float outery = starty + height + clipw[AFTER]; diff --git a/src/java/org/apache/fop/render/afp/extensions/AFPElement.java b/src/java/org/apache/fop/render/afp/extensions/AFPElement.java index 2fdd32649..3104ced6f 100755 --- a/src/java/org/apache/fop/render/afp/extensions/AFPElement.java +++ b/src/java/org/apache/fop/render/afp/extensions/AFPElement.java @@ -53,6 +53,6 @@ public class AFPElement extends AbstractAFPExtensionObject { /** {@inheritDoc} */ protected ExtensionAttachment instantiateExtensionAttachment() { - return new AFPPageSetup(getName()); + return new AFPPageSetup(getLocalName()); } } diff --git a/src/java/org/apache/fop/render/afp/extensions/AFPPageSetup.java b/src/java/org/apache/fop/render/afp/extensions/AFPPageSetup.java index 998ce6921..d4b8e8a59 100644 --- a/src/java/org/apache/fop/render/afp/extensions/AFPPageSetup.java +++ b/src/java/org/apache/fop/render/afp/extensions/AFPPageSetup.java @@ -20,7 +20,7 @@ package org.apache.fop.render.afp.extensions; /** - * This is the pass-through value object for the PostScript extension. + * This is the pass-through value object for the AFP extension. */ public class AFPPageSetup extends AFPExtensionAttachment { |