diff options
| author | Glenn Adams <gadams@apache.org> | 2012-02-26 02:29:01 +0000 |
|---|---|---|
| committer | Glenn Adams <gadams@apache.org> | 2012-02-26 02:29:01 +0000 |
| commit | d6d8e57b17eb2e36631115517afa003ad3afa1a1 (patch) | |
| tree | bf355ee4643080bf13b8f9fa5a1b14002e968561 /src/sandbox | |
| parent | fa6dc48793a4eb7476282141c1314f1198371a67 (diff) | |
| download | xmlgraphics-fop-d6d8e57b17eb2e36631115517afa003ad3afa1a1.tar.gz xmlgraphics-fop-d6d8e57b17eb2e36631115517afa003ad3afa1a1.zip | |
apply complex scripts patch
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1293736 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/sandbox')
| -rw-r--r-- | src/sandbox/org/apache/fop/render/mif/MIFHandler.java | 3 | ||||
| -rw-r--r-- | src/sandbox/org/apache/fop/render/svg/SVGPainter.java | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/sandbox/org/apache/fop/render/mif/MIFHandler.java b/src/sandbox/org/apache/fop/render/mif/MIFHandler.java index 0adf8bf5b..34eb7dc8d 100644 --- a/src/sandbox/org/apache/fop/render/mif/MIFHandler.java +++ b/src/sandbox/org/apache/fop/render/mif/MIFHandler.java @@ -84,7 +84,8 @@ public class MIFHandler extends FOEventHandler { public MIFHandler(FOUserAgent ua, OutputStream os) { super(ua); outStream = os; - FontSetup.setup(fontInfo, null, new DefaultFontResolver(ua)); + boolean base14Kerning = false; //TODO - FIXME + FontSetup.setup(fontInfo, null, new DefaultFontResolver(ua), base14Kerning); } /** {@inheritDoc} */ diff --git a/src/sandbox/org/apache/fop/render/svg/SVGPainter.java b/src/sandbox/org/apache/fop/render/svg/SVGPainter.java index bcc3a6913..3eba51097 100644 --- a/src/sandbox/org/apache/fop/render/svg/SVGPainter.java +++ b/src/sandbox/org/apache/fop/render/svg/SVGPainter.java @@ -49,6 +49,7 @@ import org.apache.fop.render.intermediate.IFConstants; import org.apache.fop.render.intermediate.IFContext; import org.apache.fop.render.intermediate.IFException; import org.apache.fop.render.intermediate.IFState; +import org.apache.fop.render.intermediate.IFUtil; import org.apache.fop.traits.BorderProps; import org.apache.fop.traits.RuleStyle; import org.apache.fop.util.ColorUtil; @@ -319,7 +320,7 @@ public class SVGPainter extends AbstractIFPainter implements SVGConstants { /** {@inheritDoc} */ - public void drawText(int x, int y, int letterSpacing, int wordSpacing, int[] dx, + public void drawText(int x, int y, int letterSpacing, int wordSpacing, int[][] dp, String text) throws IFException { try { establish(MODE_TEXT); @@ -333,7 +334,8 @@ public class SVGPainter extends AbstractIFPainter implements SVGConstants { if (wordSpacing != 0) { XMLUtil.addAttribute(atts, "word-spacing", SVGUtil.formatMptToPt(wordSpacing)); } - if (dx != null) { + if (dp != null) { + int[] dx = IFUtil.convertDPToDX(dp); XMLUtil.addAttribute(atts, "dx", SVGUtil.formatMptArrayToPt(dx)); } handler.startElement("text", atts); |