Fixing SVGSALAMANDER-43. Tspan now can handle differently sized X and Y coord arrays. Improved Tspan layout.

git-svn-id: https://svn.java.net/svn/svgsalamander~svn/trunk/svg-core@184 7dc7fa77-23fb-e6ad-8e2e-c86bd48ed22b

1 files changed, 10 insertions, 6 deletions

diff --git a/src/main/java/com/kitfox/svg/Text.java b/src/main/java/com/kitfox/svg/Text.java
index a83c389..fe958aa 100644
--- a/src/main/java/com/kitfox/svg/Text.java
+++ b/src/main/java/com/kitfox/svg/Text.java
@@ -41,6 +41,7 @@ import java.awt.Shape;
 import java.awt.font.FontRenderContext;

 import java.awt.geom.AffineTransform;

 import java.awt.geom.GeneralPath;

+import java.awt.geom.Point2D;

 import java.awt.geom.Rectangle2D;

 import java.util.Iterator;

 import java.util.LinkedList;

@@ -415,12 +416,15 @@ public class Text extends ShapeElement
                  */

 

 

-                Tspan tspan = (Tspan) obj;

-                tspan.setCursorX(cursorX);

-                tspan.setCursorY(cursorY);

-                tspan.addShape(textPath);

-                cursorX = tspan.getCursorX();

-                cursorY = tspan.getCursorY();

+                Tspan tspan = (Tspan)obj;

+                Point2D cursor = new Point2D.Float(cursorX, cursorY);

+//                tspan.setCursorX(cursorX);

+//                tspan.setCursorY(cursorY);

+                tspan.appendToShape(textPath, cursor);

+//                cursorX = tspan.getCursorX();

+//                cursorY = tspan.getCursorY();

+                cursorX = (float)cursor.getX();

+                cursorY = (float)cursor.getY();

 

             }

         }