Changeset 5284 in josm

Timestamp:

2012-06-18T11:12:00+02:00 (13 years ago)

Author:

bastiK

Message:

reverse patches, so they are easier to use in quilt

Location:

trunk/patches

Files:

• 10trim_svgsalamander.patch (modified) (1 diff)
• 20svgsalamander_getxform.patch (modified) (1 diff)

trunk/patches/10trim_svgsalamander.patch

@@ -1 +1 @@
 Patch against rev 98 of https://svn.java.net/svn/svgsalamander~svn/trunk. It strips some classes, that aren't needed (basically animation and gui) and removes dependencies. The only purpose of this patch is to reduce binary download size for JOSM users.
-Index: josm/src/com/kitfox/svg/animation/Animate.java
+Index: core/src/com/kitfox/svg/animation/Animate.java
 ===================================================================
---- josm.orig/src/com/kitfox/svg/animation/Animate.java 2011-07-17 10:45:39.626276424 +0200
-+++ /dev/null   1970-01-01 00:00:00.000000000 +0000
-@@ -1,419 +0,0 @@
--/*
-- * Animate.java
-- *
-- *  The Salamander Project - 2D and 3D graphics libraries in Java
-- *  Copyright (C) 2004 Mark McKay
-- *
-- *  This library is free software; you can redistribute it and/or
-- *  modify it under the terms of the GNU Lesser General Public
-- *  License as published by the Free Software Foundation; either
-- *  version 2.1 of the License, or (at your option) any later version.
-- *
-- *  This library is distributed in the hope that it will be useful,
-- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- *  Lesser General Public License for more details.
-- *
-- *  You should have received a copy of the GNU Lesser General Public
-- *  License along with this library; if not, write to the Free Software
-- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-- *
-- *  Mark McKay can be contacted at mark@kitfox.com.  Salamander and other
-- *  projects can be found at http://www.kitfox.com
-- *
-- * Created on August 15, 2004, 2:51 AM
-- */
--
--package com.kitfox.svg.animation;
--
--import com.kitfox.svg.SVGElement;
--import com.kitfox.svg.SVGException;
--import com.kitfox.svg.SVGLoaderHelper;
--import com.kitfox.svg.animation.parser.AnimTimeParser;
--import com.kitfox.svg.xml.ColorTable;
--import com.kitfox.svg.xml.StyleAttribute;
--import com.kitfox.svg.xml.XMLParseUtil;
--import java.awt.Color;
--import java.awt.geom.AffineTransform;
--import java.awt.geom.GeneralPath;
--import java.awt.geom.PathIterator;
--import org.xml.sax.Attributes;
--import org.xml.sax.SAXException;
--
--
--/**
-- * Animate is a really annoying morphic tag that could represent a real value,
-- * a color or a path
-- *
-- * @author Mark McKay
-- * @author <a href="mailto:mark@kitfox.com">Mark McKay</a>
-- */
--public class Animate extends AnimateBase implements AnimateColorIface
--{
--//    StyleAttribute retAttrib = new StyleAttribute
--    public static final int DT_REAL = 0;
--    public static final int DT_COLOR = 1;
--    public static final int DT_PATH = 2;
--    int dataType = DT_REAL;
--    
--    protected double fromValue = Double.NaN;
--    protected double toValue = Double.NaN;
--    protected double byValue = Double.NaN;
--    protected double[] valuesValue;
--    
--    protected Color fromColor = null;
--    protected Color toColor = null;
--
--    protected GeneralPath fromPath = null;
--    protected GeneralPath toPath = null;
--
--    /** Creates a new instance of Animate */
--    public Animate()
--    {
--    }
--    
--    public int getDataType()
--    {
--        return dataType;
--    }
--    
--    public void loaderStartElement(SVGLoaderHelper helper, Attributes attrs, SVGElement parent) throws SAXException
--    {
--               //Load style string
--        super.loaderStartElement(helper, attrs, parent);
--
--        String strn = attrs.getValue("from");
--        if (strn != null)
--        {
--            if (XMLParseUtil.isDouble(strn))
--            {
--                fromValue = XMLParseUtil.parseDouble(strn); 
--            } 
--//            else if (attrs.getValue("attributeName").equals("d"))
--//            {
--//                fromPath = this.buildPath(strn, GeneralPath.WIND_EVEN_ODD);
--//                dataType = DT_PATH;
--//            }
--            else
--            {
--                fromColor = ColorTable.parseColor(strn); 
--                if (fromColor == null)
--                {
--                    //Try path
--                    fromPath = this.buildPath(strn, GeneralPath.WIND_EVEN_ODD);
--                    dataType = DT_PATH;
--                }
--                else dataType = DT_COLOR;
--            }
--        }
--
--        strn = attrs.getValue("to");
--        if (strn != null)
--        {
--            if (XMLParseUtil.isDouble(strn))
--            {
--                toValue = XMLParseUtil.parseDouble(strn); 
--            } 
--            else
--            {
--                toColor = ColorTable.parseColor(strn); 
--                if (toColor == null)
--                {
--                    //Try path
--                    toPath = this.buildPath(strn, GeneralPath.WIND_EVEN_ODD);
--                    dataType = DT_PATH;
--                }
--                else dataType = DT_COLOR;
--            }
--        }
--
--        strn = attrs.getValue("by");
--        try 
--        {
--            if (strn != null) byValue = XMLParseUtil.parseDouble(strn); 
--        } catch (Exception e) {}
--
--        strn = attrs.getValue("values");
--        try 
--        {
--            if (strn != null) valuesValue = XMLParseUtil.parseDoubleList(strn); 
--        } catch (Exception e) {}
--    }
--    
--    /**
--     * Evaluates this animation element for the passed interpolation time.  Interp
--     * must be on [0..1].
--     */
--    public double eval(double interp)
--    {
--        boolean fromExists = !Double.isNaN(fromValue);
--        boolean toExists = !Double.isNaN(toValue);
--        boolean byExists = !Double.isNaN(byValue);
--        boolean valuesExists = valuesValue != null;
--        
--        if (valuesExists)
--        {
--            double sp = interp * valuesValue.length;
--            int ip = (int)sp;
--            double fp = sp - ip;
--            
--            int i0 = ip;
--            int i1 = ip + 1;
--            
--            if (i0 < 0) return valuesValue[0];
--            if (i1 >= valuesValue.length) return valuesValue[valuesValue.length - 1];
--            return valuesValue[i0] * (1 - fp) + valuesValue[i1] * fp;
--        }
--        else if (fromExists && toExists)
--        {
--            return toValue * interp + fromValue * (1.0 - interp);
--        }
--        else if (fromExists && byExists)
--        {
--            return fromValue + byValue * interp;
--        }
--        else if (toExists && byExists)
--        {
--            return toValue - byValue * (1.0 - interp);
--        }
--        else if (byExists)
--        {
--            return byValue * interp;
--        }
--  
--        //Should not reach this line
--        throw new RuntimeException("Animate tag could not be evalutated - insufficient arguements");
--    }
--
--    public Color evalColor(double interp)
--    {
--        if (fromColor == null && toColor != null)
--        {
--            float[] toCol = new float[3];
--            toColor.getColorComponents(toCol);
--            return new Color(toCol[0] * (float)interp, 
--                toCol[1] * (float)interp, 
--                toCol[2] * (float)interp);
--        }
--        else if (fromColor != null && toColor != null)
--        {
--            float nInterp = 1 - (float)interp;
--            
--            float[] fromCol = new float[3];
--            float[] toCol = new float[3];
--            fromColor.getColorComponents(fromCol);
--            toColor.getColorComponents(toCol);
--            return new Color(fromCol[0] * nInterp + toCol[0] * (float)interp, 
--                fromCol[1] * nInterp + toCol[1] * (float)interp, 
--                fromCol[2] * nInterp + toCol[2] * (float)interp);
--        }
--        
--        throw new RuntimeException("Animate tag could not be evalutated - insufficient arguements");
--    }
--
--    public GeneralPath evalPath(double interp)
--    {
--        if (fromPath == null && toPath != null)
--        {
--            PathIterator itTo = toPath.getPathIterator(new AffineTransform());
--            
--            GeneralPath midPath = new GeneralPath();
--            float[] coordsTo = new float[6];
--            
--            for (; !itTo.isDone(); itTo.next())
--            {
--                int segTo = itTo.currentSegment(coordsTo);
--                
--                switch (segTo)
--                {
--                    case PathIterator.SEG_CLOSE:
--                        midPath.closePath();
--                        break;
--                    case PathIterator.SEG_CUBICTO:
--                        midPath.curveTo(
--                                (float)(coordsTo[0] * interp), 
--                                (float)(coordsTo[1] * interp), 
--                                (float)(coordsTo[2] * interp), 
--                                (float)(coordsTo[3] * interp), 
--                                (float)(coordsTo[4] * interp), 
--                                (float)(coordsTo[5] * interp)
--                                );
--                        break;
--                    case PathIterator.SEG_LINETO:
--                        midPath.lineTo(
--                                (float)(coordsTo[0] * interp), 
--                                (float)(coordsTo[1] * interp)
--                                );
--                        break;
--                    case PathIterator.SEG_MOVETO:
--                        midPath.moveTo(
--                                (float)(coordsTo[0] * interp), 
--                                (float)(coordsTo[1] * interp)
--                                );
--                        break;
--                    case PathIterator.SEG_QUADTO:
--                        midPath.quadTo(
--                                (float)(coordsTo[0] * interp), 
--                                (float)(coordsTo[1] * interp), 
--                                (float)(coordsTo[2] * interp), 
--                                (float)(coordsTo[3] * interp)
--                                );
--                        break;
--                }
--            }
--            
--            return midPath;
--        }
--        else if (toPath != null)
--        {
--            PathIterator itFrom = fromPath.getPathIterator(new AffineTransform());
--            PathIterator itTo = toPath.getPathIterator(new AffineTransform());
--            
--            GeneralPath midPath = new GeneralPath();
--            float[] coordsFrom = new float[6];
--            float[] coordsTo = new float[6];
--            
--            for (; !itFrom.isDone(); itFrom.next())
--            {
--                int segFrom = itFrom.currentSegment(coordsFrom);
--                int segTo = itTo.currentSegment(coordsTo);
--                
--                if (segFrom != segTo)
--                {
--                    throw new RuntimeException("Path shape mismatch");
--                }
--                
--                switch (segFrom)
--                {
--                    case PathIterator.SEG_CLOSE:
--                        midPath.closePath();
--                        break;
--                    case PathIterator.SEG_CUBICTO:
--                        midPath.curveTo(
--                                (float)(coordsFrom[0] * (1 - interp) + coordsTo[0] * interp), 
--                                (float)(coordsFrom[1] * (1 - interp) + coordsTo[1] * interp), 
--                                (float)(coordsFrom[2] * (1 - interp) + coordsTo[2] * interp), 
--                                (float)(coordsFrom[3] * (1 - interp) + coordsTo[3] * interp), 
--                                (float)(coordsFrom[4] * (1 - interp) + coordsTo[4] * interp), 
--                                (float)(coordsFrom[5] * (1 - interp) + coordsTo[5] * interp)
--                                );
--                        break;
--                    case PathIterator.SEG_LINETO:
--                        midPath.lineTo(
--                                (float)(coordsFrom[0] * (1 - interp) + coordsTo[0] * interp), 
--                                (float)(coordsFrom[1] * (1 - interp) + coordsTo[1] * interp)
--                                );
--                        break;
--                    case PathIterator.SEG_MOVETO:
--                        midPath.moveTo(
--                                (float)(coordsFrom[0] * (1 - interp) + coordsTo[0] * interp), 
--                                (float)(coordsFrom[1] * (1 - interp) + coordsTo[1] * interp)
--                                );
--                        break;
--                    case PathIterator.SEG_QUADTO:
--                        midPath.quadTo(
--                                (float)(coordsFrom[0] * (1 - interp) + coordsTo[0] * interp), 
--                                (float)(coordsFrom[1] * (1 - interp) + coordsTo[1] * interp), 
--                                (float)(coordsFrom[2] * (1 - interp) + coordsTo[2] * interp), 
--                                (float)(coordsFrom[3] * (1 - interp) + coordsTo[3] * interp)
--                                );
--                        break;
--                }
--            }
--            
--            return midPath;
--        }
--        
--        throw new RuntimeException("Animate tag could not be evalutated - insufficient arguements");
--    }
--    
--    /**
--     * If this element is being accumulated, detemine the delta to accumulate by
--     */
--    public double repeatSkipSize(int reps)
--    {
--        boolean fromExists = !Double.isNaN(fromValue);
--        boolean toExists = !Double.isNaN(toValue);
--        boolean byExists = !Double.isNaN(byValue);
--        
--        if (fromExists && toExists)
--        {
--            return (toValue - fromValue) * reps;
--        }
--        else if (fromExists && byExists)
--        {
--            return (fromValue + byValue) * reps;
--        }
--        else if (toExists && byExists)
--        {
--            return toValue * reps;
--        }
--        else if (byExists)
--        {
--            return byValue * reps;
--        }
--
--        //Should not reach this line
--        return 0;
--    }
--
--    protected void rebuild(AnimTimeParser animTimeParser) throws SVGException
--    {
--        super.rebuild(animTimeParser);
--
--        StyleAttribute sty = new StyleAttribute();
--
--        if (getPres(sty.setName("from")))
--        {
--            String strn = sty.getStringValue();
--            if (XMLParseUtil.isDouble(strn))
--            {
--                fromValue = XMLParseUtil.parseDouble(strn);
--            }
--            else
--            {
--                fromColor = ColorTable.parseColor(strn);
--                if (fromColor == null)
--                {
--                    //Try path
--                    fromPath = this.buildPath(strn, GeneralPath.WIND_EVEN_ODD);
--                    dataType = DT_PATH;
--                }
--                else dataType = DT_COLOR;
--            }
--        }
--
--        if (getPres(sty.setName("to")))
--        {
--            String strn = sty.getStringValue();
--            if (XMLParseUtil.isDouble(strn))
--            {
--                toValue = XMLParseUtil.parseDouble(strn);
--            }
--            else
--            {
--                toColor = ColorTable.parseColor(strn);
--                if (toColor == null)
--                {
--                    //Try path
--                    toPath = this.buildPath(strn, GeneralPath.WIND_EVEN_ODD);
--                    dataType = DT_PATH;
--                }
--                else dataType = DT_COLOR;
--            }
--        }
--
--        if (getPres(sty.setName("by")))
--        {
--            String strn = sty.getStringValue();
--            if (strn != null) byValue = XMLParseUtil.parseDouble(strn);
--        }
--
--        if (getPres(sty.setName("values")))
--        {
--            String strn = sty.getStringValue();
--            if (strn != null) valuesValue = XMLParseUtil.parseDoubleList(strn);
--        }
--    }
--    
--}
-Index: josm/src/com/kitfox/svg/animation/AnimateBase.java
+--- /dev/null   1970-01-01 00:00:00.000000000 +0000
++++ core/src/com/kitfox/svg/animation/Animate.java      2012-06-17 23:56:57.664545050 +0200
+@@ -0,0 +1,419 @@
++/*
++ * Animate.java
++ *
++ *  The Salamander Project - 2D and 3D graphics libraries in Java
++ *  Copyright (C) 2004 Mark McKay
++ *
++ *  This library is free software; you can redistribute it and/or
++ *  modify it under the terms of the GNU Lesser General Public
++ *  License as published by the Free Software Foundation; either
++ *  version 2.1 of the License, or (at your option) any later version.
++ *
++ *  This library is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ *  Lesser General Public License for more details.
++ *
++ *  You should have received a copy of the GNU Lesser General Public
++ *  License along with this library; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ *
++ *  Mark McKay can be contacted at mark@kitfox.com.  Salamander and other
++ *  projects can be found at http://www.kitfox.com
++ *
++ * Created on August 15, 2004, 2:51 AM
++ */
++
++package com.kitfox.svg.animation;
++
++import com.kitfox.svg.SVGElement;
++import com.kitfox.svg.SVGException;
++import com.kitfox.svg.SVGLoaderHelper;
++import com.kitfox.svg.animation.parser.AnimTimeParser;
++import com.kitfox.svg.xml.ColorTable;
++import com.kitfox.svg.xml.StyleAttribute;
++import com.kitfox.svg.xml.XMLParseUtil;
++import java.awt.Color;
++import java.awt.geom.AffineTransform;
++import java.awt.geom.GeneralPath;
++import java.awt.geom.PathIterator;
++import org.xml.sax.Attributes;
++import org.xml.sax.SAXException;
++
++
++/**
++ * Animate is a really annoying morphic tag that could represent a real value,
++ * a color or a path
++ *
++ * @author Mark McKay
++ * @author <a href="mailto:mark@kitfox.com">Mark McKay</a>
++ */
++public class Animate extends AnimateBase implements AnimateColorIface
++{
++//    StyleAttribute retAttrib = new StyleAttribute
++    public static final int DT_REAL = 0;
++    public static final int DT_COLOR = 1;
++    public static final int DT_PATH = 2;
++    int dataType = DT_REAL;
++    
++    protected double fromValue = Double.NaN;
++    protected double toValue = Double.NaN;
++    protected double byValue = Double.NaN;
++    protected double[] valuesValue;
++    
++    protected Color fromColor = null;
++    protected Color toColor = null;
++
++    protected GeneralPath fromPath = null;
++    protected GeneralPath toPath = null;
++
++    /** Creates a new instance of Animate */
++    public Animate()
++    {
++    }
++    
++    public int getDataType()
++    {
++        return dataType;
++    }
++    
++    public void loaderStartElement(SVGLoaderHelper helper, Attributes attrs, SVGElement parent) throws SAXException
++    {
++               //Load style string
++        super.loaderStartElement(helper, attrs, parent);
++
++        String strn = attrs.getValue("from");
++        if (strn != null)
++        {
++            if (XMLParseUtil.isDouble(strn))
++            {
++                fromValue = XMLParseUtil.parseDouble(strn); 
++            } 
++//            else if (attrs.getValue("attributeName").equals("d"))
++//            {
++//                fromPath = this.buildPath(strn, GeneralPath.WIND_EVEN_ODD);
++//                dataType = DT_PATH;
++//            }
++            else
++            {
++                fromColor = ColorTable.parseColor(strn); 
++                if (fromColor == null)
++                {
++                    //Try path
++                    fromPath = this.buildPath(strn, GeneralPath.WIND_EVEN_ODD);
++                    dataType = DT_PATH;
++                }
++                else dataType = DT_COLOR;
++            }
++        }
++
++        strn = attrs.getValue("to");
++        if (strn != null)
++        {
++            if (XMLParseUtil.isDouble(strn))
++            {
++                toValue = XMLParseUtil.parseDouble(strn); 
++            } 
++            else
++            {
++                toColor = ColorTable.parseColor(strn); 
++                if (toColor == null)
++                {
++                    //Try path
++                    toPath = this.buildPath(strn, GeneralPath.WIND_EVEN_ODD);
++                    dataType = DT_PATH;
++                }
++                else dataType = DT_COLOR;
++            }
++        }
++
++        strn = attrs.getValue("by");
++        try 
++        {
++            if (strn != null) byValue = XMLParseUtil.parseDouble(strn); 
++        } catch (Exception e) {}
++
++        strn = attrs.getValue("values");
++        try 
++        {
++            if (strn != null) valuesValue = XMLParseUtil.parseDoubleList(strn); 
++        } catch (Exception e) {}
++    }
++    
++    /**
++     * Evaluates this animation element for the passed interpolation time.  Interp
++     * must be on [0..1].
++     */
++    public double eval(double interp)
++    {
++        boolean fromExists = !Double.isNaN(fromValue);
++        boolean toExists = !Double.isNaN(toValue);
++        boolean byExists = !Double.isNaN(byValue);
++        boolean valuesExists = valuesValue != null;
++        
++        if (valuesExists)
++        {
++            double sp = interp * valuesValue.length;
++            int ip = (int)sp;
++            double fp = sp - ip;
++            
++            int i0 = ip;
++            int i1 = ip + 1;
++            
++            if (i0 < 0) return valuesValue[0];
++            if (i1 >= valuesValue.length) return valuesValue[valuesValue.length - 1];
++            return valuesValue[i0] * (1 - fp) + valuesValue[i1] * fp;
++        }
++        else if (fromExists && toExists)
++        {
++            return toValue * interp + fromValue * (1.0 - interp);
++        }
++        else if (fromExists && byExists)
++        {
++            return fromValue + byValue * interp;
++        }
++        else if (toExists && byExists)
++        {
++            return toValue - byValue * (1.0 - interp);
++        }
++        else if (byExists)
++        {
++            return byValue * interp;
++        }
++  
++        //Should not reach this line
++        throw new RuntimeException("Animate tag could not be evalutated - insufficient arguements");
++    }
++
++    public Color evalColor(double interp)
++    {
++        if (fromColor == null && toColor != null)
++        {
++            float[] toCol = new float[3];
++            toColor.getColorComponents(toCol);
++            return new Color(toCol[0] * (float)interp, 
++                toCol[1] * (float)interp, 
++                toCol[2] * (float)interp);
++        }
++        else if (fromColor != null && toColor != null)
++        {
++            float nInterp = 1 - (float)interp;
++            
++            float[] fromCol = new float[3];
++            float[] toCol = new float[3];
++            fromColor.getColorComponents(fromCol);
++            toColor.getColorComponents(toCol);
++            return new Color(fromCol[0] * nInterp + toCol[0] * (float)interp, 
++                fromCol[1] * nInterp + toCol[1] * (float)interp, 
++                fromCol[2] * nInterp + toCol[2] * (float)interp);
++        }
++        
++        throw new RuntimeException("Animate tag could not be evalutated - insufficient arguements");
++    }
++
++    public GeneralPath evalPath(double interp)
++    {
++        if (fromPath == null && toPath != null)
++        {
++            PathIterator itTo = toPath.getPathIterator(new AffineTransform());
++            
++            GeneralPath midPath = new GeneralPath();
++            float[] coordsTo = new float[6];
++            
++            for (; !itTo.isDone(); itTo.next())
++            {
++                int segTo = itTo.currentSegment(coordsTo);
++                
++                switch (segTo)
++                {
++                    case PathIterator.SEG_CLOSE:
++                        midPath.closePath();
++                        break;
++                    case PathIterator.SEG_CUBICTO:
++                        midPath.curveTo(
++                                (float)(coordsTo[0] * interp), 
++                                (float)(coordsTo[1] * interp), 
++                                (float)(coordsTo[2] * interp), 
++                                (float)(coordsTo[3] * interp), 
++                                (float)(coordsTo[4] * interp), 
++                                (float)(coordsTo[5] * interp)
++                                );
++                        break;
++                    case PathIterator.SEG_LINETO:
++                        midPath.lineTo(
++                                (float)(coordsTo[0] * interp), 
++                                (float)(coordsTo[1] * interp)
++                                );
++                        break;
++                    case PathIterator.SEG_MOVETO:
++                        midPath.moveTo(
++                                (float)(coordsTo[0] * interp), 
++                                (float)(coordsTo[1] * interp)
++                                );
++                        break;
++                    case PathIterator.SEG_QUADTO:
++                        midPath.quadTo(
++                                (float)(coordsTo[0] * interp), 
++                                (float)(coordsTo[1] * interp), 
++                                (float)(coordsTo[2] * interp), 
++                                (float)(coordsTo[3] * interp)
++                                );
++                        break;
++                }
++            }
++            
++            return midPath;
++        }
++        else if (toPath != null)
++        {
++            PathIterator itFrom = fromPath.getPathIterator(new AffineTransform());
++            PathIterator itTo = toPath.getPathIterator(new AffineTransform());
++            
++            GeneralPath midPath = new GeneralPath();
++            float[] coordsFrom = new float[6];
++            float[] coordsTo = new float[6];
++            
++            for (; !itFrom.isDone(); itFrom.next())
++            {
++                int segFrom = itFrom.currentSegment(coordsFrom);
++                int segTo = itTo.currentSegment(coordsTo);
++                
++                if (segFrom != segTo)
++                {
++                    throw new RuntimeException("Path shape mismatch");
++                }
++                
++                switch (segFrom)
++                {
++                    case PathIterator.SEG_CLOSE:
++                        midPath.closePath();
++                        break;
++                    case PathIterator.SEG_CUBICTO:
++                        midPath.curveTo(
++                                (float)(coordsFrom[0] * (1 - interp) + coordsTo[0] * interp), 
++                                (float)(coordsFrom[1] * (1 - interp) + coordsTo[1] * interp), 
++                                (float)(coordsFrom[2] * (1 - interp) + coordsTo[2] * interp), 
++                                (float)(coordsFrom[3] * (1 - interp) + coordsTo[3] * interp), 
++                                (float)(coordsFrom[4] * (1 - interp) + coordsTo[4] * interp), 
++                                (float)(coordsFrom[5] * (1 - interp) + coordsTo[5] * interp)
++                                );
++                        break;
++                    case PathIterator.SEG_LINETO:
++                        midPath.lineTo(
++                                (float)(coordsFrom[0] * (1 - interp) + coordsTo[0] * interp), 
++                                (float)(coordsFrom[1] * (1 - interp) + coordsTo[1] * interp)
++                                );
++                        break;
++                    case PathIterator.SEG_MOVETO:
++                        midPath.moveTo(
++                                (float)(coordsFrom[0] * (1 - interp) + coordsTo[0] * interp), 
++                                (float)(coordsFrom[1] * (1 - interp) + coordsTo[1] * interp)
++                                );
++                        break;
++                    case PathIterator.SEG_QUADTO:
++                        midPath.quadTo(
++                                (float)(coordsFrom[0] * (1 - interp) + coordsTo[0] * interp), 
++                                (float)(coordsFrom[1] * (1 - interp) + coordsTo[1] * interp), 
++                                (float)(coordsFrom[2] * (1 - interp) + coordsTo[2] * interp), 
++                                (float)(coordsFrom[3] * (1 - interp) + coordsTo[3] * interp)
++                                );
++                        break;
++                }
++            }
++            
++            return midPath;
++        }
++        
++        throw new RuntimeException("Animate tag could not be evalutated - insufficient arguements");
++    }
++    
++    /**
++     * If this element is being accumulated, detemine the delta to accumulate by
++     */
++    public double repeatSkipSize(int reps)
++    {
++        boolean fromExists = !Double.isNaN(fromValue);
++        boolean toExists = !Double.isNaN(toValue);
++        boolean byExists = !Double.isNaN(byValue);
++        
++        if (fromExists && toExists)
++        {
++            return (toValue - fromValue) * reps;
++        }
++        else if (fromExists && byExists)
++        {
++            return (fromValue + byValue) * reps;
++        }
++        else if (toExists && byExists)
++        {
++            return toValue * reps;
++        }
++        else if (byExists)
++        {
++            return byValue * reps;
++        }
++
++        //Should not reach this line
++        return 0;
++    }
++
++    protected void rebuild(AnimTimeParser animTimeParser) throws SVGException
++    {
++        super.rebuild(animTimeParser);
++
++        StyleAttribute sty = new StyleAttribute();
++
++        if (getPres(sty.setName("from")))
++        {
++            String strn = sty.getStringValue();
++            if (XMLParseUtil.isDouble(strn))
++            {
++                fromValue = XMLParseUtil.parseDouble(strn);
++            }
++            else
++            {
++                fromColor = ColorTable.parseColor(strn);
++                if (fromColor == null)
++                {
++                    //Try path
++                    fromPath = this.buildPath(strn, GeneralPath.WIND_EVEN_ODD);
++                    dataType = DT_PATH;
++                }
++                else dataType = DT_COLOR;
++            }
++        }
++
++        if (getPres(sty.setName("to")))
++        {
++            String strn = sty.getStringValue();
++            if (XMLParseUtil.isDouble(strn))
++            {
++                toValue = XMLParseUtil.parseDouble(strn);
++            }
++            else
++            {
++                toColor = ColorTable.parseColor(strn);
++                if (toColor == null)
++                {
++                    //Try path
++                    toPath = this.buildPath(strn, GeneralPath.WIND_EVEN_ODD);
++                    dataType = DT_PATH;
++                }
++                else dataType = DT_COLOR;
++            }
++        }
++
++        if (getPres(sty.setName("by")))
++        {
++            String strn = sty.getStringValue();
++            if (strn != null) byValue = XMLParseUtil.parseDouble(strn);
++        }
++
++        if (getPres(sty.setName("values")))
++        {
++            String strn = sty.getStringValue();
++            if (strn != null) valuesValue = XMLParseUtil.parseDoubleList(strn);
++        }
++    }
++    
++}
+Index: core/src/com/kitfox/svg/animation/AnimateBase.java
 ===================================================================
---- josm.orig/src/com/kitfox/svg/animation/AnimateBase.java     2011-07-17 10:45:40.086278706 +0200
-+++ /dev/null   1970-01-01 00:00:00.000000000 +0000
-@@ -1,133 +0,0 @@
--/*
-- * Animate.java
-- *
-- *  The Salamander Project - 2D and 3D graphics libraries in Java
-- *  Copyright (C) 2004 Mark McKay
-- *
-- *  This library is free software; you can redistribute it and/or
-- *  modify it under the terms of the GNU Lesser General Public
-- *  License as published by the Free Software Foundation; either
-- *  version 2.1 of the License, or (at your option) any later version.
-- *
-- *  This library is distributed in the hope that it will be useful,
-- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- *  Lesser General Public License for more details.
-- *
-- *  You should have received a copy of the GNU Lesser General Public
-- *  License along with this library; if not, write to the Free Software
-- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-- *
-- *  Mark McKay can be contacted at mark@kitfox.com.  Salamander and other
-- *  projects can be found at http://www.kitfox.com
-- *
-- * Created on August 15, 2004, 2:51 AM
-- */
--
--package com.kitfox.svg.animation;
--
--import com.kitfox.svg.SVGElement;
--import com.kitfox.svg.SVGException;
--import com.kitfox.svg.SVGLoaderHelper;
--import com.kitfox.svg.animation.parser.AnimTimeParser;
--import com.kitfox.svg.animation.parser.ParseException;
--import com.kitfox.svg.xml.StyleAttribute;
--import java.io.StringReader;
--import org.xml.sax.Attributes;
--import org.xml.sax.SAXException;
--
--/**
-- * @author Mark McKay
-- * @author <a href="mailto:mark@kitfox.com">Mark McKay</a>
-- */
--abstract public class AnimateBase extends AnimationElement
--{
--    protected double repeatCount = Double.NaN;
--    protected TimeBase repeatDur;
--    
--    /** Creates a new instance of Animate */
--    public AnimateBase()
--    {
--    }
--    
--    public void evalParametric(AnimationTimeEval state, double curTime)
--    {
--        evalParametric(state, curTime, repeatCount, repeatDur == null ? Double.NaN : repeatDur.evalTime());
--    }
--    
--    public void loaderStartElement(SVGLoaderHelper helper, Attributes attrs, SVGElement parent) throws SAXException
--    {
--               //Load style string
--        super.loaderStartElement(helper, attrs, parent);
--
--        String repeatDurTime = attrs.getValue("repeatDur");
--
--        try
--        {
--            if (repeatDurTime != null)
--            {
--                helper.animTimeParser.ReInit(new StringReader(repeatDurTime));
--                this.repeatDur = helper.animTimeParser.Expr();
--                this.repeatDur.setParentElement(this);
--            }
--        }
--        catch (Exception e)
--        {
--            throw new SAXException(e);
--        }
--        
--        String strn = attrs.getValue("repeatCount");
--        if (strn == null)
--        {
--            repeatCount = 1;
--        }
--        else if ("indefinite".equals(strn))
--        {
--            repeatCount = Double.POSITIVE_INFINITY;
--        }
--        else
--        {
--            try { repeatCount = Double.parseDouble(strn); } 
--            catch (Exception e) { repeatCount = Double.NaN; }
--        }
--    }
--
--    protected void rebuild(AnimTimeParser animTimeParser) throws SVGException
--    {
--        super.rebuild(animTimeParser);
--
--        StyleAttribute sty = new StyleAttribute();
--
--        if (getPres(sty.setName("repeatDur")))
--        {
--            String strn = sty.getStringValue();
--            if (strn != null)
--            {
--                animTimeParser.ReInit(new StringReader(strn));
--                try {
--                    this.repeatDur = animTimeParser.Expr();
--                } catch (ParseException ex) {
--                    ex.printStackTrace();
--                }
--            }
--        }
--
--        if (getPres(sty.setName("repeatCount")))
--        {
--            String strn = sty.getStringValue();
--            if (strn == null)
--            {
--                repeatCount = 1;
--            }
--            else if ("indefinite".equals(strn))
--            {
--                repeatCount = Double.POSITIVE_INFINITY;
--            }
--            else
--            {
--                try { repeatCount = Double.parseDouble(strn); }
--                catch (Exception e) { repeatCount = Double.NaN; }
--            }
--        }
--    }
--}
-Index: josm/src/com/kitfox/svg/animation/AnimateColor.java
+--- /dev/null   1970-01-01 00:00:00.000000000 +0000
++++ core/src/com/kitfox/svg/animation/AnimateBase.java  2012-06-17 23:56:57.664545050 +0200
+@@ -0,0 +1,133 @@
++/*
++ * Animate.java
++ *
++ *  The Salamander Project - 2D and 3D graphics libraries in Java
++ *  Copyright (C) 2004 Mark McKay
++ *
++ *  This library is free software; you can redistribute it and/or
++ *  modify it under the terms of the GNU Lesser General Public
++ *  License as published by the Free Software Foundation; either
++ *  version 2.1 of the License, or (at your option) any later version.
++ *
++ *  This library is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ *  Lesser General Public License for more details.
++ *
++ *  You should have received a copy of the GNU Lesser General Public
++ *  License along with this library; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ *
++ *  Mark McKay can be contacted at mark@kitfox.com.  Salamander and other
++ *  projects can be found at http://www.kitfox.com
++ *
++ * Created on August 15, 2004, 2:51 AM
++ */
++
++package com.kitfox.svg.animation;
++
++import com.kitfox.svg.SVGElement;
++import com.kitfox.svg.SVGException;
++import com.kitfox.svg.SVGLoaderHelper;
++import com.kitfox.svg.animation.parser.AnimTimeParser;
++import com.kitfox.svg.animation.parser.ParseException;
++import com.kitfox.svg.xml.StyleAttribute;
++import java.io.StringReader;
++import org.xml.sax.Attributes;
++import org.xml.sax.SAXException;
++
++/**
++ * @author Mark McKay
++ * @author <a href="mailto:mark@kitfox.com">Mark McKay</a>
++ */
++abstract public class AnimateBase extends AnimationElement
++{
++    protected double repeatCount = Double.NaN;
++    protected TimeBase repeatDur;
++    
++    /** Creates a new instance of Animate */
++    public AnimateBase()
++    {
++    }
++    
++    public void evalParametric(AnimationTimeEval state, double curTime)
++    {
++        evalParametric(state, curTime, repeatCount, repeatDur == null ? Double.NaN : repeatDur.evalTime());
++    }
++    
++    public void loaderStartElement(SVGLoaderHelper helper, Attributes attrs, SVGElement parent) throws SAXException
++    {
++               //Load style string
++        super.loaderStartElement(helper, attrs, parent);
++
++        String repeatDurTime = attrs.getValue("repeatDur");
++
++        try
++        {
++            if (repeatDurTime != null)
++            {
++                helper.animTimeParser.ReInit(new StringReader(repeatDurTime));
++                this.repeatDur = helper.animTimeParser.Expr();
++                this.repeatDur.setParentElement(this);
++            }
++        }
++        catch (Exception e)
++        {
++            throw new SAXException(e);
++        }
++        
++        String strn = attrs.getValue("repeatCount");
++        if (strn == null)
++        {
++            repeatCount = 1;
++        }
++        else if ("indefinite".equals(strn))
++        {
++            repeatCount = Double.POSITIVE_INFINITY;
++        }
++        else
++        {
++            try { repeatCount = Double.parseDouble(strn); } 
++            catch (Exception e) { repeatCount = Double.NaN; }
++        }
++    }
++
++    protected void rebuild(AnimTimeParser animTimeParser) throws SVGException
++    {
++        super.rebuild(animTimeParser);
++
++        StyleAttribute sty = new StyleAttribute();
++
++        if (getPres(sty.setName("repeatDur")))
++        {
++            String strn = sty.getStringValue();
++            if (strn != null)
++            {
++                animTimeParser.ReInit(new StringReader(strn));
++                try {
++                    this.repeatDur = animTimeParser.Expr();
++                } catch (ParseException ex) {
++                    ex.printStackTrace();
++                }
++            }
++        }
++
++        if (getPres(sty.setName("repeatCount")))
++        {
++            String strn = sty.getStringValue();
++            if (strn == null)
++            {
++                repeatCount = 1;
++            }
++            else if ("indefinite".equals(strn))
++            {
++                repeatCount = Double.POSITIVE_INFINITY;
++            }
++            else
++            {
++                try { repeatCount = Double.parseDouble(strn); }
++                catch (Exception e) { repeatCount = Double.NaN; }
++            }
++        }
++    }
++}
+Index: core/src/com/kitfox/svg/animation/AnimateColor.java
 ===================================================================
---- josm.orig/src/com/kitfox/svg/animation/AnimateColor.java    2011-07-17 10:45:39.070273670 +0200
-+++ /dev/null   1970-01-01 00:00:00.000000000 +0000
-@@ -1,105 +0,0 @@
--/*
-- * Animate.java
-- *
-- *  The Salamander Project - 2D and 3D graphics libraries in Java
-- *  Copyright (C) 2004 Mark McKay
-- *
-- *  This library is free software; you can redistribute it and/or
-- *  modify it under the terms of the GNU Lesser General Public
-- *  License as published by the Free Software Foundation; either
-- *  version 2.1 of the License, or (at your option) any later version.
-- *
-- *  This library is distributed in the hope that it will be useful,
-- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- *  Lesser General Public License for more details.
-- *
-- *  You should have received a copy of the GNU Lesser General Public
-- *  License along with this library; if not, write to the Free Software
-- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-- *
-- *  Mark McKay can be contacted at mark@kitfox.com.  Salamander and other
-- *  projects can be found at http://www.kitfox.com
-- *
-- * Created on August 15, 2004, 2:51 AM
-- */
--
--package com.kitfox.svg.animation;
--
--import com.kitfox.svg.SVGElement;
--import com.kitfox.svg.SVGException;
--import com.kitfox.svg.SVGLoaderHelper;
--import com.kitfox.svg.animation.parser.AnimTimeParser;
--import com.kitfox.svg.xml.ColorTable;
--import com.kitfox.svg.xml.StyleAttribute;
--import java.awt.Color;
--import org.xml.sax.Attributes;
--import org.xml.sax.SAXException;
--
--
--/**
-- * @author Mark McKay
-- * @author <a href="mailto:mark@kitfox.com">Mark McKay</a>
-- */
--public class AnimateColor extends AnimateBase implements AnimateColorIface
--{
--    
--    protected Color fromValue;
--    protected Color toValue;
--    
--    /** Creates a new instance of Animate */
--    public AnimateColor()
--    {
--    }
--    
--    public void loaderStartElement(SVGLoaderHelper helper, Attributes attrs, SVGElement parent) throws SAXException
--    {
--               //Load style string
--        super.loaderStartElement(helper, attrs, parent);
--
--        String strn = attrs.getValue("from");
--        fromValue = ColorTable.parseColor(strn);
--
--        strn = attrs.getValue("to");
--        toValue = ColorTable.parseColor(strn);
--    }
--
--    
--    /**
--     * Evaluates this animation element for the passed interpolation time.  Interp
--     * must be on [0..1].
--     */
--    public Color evalColor(double interp)
--    {
--        int r1 = fromValue.getRed();
--        int g1 = fromValue.getGreen();
--        int b1 = fromValue.getBlue();
--        int r2 = toValue.getRed();
--        int g2 = toValue.getGreen();
--        int b2 = toValue.getBlue();
--        double invInterp = 1.0 - interp;
--        
--        return new Color((int)(r1 * invInterp + r2 * interp), 
--            (int)(g1 * invInterp + g2 * interp), 
--            (int)(b1 * invInterp + b2 * interp));
--    }
--
--    protected void rebuild(AnimTimeParser animTimeParser) throws SVGException
--    {
--        super.rebuild(animTimeParser);
--
--        StyleAttribute sty = new StyleAttribute();
--
--        if (getPres(sty.setName("from")))
--        {
--            String strn = sty.getStringValue();
--            fromValue = ColorTable.parseColor(strn);
--        }
--
--        if (getPres(sty.setName("to")))
--        {
--            String strn = sty.getStringValue();
--            toValue = ColorTable.parseColor(strn);
--        }
--    }
--}
-Index: josm/src/com/kitfox/svg/animation/AnimateColorIface.java
+--- /dev/null   1970-01-01 00:00:00.000000000 +0000
++++ core/src/com/kitfox/svg/animation/AnimateColor.java 2012-06-17 23:56:57.672545050 +0200
+@@ -0,0 +1,105 @@
++/*
++ * Animate.java
++ *
++ *  The Salamander Project - 2D and 3D graphics libraries in Java
++ *  Copyright (C) 2004 Mark McKay
++ *
++ *  This library is free software; you can redistribute it and/or
++ *  modify it under the terms of the GNU Lesser General Public
++ *  License as published by the Free Software Foundation; either
++ *  version 2.1 of the License, or (at your option) any later version.
++ *
++ *  This library is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ *  Lesser General Public License for more details.
++ *
++ *  You should have received a copy of the GNU Lesser General Public
++ *  License along with this library; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ *
++ *  Mark McKay can be contacted at mark@kitfox.com.  Salamander and other
++ *  projects can be found at http://www.kitfox.com
++ *
++ * Created on August 15, 2004, 2:51 AM
++ */
++
++package com.kitfox.svg.animation;
++
++import com.kitfox.svg.SVGElement;
++import com.kitfox.svg.SVGException;
++import com.kitfox.svg.SVGLoaderHelper;
++import com.kitfox.svg.animation.parser.AnimTimeParser;
++import com.kitfox.svg.xml.ColorTable;
++import com.kitfox.svg.xml.StyleAttribute;
++import java.awt.Color;
++import org.xml.sax.Attributes;
++import org.xml.sax.SAXException;
++
++
++/**
++ * @author Mark McKay
++ * @author <a href="mailto:mark@kitfox.com">Mark McKay</a>
++ */
++public class AnimateColor extends AnimateBase implements AnimateColorIface
++{
++    
++    protected Color fromValue;
++    protected Color toValue;
++    
++    /** Creates a new instance of Animate */
++    public AnimateColor()
++    {
++    }
++    
++    public void loaderStartElement(SVGLoaderHelper helper, Attributes attrs, SVGElement parent) throws SAXException
++    {
++               //Load style string
++        super.loaderStartElement(helper, attrs, parent);
++
++        String strn = attrs.getValue("from");
++        fromValue = ColorTable.parseColor(strn);
++
++        strn = attrs.getValue("to");
++        toValue = ColorTable.parseColor(strn);
++    }
++
++    
++    /**
++     * Evaluates this animation element for the passed interpolation time.  Interp
++     * must be on [0..1].
++     */
++    public Color evalColor(double interp)
++    {
++        int r1 = fromValue.getRed();
++        int g1 = fromValue.getGreen();
++        int b1 = fromValue.getBlue();
++        int r2 = toValue.getRed();
++        int g2 = toValue.getGreen();
++        int b2 = toValue.getBlue();
++        double invInterp = 1.0 - interp;
++        
++        return new Color((int)(r1 * invInterp + r2 * interp), 
++            (int)(g1 * invInterp + g2 * interp), 
++            (int)(b1 * invInterp + b2 * interp));
++    }
++
++    protected void rebuild(AnimTimeParser animTimeParser) throws SVGException
++    {
++        super.rebuild(animTimeParser);
++
++        StyleAttribute sty = new StyleAttribute();
++
++        if (getPres(sty.setName("from")))
++        {
++            String strn = sty.getStringValue();
++            fromValue = ColorTable.parseColor(strn);
++        }
++
++        if (getPres(sty.setName("to")))
++        {
++            String strn = sty.getStringValue();
++            toValue = ColorTable.parseColor(strn);
++        }
++    }
++}
+Index: core/src/com/kitfox/svg/animation/AnimateColorIface.java
 ===================================================================
---- josm.orig/src/com/kitfox/svg/animation/AnimateColorIface.java       2011-07-17 10:45:41.886287631 +0200
-+++ /dev/null   1970-01-01 00:00:00.000000000 +0000
-@@ -1,38 +0,0 @@
--/*
-- * AnimateColorIface.java
-- *
-- *  The Salamander Project - 2D and 3D graphics libraries in Java
-- *  Copyright (C) 2004 Mark McKay
-- *
-- *  This library is free software; you can redistribute it and/or
-- *  modify it under the terms of the GNU Lesser General Public
-- *  License as published by the Free Software Foundation; either
-- *  version 2.1 of the License, or (at your option) any later version.
-- *
-- *  This library is distributed in the hope that it will be useful,
-- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- *  Lesser General Public License for more details.
-- *
-- *  You should have received a copy of the GNU Lesser General Public
-- *  License along with this library; if not, write to the Free Software
-- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-- *
-- *  Mark McKay can be contacted at mark@kitfox.com.  Salamander and other
-- *  projects can be found at http://www.kitfox.com
-- *
-- * Created on January 16, 2005, 6:24 AM
-- */
--
--package com.kitfox.svg.animation;
--
--import java.awt.*;
--
--/**
-- *
-- * @author kitfox
-- */
--public interface AnimateColorIface
--{
--    public Color evalColor(double interp);
--}
-Index: josm/src/com/kitfox/svg/animation/AnimateMotion.java
+--- /dev/null   1970-01-01 00:00:00.000000000 +0000
++++ core/src/com/kitfox/svg/animation/AnimateColorIface.java    2012-06-17 23:56:57.672545050 +0200
+@@ -0,0 +1,38 @@
++/*
++ * AnimateColorIface.java
++ *
++ *  The Salamander Project - 2D and 3D graphics libraries in Java
++ *  Copyright (C) 2004 Mark McKay
++ *
++ *  This library is free software; you can redistribute it and/or
++ *  modify it under the terms of the GNU Lesser General Public
++ *  License as published by the Free Software Foundation; either
++ *  version 2.1 of the License, or (at your option) any later version.
++ *
++ *  This library is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ *  Lesser General Public License for more details.
++ *
++ *  You should have received a copy of the GNU Lesser General Public
++ *  License along with this library; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ *
++ *  Mark McKay can be contacted at mark@kitfox.com.  Salamander and other
++ *  projects can be found at http://www.kitfox.com
++ *
++ * Created on January 16, 2005, 6:24 AM
++ */
++
++package com.kitfox.svg.animation;
++
++import java.awt.*;
++
++/**
++ *
++ * @author kitfox
++ */
++public interface AnimateColorIface
++{
++    public Color evalColor(double interp);
++}
+Index: core/src/com/kitfox/svg/animation/AnimateMotion.java
 ===================================================================
---- josm.orig/src/com/kitfox/svg/animation/AnimateMotion.java   2011-07-17 10:45:39.186274242 +0200
-+++ /dev/null   1970-01-01 00:00:00.000000000 +0000
-@@ -1,282 +0,0 @@
--/*
-- * Animate.java
-- *
-- *  The Salamander Project - 2D and 3D graphics libraries in Java
-- *  Copyright (C) 2004 Mark McKay
-- *
-- *  This library is free software; you can redistribute it and/or
-- *  modify it under the terms of the GNU Lesser General Public
-- *  License as published by the Free Software Foundation; either
-- *  version 2.1 of the License, or (at your option) any later version.
-- *
-- *  This library is distributed in the hope that it will be useful,
-- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- *  Lesser General Public License for more details.
-- *
-- *  You should have received a copy of the GNU Lesser General Public
-- *  License along with this library; if not, write to the Free Software
-- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-- *
-- *  Mark McKay can be contacted at mark@kitfox.com.  Salamander and other
-- *  projects can be found at http://www.kitfox.com
-- *
-- * Created on August 15, 2004, 2:51 AM
-- */
--
--package com.kitfox.svg.animation;
--
--import com.kitfox.svg.SVGElement;
--import com.kitfox.svg.SVGException;
--import com.kitfox.svg.SVGLoaderHelper;
--import com.kitfox.svg.animation.parser.AnimTimeParser;
--import com.kitfox.svg.xml.StyleAttribute;
--import java.awt.geom.AffineTransform;
--import java.awt.geom.GeneralPath;
--import java.awt.geom.PathIterator;
--import java.awt.geom.Point2D;
--import java.util.ArrayList;
--import java.util.Iterator;
--import java.util.regex.Matcher;
--import java.util.regex.Pattern;
--import org.xml.sax.Attributes;
--import org.xml.sax.SAXException;
--
--
--/**
-- * @author Mark McKay
-- * @author <a href="mailto:mark@kitfox.com">Mark McKay</a>
-- */
--public class AnimateMotion extends AnimateXform
--{
--    static final Matcher matchPoint = Pattern.compile("\\s*(\\d+)[^\\d]+(\\d+)\\s*").matcher("");
--    
--//    protected double fromValue;
--//    protected double toValue;
--    GeneralPath path;
--    int rotateType = RT_ANGLE;
--    double rotate;  //Static angle to rotate by
--    
--    public static final int RT_ANGLE = 0;  //Rotate by constant 'rotate' degrees
--    public static final int RT_AUTO = 1;  //Rotate to reflect tangent of position on path
--    
--    final ArrayList bezierSegs = new ArrayList();
--    double curveLength;
--    
--    /** Creates a new instance of Animate */
--    public AnimateMotion()
--    {
--    }
--    
--    public void loaderStartElement(SVGLoaderHelper helper, Attributes attrs, SVGElement parent) throws SAXException
--    {
--               //Load style string
--        super.loaderStartElement(helper, attrs, parent);
--        
--        //Motion element implies animating the transform element
--        if (attribName == null) 
--        {
--            attribName = "transform";
--            attribType = AT_AUTO;
--            additiveType = AD_SUM;
--        }
--        
--
--        String path = attrs.getValue("path");
--        if (path != null)
--        {
--            this.path = buildPath(path, GeneralPath.WIND_NON_ZERO);
--        }
--        
--        //Now parse rotation style
--        String rotate = attrs.getValue("rotate");
--        if (rotate != null)
--        {
--            if (rotate.equals("auto"))
--            {
--                this.rotateType = RT_AUTO;
--            }
--            else
--            {
--                try { this.rotate = Math.toRadians(Float.parseFloat(rotate)); } catch (Exception e) {}
--            }
--        }
--
--        //Determine path
--        String from = attrs.getValue("from");
--        String to = attrs.getValue("to");
--
--        buildPath(from, to);
--    }
--    
--    protected static void setPoint(Point2D.Float pt, String x, String y)
--    {
--        try { pt.x = Float.parseFloat(x); } catch (Exception e) {};
--        
--        try { pt.y = Float.parseFloat(y); } catch (Exception e) {};
--    }
--
--    private void buildPath(String from, String to)
--    {
--        if (from != null && to != null)
--        {
--            Point2D.Float ptFrom = new Point2D.Float(), ptTo = new Point2D.Float();
--
--            matchPoint.reset(from);
--            if (matchPoint.matches())
--            {
--                setPoint(ptFrom, matchPoint.group(1), matchPoint.group(2));
--            }
--
--            matchPoint.reset(to);
--            if (matchPoint.matches())
--            {
--                setPoint(ptFrom, matchPoint.group(1), matchPoint.group(2));
--            }
--
--            if (ptFrom != null && ptTo != null)
--            {
--                path = new GeneralPath();
--                path.moveTo(ptFrom.x, ptFrom.y);
--                path.lineTo(ptTo.x, ptTo.y);
--            }
--        }
--
--        paramaterizePath();
--    }
--    
--    private void paramaterizePath()
--    {
--        bezierSegs.clear();
--        curveLength = 0;
--        
--        double[] coords = new double[6];
--        double sx = 0, sy = 0;
--        
--        for (PathIterator pathIt = path.getPathIterator(new AffineTransform()); !pathIt.isDone(); pathIt.next())
--        {
--            Bezier bezier = null;
--                    
--            int segType = pathIt.currentSegment(coords);
--            
--            switch (segType)
--            {
--                case PathIterator.SEG_LINETO: 
--                {
--                    bezier = new Bezier(sx, sy, coords, 1);
--                    sx = coords[0];
--                    sy = coords[1];
--                    break;
--                }
--                case PathIterator.SEG_QUADTO:
--                {
--                    bezier = new Bezier(sx, sy, coords, 2);
--                    sx = coords[2];
--                    sy = coords[3];
--                    break;
--                }
--                case PathIterator.SEG_CUBICTO:
--                {
--                    bezier = new Bezier(sx, sy, coords, 3);
--                    sx = coords[4];
--                    sy = coords[5];
--                    break;
--                }
--                case PathIterator.SEG_MOVETO:
--                {
--                    sx = coords[0];
--                    sy = coords[1];
--                    break;
--                }
--                case PathIterator.SEG_CLOSE:
--                    //Do nothing
--                    break;
--                
--            }
--
--            if (bezier != null)
--            {
--                bezierSegs.add(bezier);
--                curveLength += bezier.getLength();
--            }
--        }
--    }
--    
--    /**
--     * Evaluates this animation element for the passed interpolation time.  Interp
--     * must be on [0..1].
--     */
--    public AffineTransform eval(AffineTransform xform, double interp)
--    {
--        Point2D.Double point = new Point2D.Double();
--        
--        if (interp >= 1)
--        {
--            Bezier last = (Bezier)bezierSegs.get(bezierSegs.size() - 1);
--            last.getFinalPoint(point);
--            xform.setToTranslation(point.x, point.y);
--            return xform;
--        }
--        
--        double curLength = curveLength * interp;
--        for (Iterator it = bezierSegs.iterator(); it.hasNext();)
--        {
--            Bezier bez = (Bezier)it.next();
--            
--            double bezLength = bez.getLength();
--            if (curLength < bezLength)
--            {
--                double param = curLength / bezLength;
--                bez.eval(param, point);
--                break;
--            }
--            
--            curLength -= bezLength;
--        }
--        
--        xform.setToTranslation(point.x, point.y);
--        
--        return xform;
--    }
--    
--
--    protected void rebuild(AnimTimeParser animTimeParser) throws SVGException
--    {
--        super.rebuild(animTimeParser);
--
--        StyleAttribute sty = new StyleAttribute();
--
--        if (getPres(sty.setName("path")))
--        {
--            String strn = sty.getStringValue();
--            this.path = buildPath(strn, GeneralPath.WIND_NON_ZERO);
--        }
--
--        if (getPres(sty.setName("rotate")))
--        {
--            String strn = sty.getStringValue();
--            if (strn.equals("auto"))
--            {
--                this.rotateType = RT_AUTO;
--            }
--            else
--            {
--                try { this.rotate = Math.toRadians(Float.parseFloat(strn)); } catch (Exception e) {}
--            }
--        }
--
--        String from = null;
--        if (getPres(sty.setName("from")))
--        {
--            from = sty.getStringValue();
--        }
--
--        String to = null;
--        if (getPres(sty.setName("to")))
--        {
--            to = sty.getStringValue();
--        }
--        
--        buildPath(from, to);
--    }
--}
-Index: josm/src/com/kitfox/svg/animation/AnimateTransform.java
+--- /dev/null   1970-01-01 00:00:00.000000000 +0000
++++ core/src/com/kitfox/svg/animation/AnimateMotion.java        2012-06-17 23:56:57.672545050 +0200
+@@ -0,0 +1,282 @@
++/*
++ * Animate.java
++ *
++ *  The Salamander Project - 2D and 3D graphics libraries in Java
++ *  Copyright (C) 2004 Mark McKay
++ *
++ *  This library is free software; you can redistribute it and/or
++ *  modify it under the terms of the GNU Lesser General Public
++ *  License as published by the Free Software Foundation; either
++ *  version 2.1 of the License, or (at your option) any later version.
++ *
++ *  This library is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ *  Lesser General Public License for more details.
++ *
++ *  You should have received a copy of the GNU Lesser General Public
++ *  License along with this library; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ *
++ *  Mark McKay can be contacted at mark@kitfox.com.  Salamander and other
++ *  projects can be found at http://www.kitfox.com
++ *
++ * Created on August 15, 2004, 2:51 AM
++ */
++
++package com.kitfox.svg.animation;
++
++import com.kitfox.svg.SVGElement;
++import com.kitfox.svg.SVGException;
++import com.kitfox.svg.SVGLoaderHelper;
++import com.kitfox.svg.animation.parser.AnimTimeParser;
++import com.kitfox.svg.xml.StyleAttribute;
++import java.awt.geom.AffineTransform;
++import java.awt.geom.GeneralPath;
++import java.awt.geom.PathIterator;
++import java.awt.geom.Point2D;
++import java.util.ArrayList;
++import java.util.Iterator;
++import java.util.regex.Matcher;
++import java.util.regex.Pattern;
++import org.xml.sax.Attributes;
++import org.xml.sax.SAXException;
++
++
++/**
++ * @author Mark McKay
++ * @author <a href="mailto:mark@kitfox.com">Mark McKay</a>
++ */
++public class AnimateMotion extends AnimateXform
++{
++    static final Matcher matchPoint = Pattern.compile("\\s*(\\d+)[^\\d]+(\\d+)\\s*").matcher("");
++    
++//    protected double fromValue;
++//    protected double toValue;
++    GeneralPath path;
++    int rotateType = RT_ANGLE;
++    double rotate;  //Static angle to rotate by
++    
++    public static final int RT_ANGLE = 0;  //Rotate by constant 'rotate' degrees
++    public static final int RT_AUTO = 1;  //Rotate to reflect tangent of position on path
++    
++    final ArrayList bezierSegs = new ArrayList();
++    double curveLength;
++    
++    /** Creates a new instance of Animate */
++    public AnimateMotion()
++    {
++    }
++    
++    public void loaderStartElement(SVGLoaderHelper helper, Attributes attrs, SVGElement parent) throws SAXException
++    {
++               //Load style string
++        super.loaderStartElement(helper, attrs, parent);
++        
++        //Motion element implies animating the transform element
++        if (attribName == null) 
++        {
++            attribName = "transform";
++            attribType = AT_AUTO;
++            additiveType = AD_SUM;
++        }
++        
++
++        String path = attrs.getValue("path");
++        if (path != null)
++        {
++            this.path = buildPath(path, GeneralPath.WIND_NON_ZERO);
++        }
++        
++        //Now parse rotation style
++        String rotate = attrs.getValue("rotate");
++        if (rotate != null)
++        {
++            if (rotate.equals("auto"))
++            {
++                this.rotateType = RT_AUTO;
++            }
++            else
++            {
++                try { this.rotate = Math.toRadians(Float.parseFloat(rotate)); } catch (Exception e) {}
++            }
++        }
++
++        //Determine path
++        String from = attrs.getValue("from");
++        String to = attrs.getValue("to");
++
++        buildPath(from, to);
++    }
++    
++    protected static void setPoint(Point2D.Float pt, String x, String y)
++    {
++        try { pt.x = Float.parseFloat(x); } catch (Exception e) {};
++        
++        try { pt.y = Float.parseFloat(y); } catch (Exception e) {};
++    }
++
++    private void buildPath(String from, String to)
++    {
++        if (from != null && to != null)
++        {
++            Point2D.Float ptFrom = new Point2D.Float(), ptTo = new Point2D.Float();
++
++            matchPoint.reset(from);
++            if (matchPoint.matches())
++            {
++                setPoint(ptFrom, matchPoint.group(1), matchPoint.group(2));
++            }
++
++            matchPoint.reset(to);
++            if (matchPoint.matches())
++            {
++                setPoint(ptFrom, matchPoint.group(1), matchPoint.group(2));
++            }
++
++            if (ptFrom != null && ptTo != null)
++            {
++                path = new GeneralPath();
++                path.moveTo(ptFrom.x, ptFrom.y);
++                path.lineTo(ptTo.x, ptTo.y);
++            }
++        }
++
++        paramaterizePath();
++    }
++    
++    private void paramaterizePath()
++    {
++        bezierSegs.clear();
++        curveLength = 0;
++        
++        double[] coords = new double[6];
++        double sx = 0, sy = 0;
++        
++        for (PathIterator pathIt = path.getPathIterator(new AffineTransform()); !pathIt.isDone(); pathIt.next())
++        {
++            Bezier bezier = null;
++                    
++            int segType = pathIt.currentSegment(coords);
++            
++            switch (segType)
++            {
++                case PathIterator.SEG_LINETO: 
++                {
++                    bezier = new Bezier(sx, sy, coords, 1);
++                    sx = coords[0];
++                    sy = coords[1];
++                    break;
++                }
++                case PathIterator.SEG_QUADTO:
++                {
++                    bezier = new Bezier(sx, sy, coords, 2);
++                    sx = coords[2];
++                    sy = coords[3];
++                    break;
++                }
++                case PathIterator.SEG_CUBICTO:
++                {
++                    bezier = new Bezier(sx, sy, coords, 3);
++                    sx = coords[4];
++                    sy = coords[5];
++                    break;
++                }
++                case PathIterator.SEG_MOVETO:
++                {
++                    sx = coords[0];
++                    sy = coords[1];
++                    break;
++                }
++                case PathIterator.SEG_CLOSE:
++                    //Do nothing
++                    break;
++                
++            }
++
++            if (bezier != null)
++            {
++                bezierSegs.add(bezier);
++                curveLength += bezier.getLength();
++            }
++        }
++    }
++    
++    /**
++     * Evaluates this animation element for the passed interpolation time.  Interp
++     * must be on [0..1].
++     */
++    public AffineTransform eval(AffineTransform xform, double interp)
++    {
++        Point2D.Double point = new Point2D.Double();
++        
++        if (interp >= 1)
++        {
++            Bezier last = (Bezier)bezierSegs.get(bezierSegs.size() - 1);
++            last.getFinalPoint(point);
++            xform.setToTranslation(point.x, point.y);
++            return xform;
++        }
++        
++        double curLength = curveLength * interp;
++        for (Iterator it = bezierSegs.iterator(); it.hasNext();)
++        {
++            Bezier bez = (Bezier)it.next();
++            
++            double bezLength = bez.getLength();
++            if (curLength < bezLength)
++            {
++                double param = curLength / bezLength;
++                bez.eval(param, point);
++                break;
++            }
++            
++            curLength -= bezLength;
++        }
++        
++        xform.setToTranslation(point.x, point.y);
++        
++        return xform;
++    }
++    
++
++    protected void rebuild(AnimTimeParser animTimeParser) throws SVGException
++    {
++        super.rebuild(animTimeParser);
++
++        StyleAttribute sty = new StyleAttribute();
++
++        if (getPres(sty.setName("path")))
++        {
++            String strn = sty.getStringValue();
++            this.path = buildPath(strn, GeneralPath.WIND_NON_ZERO);
++        }
++
++        if (getPres(sty.setName("rotate")))
++        {
++            String strn = sty.getStringValue();
++            if (strn.equals("auto"))
++            {
++                this.rotateType = RT_AUTO;
++            }
++            else
++            {
++                try { this.rotate = Math.toRadians(Float.parseFloat(strn)); } catch (Exception e) {}
++            }
++        }
++
++        String from = null;
++        if (getPres(sty.setName("from")))
++        {
++            from = sty.getStringValue();
++        }
++
++        String to = null;
++        if (getPres(sty.setName("to")))
++        {
++            to = sty.getStringValue();
++        }
++        
++        buildPath(from, to);
++    }
++}
+Index: core/src/com/kitfox/svg/animation/AnimateTransform.java
 ===================================================================
---- josm.orig/src/com/kitfox/svg/animation/AnimateTransform.java        2011-07-17 10:45:40.334279938 +0200
-+++ /dev/null   1970-01-01 00:00:00.000000000 +0000
-@@ -1,302 +0,0 @@
--/*
-- * Animate.java
-- *
-- *  The Salamander Project - 2D and 3D graphics libraries in Java
-- *  Copyright (C) 2004 Mark McKay
-- *
-- *  This library is free software; you can redistribute it and/or
-- *  modify it under the terms of the GNU Lesser General Public
-- *  License as published by the Free Software Foundation; either
-- *  version 2.1 of the License, or (at your option) any later version.
-- *
-- *  This library is distributed in the hope that it will be useful,
-- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- *  Lesser General Public License for more details.
-- *
-- *  You should have received a copy of the GNU Lesser General Public
-- *  License along with this library; if not, write to the Free Software
-- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-- *
-- *  Mark McKay can be contacted at mark@kitfox.com.  Salamander and other
-- *  projects can be found at http://www.kitfox.com
-- *
-- * Created on August 15, 2004, 2:51 AM
-- */
--
--package com.kitfox.svg.animation;
--
--import com.kitfox.svg.SVGElement;
--import com.kitfox.svg.SVGException;
--import com.kitfox.svg.SVGLoaderHelper;
--import com.kitfox.svg.animation.parser.AnimTimeParser;
--import com.kitfox.svg.xml.StyleAttribute;
--import com.kitfox.svg.xml.XMLParseUtil;
--import java.awt.geom.AffineTransform;
--import java.util.regex.Pattern;
--import org.xml.sax.Attributes;
--import org.xml.sax.SAXException;
--
--
--/**
-- * @author Mark McKay
-- * @author <a href="mailto:mark@kitfox.com">Mark McKay</a>
-- */
--public class AnimateTransform extends AnimateXform
--{
--//    protected AffineTransform fromValue;
--//    protected AffineTransform toValue;
--//    protected double[] fromValue;  //Transform parameters
--//    protected double[] toValue;
--    protected double[][] values;
--    protected double[] keyTimes;
--
--    public static final int AT_REPLACE = 0;
--    public static final int AT_SUM = 1;
--
--    protected int additive = AT_REPLACE;
--
--    public static final int TR_TRANSLATE = 0;
--    public static final int TR_ROTATE = 1;
--    public static final int TR_SCALE = 2;
--    public static final int TR_SKEWY = 3;
--    public static final int TR_SKEWX = 4;
--    public static final int TR_INVALID = 5;
--
--    protected int xformType = TR_INVALID;
--
--    /** Creates a new instance of Animate */
--    public AnimateTransform()
--    {
--    }
--
--    public void loaderStartElement(SVGLoaderHelper helper, Attributes attrs, SVGElement parent) throws SAXException
--    {
--               //Load style string
--        super.loaderStartElement(helper, attrs, parent);
--
--        //Type of matrix of transform.  Should be one of the known names used to
--        // define matrix transforms
--        // valid types: translate, scale, rotate, skewX, skewY
--        // 'matrix' not valid for animation
--        String type = attrs.getValue("type").toLowerCase();
--        if (type.equals("translate")) xformType = TR_TRANSLATE;
--        if (type.equals("rotate")) xformType = TR_ROTATE;
--        if (type.equals("scale")) xformType = TR_SCALE;
--        if (type.equals("skewx")) xformType = TR_SKEWX;
--        if (type.equals("skewy")) xformType = TR_SKEWY;
--
--        String fromStrn = attrs.getValue("from");
--        String toStrn = attrs.getValue("to");
--        if (fromStrn != null && toStrn != null)
--        {
--            //fromValue = parseSingleTransform(type + "(" + strn + ")");
--            double[] fromValue = XMLParseUtil.parseDoubleList(fromStrn);
--            fromValue = validate(fromValue);
--
--    //        toValue = parseSingleTransform(type + "(" + strn + ")");
--            double[] toValue = XMLParseUtil.parseDoubleList(toStrn);
--            toValue = validate(toValue);
--            
--            values = new double[][]{fromValue, toValue};
--            keyTimes = new double[]{0, 1};
--        }
--
--        String keyTimeStrn = attrs.getValue("keyTimes");
--        String valuesStrn = attrs.getValue("values");
--        if (keyTimeStrn != null && valuesStrn != null)
--        {
--            keyTimes = XMLParseUtil.parseDoubleList(keyTimeStrn);
--            
--            String[] valueList = Pattern.compile(";").split(valuesStrn);
--            values = new double[valueList.length][];
--            for (int i = 0; i < valueList.length; i++)
--            {
--                double[] list = XMLParseUtil.parseDoubleList(valueList[i]);
--                values[i] = validate(list);
--            }
--        }
--        
--        //Check our additive state
--        String additive = attrs.getValue("additive");
--        if (additive != null)
--        {
--            if (additive.equals("sum")) this.additive = AT_SUM;
--        }
--    }
--
--    /**
--     * Check list size against current xform type and ensure list
--     * is expanded to a standard list size
--     */
--    private double[] validate(double[] paramList)
--    {
--        switch (xformType)
--        {
--            case TR_SCALE:
--            {
--                if (paramList == null)
--                {
--                    paramList = new double[]{1, 1};
--                }
--                else if (paramList.length == 1)
--                {
--                    paramList = new double[]{paramList[0], paramList[0]};
--                    
--//                    double[] tmp = paramList;
--//                    paramList = new double[2];
--//                    paramList[0] = paramList[1] = tmp[0];
--                }
--            }
--        }
--
--        return paramList;
--    }
--
--    /**
--     * Evaluates this animation element for the passed interpolation time.  Interp
--     * must be on [0..1].
--     */
--    public AffineTransform eval(AffineTransform xform, double interp)
--    {
--        int idx = 0;
--        for (; idx < keyTimes.length - 1; idx++)
--        {
--            if (interp >= keyTimes[idx])
--            {
--                idx--;
--                if (idx < 0) idx = 0;
--                break;
--            }
--        }
--        
--        double spanStartTime = keyTimes[idx];
--        double spanEndTime = keyTimes[idx + 1];
--//        double span = spanStartTime - spanEndTime;
--        
--        interp = (interp - spanStartTime) / (spanEndTime - spanStartTime);
--        double[] fromValue = values[idx];
--        double[] toValue = values[idx + 1];
--        
--        switch (xformType)
--        {
--            case TR_TRANSLATE:
--            {
--                double x = (1.0 - interp) * fromValue[0] + interp * toValue[0];
--                double y = (1.0 - interp) * fromValue[1] + interp * toValue[1];
--                xform.setToTranslation(x, y);
--                break;
--            }
--            case TR_ROTATE:
--            {
--                double x1 = fromValue.length == 3 ? fromValue[1] : 0;
--                double y1 = fromValue.length == 3 ? fromValue[2] : 0;
--                double x2 = toValue.length == 3 ? toValue[1] : 0;
--                double y2 = toValue.length == 3 ? toValue[2] : 0;
--                
--                double theta = (1.0 - interp) * fromValue[0] + interp * toValue[0];
--                double x = (1.0 - interp) * x1 + interp * x2;
--                double y = (1.0 - interp) * y1 + interp * y2;
--                xform.setToRotation(Math.toRadians(theta), x, y);
--                break;
--            }
--            case TR_SCALE:
--            {
--                double x = (1.0 - interp) * fromValue[0] + interp * toValue[0];
--                double y = (1.0 - interp) * fromValue[1] + interp * toValue[1];
--                xform.setToScale(x, y);
--                break;
--            }
--            case TR_SKEWX:
--            {
--                double x = (1.0 - interp) * fromValue[0] + interp * toValue[0];
--                xform.setToShear(Math.toRadians(x), 0.0);
--                break;
--            }
--            case TR_SKEWY:
--            {
--                double y = (1.0 - interp) * fromValue[0] + interp * toValue[0];
--                xform.setToShear(0.0, Math.toRadians(y));
--                break;
--            }
--            default:
--                xform.setToIdentity();
--                break;
--        }
--
--        return xform;
--    }
--
--    protected void rebuild(AnimTimeParser animTimeParser) throws SVGException
--    {
--        super.rebuild(animTimeParser);
--
--        StyleAttribute sty = new StyleAttribute();
--
--        if (getPres(sty.setName("type")))
--        {
--            String strn = sty.getStringValue().toLowerCase();
--            if (strn.equals("translate")) xformType = TR_TRANSLATE;
--            if (strn.equals("rotate")) xformType = TR_ROTATE;
--            if (strn.equals("scale")) xformType = TR_SCALE;
--            if (strn.equals("skewx")) xformType = TR_SKEWX;
--            if (strn.equals("skewy")) xformType = TR_SKEWY;
--        }
--
--        String fromStrn = null;
--        if (getPres(sty.setName("from")))
--        {
--            fromStrn = sty.getStringValue();
--        }
--
--        String toStrn = null;
--        if (getPres(sty.setName("to")))
--        {
--            toStrn = sty.getStringValue();
--        }
--
--        if (fromStrn != null && toStrn != null)
--        {
--            double[] fromValue = XMLParseUtil.parseDoubleList(fromStrn);
--            fromValue = validate(fromValue);
--
--            double[] toValue = XMLParseUtil.parseDoubleList(toStrn);
--            toValue = validate(toValue);
--
--            values = new double[][]{fromValue, toValue};
--        }
--
--        String keyTimeStrn = null;
--        if (getPres(sty.setName("keyTimes")))
--        {
--            keyTimeStrn = sty.getStringValue();
--        }
--
--        String valuesStrn = null;
--        if (getPres(sty.setName("values")))
--        {
--            valuesStrn = sty.getStringValue();
--        }
--
--        if (keyTimeStrn != null && valuesStrn != null)
--        {
--            keyTimes = XMLParseUtil.parseDoubleList(keyTimeStrn);
--
--            String[] valueList = Pattern.compile(";").split(valuesStrn);
--            values = new double[valueList.length][];
--            for (int i = 0; i < valueList.length; i++)
--            {
--                double[] list = XMLParseUtil.parseDoubleList(valueList[i]);
--                values[i] = validate(list);
--            }
--        }
--
--        //Check our additive state
--
--        if (getPres(sty.setName("additive")))
--        {
--            String strn = sty.getStringValue().toLowerCase();
--            if (strn.equals("sum")) this.additive = AT_SUM;
--        }
--    }
--}
-Index: josm/src/com/kitfox/svg/animation/AnimateXform.java
+--- /dev/null   1970-01-01 00:00:00.000000000 +0000
++++ core/src/com/kitfox/svg/animation/AnimateTransform.java     2012-06-17 23:56:57.676545050 +0200
+@@ -0,0 +1,302 @@
++/*
++ * Animate.java
++ *
++ *  The Salamander Project - 2D and 3D graphics libraries in Java
++ *  Copyright (C) 2004 Mark McKay
++ *
++ *  This library is free software; you can redistribute it and/or
++ *  modify it under the terms of the GNU Lesser General Public
++ *  License as published by the Free Software Foundation; either
++ *  version 2.1 of the License, or (at your option) any later version.
++ *
++ *  This library is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ *  Lesser General Public License for more details.
++ *
++ *  You should have received a copy of the GNU Lesser General Public
++ *  License along with this library; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ *
++ *  Mark McKay can be contacted at mark@kitfox.com.  Salamander and other
++ *  projects can be found at http://www.kitfox.com
++ *
++ * Created on August 15, 2004, 2:51 AM
++ */
++
++package com.kitfox.svg.animation;
++
++import com.kitfox.svg.SVGElement;
++import com.kitfox.svg.SVGException;
++import com.kitfox.svg.SVGLoaderHelper;
++import com.kitfox.svg.animation.parser.AnimTimeParser;
++import com.kitfox.svg.xml.StyleAttribute;
++import com.kitfox.svg.xml.XMLParseUtil;
++import java.awt.geom.AffineTransform;
++import java.util.regex.Pattern;
++import org.xml.sax.Attributes;
++import org.xml.sax.SAXException;
++
++
++/**
++ * @author Mark McKay
++ * @author <a href="mailto:mark@kitfox.com">Mark McKay</a>
++ */
++public class AnimateTransform extends AnimateXform
++{
++//    protected AffineTransform fromValue;
++//    protected AffineTransform toValue;
++//    protected double[] fromValue;  //Transform parameters
++//    protected double[] toValue;
++    protected double[][] values;
++    protected double[] keyTimes;
++
++    public static final int AT_REPLACE = 0;
++    public static final int AT_SUM = 1;
++
++    protected int additive = AT_REPLACE;
++
++    public static final int TR_TRANSLATE = 0;
++    public static final int TR_ROTATE = 1;
++    public static final int TR_SCALE = 2;
++    public static final int TR_SKEWY = 3;
++    public static final int TR_SKEWX = 4;
++    public static final int TR_INVALID = 5;
++
++    protected int xformType = TR_INVALID;
++
++    /** Creates a new instance of Animate */
++    public AnimateTransform()
++    {
++    }
++
++    public void loaderStartElement(SVGLoaderHelper helper, Attributes attrs, SVGElement parent) throws SAXException
++    {
++               //Load style string
++        super.loaderStartElement(helper, attrs, parent);
++
++        //Type of matrix of transform.  Should be one of the known names used to
++        // define matrix transforms
++        // valid types: translate, scale, rotate, skewX, skewY
++        // 'matrix' not valid for animation
++        String type = attrs.getValue("type").toLowerCase();
++        if (type.equals("translate")) xformType = TR_TRANSLATE;
++        if (type.equals("rotate")) xformType = TR_ROTATE;
++        if (type.equals("scale")) xformType = TR_SCALE;
++        if (type.equals("skewx")) xformType = TR_SKEWX;
++        if (type.equals("skewy")) xformType = TR_SKEWY;
++
++        String fromStrn = attrs.getValue("from");
++        String toStrn = attrs.getValue("to");
++        if (fromStrn != null && toStrn != null)
++        {
++            //fromValue = parseSingleTransform(type + "(" + strn + ")");
++            double[] fromValue = XMLParseUtil.parseDoubleList(fromStrn);
++            fromValue = validate(fromValue);
++
++    //        toValue = parseSingleTransform(type + "(" + strn + ")");
++            double[] toValue = XMLParseUtil.parseDoubleList(toStrn);
++            toValue = validate(toValue);
++            
++            values = new double[][]{fromValue, toValue};
++            keyTimes = new double[]{0, 1};
++        }
++
++        String keyTimeStrn = attrs.getValue("keyTimes");
++        String valuesStrn = attrs.getValue("values");
++        if (keyTimeStrn != null && valuesStrn != null)
++        {
++            keyTimes = XMLParseUtil.parseDoubleList(keyTimeStrn);
++            
++            String[] valueList = Pattern.compile(";").split(valuesStrn);
++            values = new double[valueList.length][];
++            for (int i = 0; i < valueList.length; i++)
++            {
++                double[] list = XMLParseUtil.parseDoubleList(valueList[i]);
++                values[i] = validate(list);
++            }
++        }
++        
++        //Check our additive state
++        String additive = attrs.getValue("additive");
++        if (additive != null)
++        {
++            if (additive.equals("sum")) this.additive = AT_SUM;
++        }
++    }
++
++    /**
++     * Check list size against current xform type and ensure list
++     * is expanded to a standard list size
++     */
++    private double[] validate(double[] paramList)
++    {
++        switch (xformType)
++        {
++            case TR_SCALE:
++            {
++                if (paramList == null)
++                {
++                    paramList = new double[]{1, 1};
++                }
++                else if (paramList.length == 1)
++                {
++                    paramList = new double[]{paramList[0], paramList[0]};
++                    
++//                    double[] tmp = paramList;
++//                    paramList = new double[2];
++//                    paramList[0] = paramList[1] = tmp[0];
++                }
++            }
++        }
++
++        return paramList;
++    }
++
++    /**
++     * Evaluates this animation element for the passed interpolation time.  Interp
++     * must be on [0..1].
++     */
++    public AffineTransform eval(AffineTransform xform, double interp)
++    {
++        int idx = 0;
++        for (; idx < keyTimes.length - 1; idx++)
++        {
++            if (interp >= keyTimes[idx])
++            {
++                idx--;
++                if (idx < 0) idx = 0;
++                break;
++            }
++        }
++        
++        double spanStartTime = keyTimes[idx];
++        double spanEndTime = keyTimes[idx + 1];
++//        double span = spanStartTime - spanEndTime;
++        
++        interp = (interp - spanStartTime) / (spanEndTime - spanStartTime);
++        double[] fromValue = values[idx];
++        double[] toValue = values[idx + 1];
++        
++        switch (xformType)
++        {
++            case TR_TRANSLATE:
++            {
++                double x = (1.0 - interp) * fromValue[0] + interp * toValue[0];
++                double y = (1.0 - interp) * fromValue[1] + interp * toValue[1];
++                xform.setToTranslation(x, y);
++                break;
++            }
++            case TR_ROTATE:
++            {
++                double x1 = fromValue.length == 3 ? fromValue[1] : 0;
++                double y1 = fromValue.length == 3 ? fromValue[2] : 0;
++                double x2 = toValue.length == 3 ? toValue[1] : 0;
++                double y2 = toValue.length == 3 ? toValue[2] : 0;
++                
++                double theta = (1.0 - interp) * fromValue[0] + interp * toValue[0];
++                double x = (1.0 - interp) * x1 + interp * x2;
++                double y = (1.0 - interp) * y1 + interp * y2;
++                xform.setToRotation(Math.toRadians(theta), x, y);
++                break;
++            }
++            case TR_SCALE:
++            {
++                double x = (1.0 - interp) * fromValue[0] + interp * toValue[0];
++                double y = (1.0 - interp) * fromValue[1] + interp * toValue[1];
++                xform.setToScale(x, y);
++                break;
++            }
++            case TR_SKEWX:
++            {
++                double x = (1.0 - interp) * fromValue[0] + interp * toValue[0];
++                xform.setToShear(Math.toRadians(x), 0.0);
++                break;
++            }
++            case TR_SKEWY:
++            {
++                double y = (1.0 - interp) * fromValue[0] + interp * toValue[0];
++                xform.setToShear(0.0, Math.toRadians(y));
++                break;
++            }
++            default:
++                xform.setToIdentity();
++                break;
++        }
++
++        return xform;
++    }
++
++    protected void rebuild(AnimTimeParser animTimeParser) throws SVGException
++    {
++        super.rebuild(animTimeParser);
++
++        StyleAttribute sty = new StyleAttribute();
++
++        if (getPres(sty.setName("type")))
++        {
++            String strn = sty.getStringValue().toLowerCase();
++            if (strn.equals("translate")) xformType = TR_TRANSLATE;
++            if (strn.equals("rotate")) xformType = TR_ROTATE;
++            if (strn.equals("scale")) xformType = TR_SCALE;
++            if (strn.equals("skewx")) xformType = TR_SKEWX;
++            if (strn.equals("skewy")) xformType = TR_SKEWY;
++        }
++
++        String fromStrn = null;
++        if (getPres(sty.setName("from")))
++        {
++            fromStrn = sty.getStringValue();
++        }
++
++        String toStrn = null;
++        if (getPres(sty.setName("to")))
++        {
++            toStrn = sty.getStringValue();
++        }
++
++        if (fromStrn != null && toStrn != null)
++        {
++            double[] fromValue = XMLParseUtil.parseDoubleList(fromStrn);
++            fromValue = validate(fromValue);
++
++            double[] toValue = XMLParseUtil.parseDoubleList(toStrn);
++            toValue = validate(toValue);
++
++            values = new double[][]{fromValue, toValue};
++        }
++
++        String keyTimeStrn = null;
++        if (getPres(sty.setName("keyTimes")))
++        {
++            keyTimeStrn = sty.getStringValue();
++        }
++
++        String valuesStrn = null;
++        if (getPres(sty.setName("values")))
++        {
++            valuesStrn = sty.getStringValue();
++        }
++
++        if (keyTimeStrn != null && valuesStrn != null)
++        {
++            keyTimes = XMLParseUtil.parseDoubleList(keyTimeStrn);
++
++            String[] valueList = Pattern.compile(";").split(valuesStrn);
++            values = new double[valueList.length][];
++            for (int i = 0; i < valueList.length; i++)
++            {
++                double[] list = XMLParseUtil.parseDoubleList(valueList[i]);
++                values[i] = validate(list);
++            }
++        }
++
++        //Check our additive state
++
++        if (getPres(sty.setName("additive")))
++        {
++            String strn = sty.getStringValue().toLowerCase();
++            if (strn.equals("sum")) this.additive = AT_SUM;
++        }
++    }
++}
+Index: core/src/com/kitfox/svg/animation/AnimateXform.java
 ===================================================================
---- josm.orig/src/com/kitfox/svg/animation/AnimateXform.java    2011-07-17 10:45:41.418285313 +0200
-+++ /dev/null   1970-01-01 00:00:00.000000000 +0000
-@@ -1,54 +0,0 @@
--/*
-- * AnimateXform.java
-- *
-- *  The Salamander Project - 2D and 3D graphics libraries in Java
-- *  Copyright (C) 2004 Mark McKay
-- *
-- *  This library is free software; you can redistribute it and/or
-- *  modify it under the terms of the GNU Lesser General Public
-- *  License as published by the Free Software Foundation; either
-- *  version 2.1 of the License, or (at your option) any later version.
-- *
-- *  This library is distributed in the hope that it will be useful,
-- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- *  Lesser General Public License for more details.
-- *
-- *  You should have received a copy of the GNU Lesser General Public
-- *  License along with this library; if not, write to the Free Software
-- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-- *
-- *  Mark McKay can be contacted at mark@kitfox.com.  Salamander and other
-- *  projects can be found at http://www.kitfox.com
-- *
-- * Created on January 14, 2005, 6:46 AM
-- */
--
--package com.kitfox.svg.animation;
--
--import com.kitfox.svg.SVGElement;
--import com.kitfox.svg.SVGLoaderHelper;
--import java.awt.geom.AffineTransform;
--import org.xml.sax.Attributes;
--import org.xml.sax.SAXException;
--
--
--
--/**
-- *
-- * @author kitfox
-- */
--abstract public class AnimateXform extends AnimateBase
--{
--    public AnimateXform()
--    {
--    }
--    
--    public void loaderStartElement(SVGLoaderHelper helper, Attributes attrs, SVGElement parent) throws SAXException
--    {
--        super.loaderStartElement(helper, attrs, parent);
--    }
--    
--    abstract public AffineTransform eval(AffineTransform xform, double interp);
--    
--}
-Index: josm/src/com/kitfox/svg/animation/AnimationElement.java
+--- /dev/null   1970-01-01 00:00:00.000000000 +0000
++++ core/src/com/kitfox/svg/animation/AnimateXform.java 2012-06-17 23:56:57.676545050 +0200
+@@ -0,0 +1,54 @@
++/*
++ * AnimateXform.java
++ *
++ *  The Salamander Project - 2D and 3D graphics libraries in Java
++ *  Copyright (C) 2004 Mark McKay
++ *
++ *  This library is free software; you can redistribute it and/or
++ *  modify it under the terms of the GNU Lesser General Public
++ *  License as published by the Free Software Foundation; either
++ *  version 2.1 of the License, or (at your option) any later version.
++ *
++ *  This library is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ *  Lesser General Public License for more details.
++ *
++ *  You should have received a copy of the GNU Lesser General Public
++ *  License along with this library; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ *
++ *  Mark McKay can be contacted at mark@kitfox.com.  Salamander and other
++ *  projects can be found at http://www.kitfox.com
++ *
++ * Created on January 14, 2005, 6:46 AM
++ */
++
++package com.kitfox.svg.animation;
++
++import com.kitfox.svg.SVGElement;
++import com.kitfox.svg.SVGLoaderHelper;
++import java.awt.geom.AffineTransform;
++import org.xml.sax.Attributes;
++import org.xml.sax.SAXException;
++
++
++
++/**
++ *
++ * @author kitfox
++ */
++abstract public class AnimateXform extends AnimateBase
++{
++    public AnimateXform()
++    {
++    }
++    
++    public void loaderStartElement(SVGLoaderHelper helper, Attributes attrs, SVGElement parent) throws SAXException
++    {
++        super.loaderStartElement(helper, attrs, parent);
++    }
++    
++    abstract public AffineTransform eval(AffineTransform xform, double interp);
++    
++}
+Index: core/src/com/kitfox/svg/animation/AnimationElement.java
 ===================================================================
---- josm.orig/src/com/kitfox/svg/animation/AnimationElement.java        2011-07-17 10:45:38.918272914 +0200
-+++ /dev/null   1970-01-01 00:00:00.000000000 +0000
-@@ -1,414 +0,0 @@
--/*
-- * AnimateEle.java
-- *
-- *  The Salamander Project - 2D and 3D graphics libraries in Java
-- *  Copyright (C) 2004 Mark McKay
-- *
-- *  This library is free software; you can redistribute it and/or
-- *  modify it under the terms of the GNU Lesser General Public
-- *  License as published by the Free Software Foundation; either
-- *  version 2.1 of the License, or (at your option) any later version.
-- *
-- *  This library is distributed in the hope that it will be useful,
-- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- *  Lesser General Public License for more details.
-- *
-- *  You should have received a copy of the GNU Lesser General Public
-- *  License along with this library; if not, write to the Free Software
-- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-- *
-- *  Mark McKay can be contacted at mark@kitfox.com.  Salamander and other
-- *  projects can be found at http://www.kitfox.com
-- *
-- * Created on August 15, 2004, 2:52 AM
-- */
--
--package com.kitfox.svg.animation;
--
--import com.kitfox.svg.SVGElement;
--import com.kitfox.svg.SVGException;
--import com.kitfox.svg.SVGLoaderHelper;
--import com.kitfox.svg.animation.parser.AnimTimeParser;
--import com.kitfox.svg.animation.parser.ParseException;
--import com.kitfox.svg.xml.StyleAttribute;
--import java.io.StringReader;
--import org.xml.sax.Attributes;
--import org.xml.sax.SAXException;
--
--
--/**
-- * @author Mark McKay
-- * @author <a href="mailto:mark@kitfox.com">Mark McKay</a>
-- */
--public abstract class AnimationElement extends SVGElement
--{
--    protected String attribName;
--//    protected String attribType;
--    protected int attribType = AT_AUTO;
--
--    public static final int AT_CSS = 0;
--    public static final int AT_XML = 1;
--    public static final int AT_AUTO = 2;  //Check CSS first, then XML
--
--    protected TimeBase beginTime;
--    protected TimeBase durTime;
--    protected TimeBase endTime;
--    protected int fillType = FT_AUTO;
--
--    /** <a href="http://www.w3.org/TR/smil20/smil-timing.html#adef-fill">More about the <b>fill</b> attribute</a> */
--    public static final int FT_REMOVE = 0;
--    public static final int FT_FREEZE = 1;
--    public static final int FT_HOLD = 2;
--    public static final int FT_TRANSITION = 3;
--    public static final int FT_AUTO = 4;
--    public static final int FT_DEFAULT = 5;
--
--    /** Additive state of track */
--    public static final int AD_REPLACE = 0;
--    public static final int AD_SUM = 1;
--
--    int additiveType = AD_REPLACE;
--    
--    /** Accumlative state */
--    public static final int AC_REPLACE = 0;
--    public static final int AC_SUM = 1;
--
--    int accumulateType = AC_REPLACE;
--
--    /** Creates a new instance of AnimateEle */
--    public AnimationElement()
--    {
--    }
--
--    public static String animationElementToString(int attrValue)
--    {
--        switch (attrValue)
--        {
--            case AT_CSS:
--                return "CSS";
--            case AT_XML:
--                return "XML";
--            case AT_AUTO:
--                return "AUTO";
--            default:
--                throw new RuntimeException("Unknown element type");
--        }
--    }
--    
--    public void loaderStartElement(SVGLoaderHelper helper, Attributes attrs, SVGElement parent) throws SAXException
--    {
--               //Load style string
--        super.loaderStartElement(helper, attrs, parent);
--
--        attribName = attrs.getValue("attributeName");
--        String attribType = attrs.getValue("attributeType");
--        if (attribType != null)
--        {
--            attribType = attribType.toLowerCase();
--            if (attribType.equals("css")) this.attribType = AT_CSS;
--            else if (attribType.equals("xml")) this.attribType = AT_XML;
--        }
--
--        String beginTime = attrs.getValue("begin");
--        String durTime = attrs.getValue("dur");
--        String endTime = attrs.getValue("end");
--
--        try
--        {
--            if (beginTime != null)
--            {
--                helper.animTimeParser.ReInit(new StringReader(beginTime));
--                this.beginTime = helper.animTimeParser.Expr();
--                this.beginTime.setParentElement(this);
--            }
--
--            if (durTime != null)
--            {
--                helper.animTimeParser.ReInit(new StringReader(durTime));
--                this.durTime = helper.animTimeParser.Expr();
--                this.durTime.setParentElement(this);
--            }
--
--            if (endTime != null)
--            {
--                helper.animTimeParser.ReInit(new StringReader(endTime));
--                this.endTime = helper.animTimeParser.Expr();
--                this.endTime.setParentElement(this);
--            }
--        }
--        catch (Exception e)
--        {
--            throw new SAXException(e);
--        }
--        
--//        this.beginTime = TimeBase.parseTime(beginTime);
--//        this.durTime = TimeBase.parseTime(durTime);
--//        this.endTime = TimeBase.parseTime(endTime);
--
--        String fill = attrs.getValue("fill");
--
--        if (fill != null)
--        {
--            if (fill.equals("remove")) this.fillType = FT_REMOVE;
--            if (fill.equals("freeze")) this.fillType = FT_FREEZE;
--            if (fill.equals("hold")) this.fillType = FT_HOLD;
--            if (fill.equals("transiton")) this.fillType = FT_TRANSITION;
--            if (fill.equals("auto")) this.fillType = FT_AUTO;
--            if (fill.equals("default")) this.fillType = FT_DEFAULT;
--        }
--        
--        String additiveStrn = attrs.getValue("additive");
--        
--        if (additiveStrn != null)
--        {
--            if (additiveStrn.equals("replace")) this.additiveType = AD_REPLACE;
--            if (additiveStrn.equals("sum")) this.additiveType = AD_SUM;
--        }
--        
--        String accumulateStrn = attrs.getValue("accumulate");
--        
--        if (accumulateStrn != null)
--        {
--            if (accumulateStrn.equals("replace")) this.accumulateType = AC_REPLACE;
--            if (accumulateStrn.equals("sum")) this.accumulateType = AC_SUM;
--        }
--    }
--
--    public String getAttribName() { return attribName; }
--    public int getAttribType() { return attribType; }
--    public int getAdditiveType() { return additiveType; }
--    public int getAccumulateType() { return accumulateType; }
--
--    public void evalParametric(AnimationTimeEval state, double curTime)
--    {
--        evalParametric(state, curTime, Double.NaN, Double.NaN);
--    }
--
--    /**
--     * Compares current time to start and end times and determines what degree
--     * of time interpolation this track currently represents.  Returns
--     * Float.NaN if this track cannot be evaluated at the passed time (ie,
--     * it is before or past the end of the track, or it depends upon
--     * an unknown event)
--     * @param state - A structure that will be filled with information
--     * regarding the applicability of this animatoin element at the passed
--     * time.
--     * @param curTime - Current time in seconds
--     * @param repeatCount - Optional number of repetitions of length 'dur' to
--     * do.  Set to Double.NaN to not consider this in the calculation.
--     * @param repeatDur - Optional amoun tof time to repeat the animaiton.
--     * Set to Double.NaN to not consider this in the calculation.
--     */
--    protected void evalParametric(AnimationTimeEval state, double curTime, double repeatCount, double repeatDur)
--    {
--        double begin = (beginTime == null) ? 0 : beginTime.evalTime();
--        if (Double.isNaN(begin) || begin > curTime)
--        {
--            state.set(Double.NaN, 0);
--            return;
--        }
--
--        double dur = (durTime == null) ? Double.NaN : durTime.evalTime();
--        if (Double.isNaN(dur))
--        {
--            state.set(Double.NaN, 0);
--            return;
--        }
--
--        //Determine end point of this animation
--        double end = (endTime == null) ? Double.NaN : endTime.evalTime();
--        double repeat;
--//        if (Double.isNaN(repeatDur))
--//        {
--//            repeatDur = dur;
--//        }
--        if (Double.isNaN(repeatCount) && Double.isNaN(repeatDur))
--        {
--            repeat = Double.NaN;
--        }
--        else
--        {
--            repeat = Math.min(
--                Double.isNaN(repeatCount) ? Double.POSITIVE_INFINITY : dur * repeatCount,
--                Double.isNaN(repeatDur) ? Double.POSITIVE_INFINITY : repeatDur);
--        }
--        if (Double.isNaN(repeat) && Double.isNaN(end))
--        {
--            //If neither and end point nor a repeat is specified, end point is 
--            // implied by duration.
--            end = begin + dur;
--        }
--
--        double finishTime;
--        if (Double.isNaN(end))
--        {
--            finishTime = begin + repeat;
--        }
--        else if (Double.isNaN(repeat))
--        {
--            finishTime = end;
--        }
--        else
--        {
--            finishTime = Math.min(end, repeat);
--        }
--        
--        double evalTime = Math.min(curTime, finishTime);
--//        if (curTime > finishTime) evalTime = finishTime;
--        
--        
--//        double evalTime = curTime;
--
--//        boolean pastEnd = curTime > evalTime;
--        
--//        if (!Double.isNaN(end) && curTime > end) { pastEnd = true; evalTime = Math.min(evalTime, end); }
--//        if (!Double.isNaN(repeat) && curTime > repeat) { pastEnd = true; evalTime = Math.min(evalTime, repeat); }
--        
--        double ratio = (evalTime - begin) / dur;
--        int rep = (int)ratio;
--        double interp = ratio - rep;
--        
--        //Adjust for roundoff
--        if (interp < 0.00001) interp = 0;
--
--//        state.set(interp, rep);
--//        if (!pastEnd)
--//        {
--//            state.set(interp, rep, false);
--//            return;
--//        }
--
--        //If we are still within the clip, return value
--        if (curTime == evalTime)
--        {
--            state.set(interp, rep);
--            return;
--        }
--        
--        //We are past end of clip.  Determine to clamp or ignore.
--        switch (fillType)
--        {
--            default:
--            case FT_REMOVE:
--            case FT_AUTO:
--            case FT_DEFAULT:
--                state.set(Double.NaN, rep);
--                return;
--            case FT_FREEZE:
--            case FT_HOLD:
--            case FT_TRANSITION:
--                state.set(interp == 0 ? 1 : interp, rep);
--                return;
--        }
--
--    }
--
--    double evalStartTime()
--    {
--        return beginTime == null ? Double.NaN : beginTime.evalTime();
--    }
--
--    double evalDurTime()
--    {
--        return durTime == null ? Double.NaN : durTime.evalTime();
--    }
--
--    /**
--     * Evaluates the ending time of this element.  Returns 0 if not specified.
--     *
--     * @see hasEndTime
--     */
--    double evalEndTime()
--    {
--        return endTime == null ? Double.NaN : endTime.evalTime();
--    }
--
--    /**
--     * Checks to see if an end time has been specified for this element.
--     */
--    boolean hasEndTime() { return endTime != null; }
--
--    /**
--     * Updates all attributes in this diagram associated with a time event.
--     * Ie, all attributes with track information.
--     * @return - true if this node has changed state as a result of the time
--     * update
--     */
--    public boolean updateTime(double curTime)
--    {
--        //Animation elements to not change with time
--        return false;
--    }
--
--    public void rebuild() throws SVGException
--    {
--        AnimTimeParser animTimeParser = new AnimTimeParser(new StringReader(""));
--
--        rebuild(animTimeParser);
--    }
--
--    protected void rebuild(AnimTimeParser animTimeParser) throws SVGException
--    {
--        StyleAttribute sty = new StyleAttribute();
--
--        if (getPres(sty.setName("begin")))
--        {
--            String newVal = sty.getStringValue();
--            animTimeParser.ReInit(new StringReader(newVal));
--            try {
--                this.beginTime = animTimeParser.Expr();
--            } catch (ParseException ex) {
--                ex.printStackTrace();
--            }
--        }
--
--        if (getPres(sty.setName("dur")))
--        {
--            String newVal = sty.getStringValue();
--            animTimeParser.ReInit(new StringReader(newVal));
--            try {
--                this.durTime = animTimeParser.Expr();
--            } catch (ParseException ex) {
--                ex.printStackTrace();
--            }
--        }
--
--        if (getPres(sty.setName("end")))
--        {
--            String newVal = sty.getStringValue();
--            animTimeParser.ReInit(new StringReader(newVal));
--            try {
--                this.endTime = animTimeParser.Expr();
--            } catch (ParseException ex) {
--                ex.printStackTrace();
--            }
--        }
--
--        if (getPres(sty.setName("fill")))
--        {
--            String newVal = sty.getStringValue();
--            if (newVal.equals("remove")) this.fillType = FT_REMOVE;
--            if (newVal.equals("freeze")) this.fillType = FT_FREEZE;
--            if (newVal.equals("hold")) this.fillType = FT_HOLD;
--            if (newVal.equals("transiton")) this.fillType = FT_TRANSITION;
--            if (newVal.equals("auto")) this.fillType = FT_AUTO;
--            if (newVal.equals("default")) this.fillType = FT_DEFAULT;
--        }
--
--        if (getPres(sty.setName("additive")))
--        {
--            String newVal = sty.getStringValue();
--            if (newVal.equals("replace")) this.additiveType = AD_REPLACE;
--            if (newVal.equals("sum")) this.additiveType = AD_SUM;
--        }
--
--        if (getPres(sty.setName("accumulate")))
--        {
--            String newVal = sty.getStringValue();
--            if (newVal.equals("replace")) this.accumulateType = AC_REPLACE;
--            if (newVal.equals("sum")) this.accumulateType = AC_SUM;
--        }
--
--    }
--}
-Index: josm/src/com/kitfox/svg/animation/AnimationTimeEval.java
+--- /dev/null   1970-01-01 00:00:00.000000000 +0000
++++ core/src/com/kitfox/svg/animation/AnimationElement.java     2012-06-17 23:56:57.676545050 +0200
+@@ -0,0 +1,414 @@
++/*
++ * AnimateEle.java
++ *
++ *  The Salamander Project - 2D and 3D graphics libraries in Java
++ *  Copyright (C) 2004 Mark McKay
++ *
++ *  This library is free software; you can redistribute it and/or
++ *  modify it under the terms of the GNU Lesser General Public
++ *  License as published by the Free Software Foundation; either
++ *  version 2.1 of the License, or (at your option) any later version.
++ *
++ *  This library is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ *  Lesser General Public License for more details.
++ *
++ *  You should have received a copy of the GNU Lesser General Public
++ *  License along with this library; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ *
++ *  Mark McKay can be contacted at mark@kitfox.com.  Salamander and other
++ *  projects can be found at http://www.kitfox.com
++ *
++ * Created on August 15, 2004, 2:52 AM
++ */
++
++package com.kitfox.svg.animation;
++
++import com.kitfox.svg.SVGElement;
++import com.kitfox.svg.SVGException;
++import com.kitfox.svg.SVGLoaderHelper;
++import com.kitfox.svg.animation.parser.AnimTimeParser;
++import com.kitfox.svg.animation.parser.ParseException;
++import com.kitfox.svg.xml.StyleAttribute;
++import java.io.StringReader;
++import org.xml.sax.Attributes;
++import org.xml.sax.SAXException;
++
++
++/**
++ * @author Mark McKay
++ * @author <a href="mailto:mark@kitfox.com">Mark McKay</a>
++ */
++public abstract class AnimationElement extends SVGElement
++{
++    protected String attribName;
++//    protected String attribType;
++    protected int attribType = AT_AUTO;
++
++    public static final int AT_CSS = 0;
++    public static final int AT_XML = 1;
++    public static final int AT_AUTO = 2;  //Check CSS first, then XML
++
++    protected TimeBase beginTime;
++    protected TimeBase durTime;
++    protected TimeBase endTime;
++    protected int fillType = FT_AUTO;
++
++    /** <a href="http://www.w3.org/TR/smil20/smil-timing.html#adef-fill">More about the <b>fill</b> attribute</a> */
++    public static final int FT_REMOVE = 0;
++    public static final int FT_FREEZE = 1;
++    public static final int FT_HOLD = 2;
++    public static final int FT_TRANSITION = 3;
++    public static final int FT_AUTO = 4;
++    public static final int FT_DEFAULT = 5;
++
++    /** Additive state of track */
++    public static final int AD_REPLACE = 0;
++    public static final int AD_SUM = 1;
++
++    int additiveType = AD_REPLACE;
++    
++    /** Accumlative state */
++    public static final int AC_REPLACE = 0;
++    public static final int AC_SUM = 1;
++
++    int accumulateType = AC_REPLACE;
++
++    /** Creates a new instance of AnimateEle */
++    public AnimationElement()
++    {
++    }
++
++    public static String animationElementToString(int attrValue)
++    {
++        switch (attrValue)
++        {
++            case AT_CSS:
++                return "CSS";
++            case AT_XML:
++                return "XML";
++            case AT_AUTO:
++                return "AUTO";
++            default:
++                throw new RuntimeException("Unknown element type");
++        }
++    }
++    
++    public void loaderStartElement(SVGLoaderHelper helper, Attributes attrs, SVGElement parent) throws SAXException
++    {
++               //Load style string
++        super.loaderStartElement(helper, attrs, parent);
++
++        attribName = attrs.getValue("attributeName");
++        String attribType = attrs.getValue("attributeType");
++        if (attribType != null)
++        {
++            attribType = attribType.toLowerCase();
++            if (attribType.equals("css")) this.attribType = AT_CSS;
++            else if (attribType.equals("xml")) this.attribType = AT_XML;
++        }
++
++        String beginTime = attrs.getValue("begin");
++        String durTime = attrs.getValue("dur");
++        String endTime = attrs.getValue("end");
++
++        try
++        {
++            if (beginTime != null)
++            {
++                helper.animTimeParser.ReInit(new StringReader(beginTime));
++                this.beginTime = helper.animTimeParser.Expr();
++                this.beginTime.setParentElement(this);
++            }
++
++            if (durTime != null)
++            {
++                helper.animTimeParser.ReInit(new StringReader(durTime));
++                this.durTime = helper.animTimeParser.Expr();
++                this.durTime.setParentElement(this);
++            }
++
++            if (endTime != null)
++            {
++                helper.animTimeParser.ReInit(new StringReader(endTime));
++                this.endTime = helper.animTimeParser.Expr();
++                this.endTime.setParentElement(this);
++            }
++        }
++        catch (Exception e)
++        {
++            throw new SAXException(e);
++        }
++        
++//        this.beginTime = TimeBase.parseTime(beginTime);
++//        this.durTime = TimeBase.parseTime(durTime);
++//        this.endTime = TimeBase.parseTime(endTime);
++
++        String fill = attrs.getValue("fill");
++
++        if (fill != null)
++        {
++            if (fill.equals("remove")) this.fillType = FT_REMOVE;
++            if (fill.equals("freeze")) this.fillType = FT_FREEZE;
++            if (fill.equals("hold")) this.fillType = FT_HOLD;
++            if (fill.equals("transiton")) this.fillType = FT_TRANSITION;
++            if (fill.equals("auto")) this.fillType = FT_AUTO;
++            if (fill.equals("default")) this.fillType = FT_DEFAULT;
++        }
++        
++        String additiveStrn = attrs.getValue("additive");
++        
++        if (additiveStrn != null)
++        {
++            if (additiveStrn.equals("replace")) this.additiveType = AD_REPLACE;
++            if (additiveStrn.equals("sum")) this.additiveType = AD_SUM;
++        }
++        
++        String accumulateStrn = attrs.getValue("accumulate");
++        
++        if (accumulateStrn != null)
++        {
++            if (accumulateStrn.equals("replace")) this.accumulateType = AC_REPLACE;
++            if (accumulateStrn.equals("sum")) this.accumulateType = AC_SUM;
++        }
++    }
++
++    public String getAttribName() { return attribName; }
++    public int getAttribType() { return attribType; }
++    public int getAdditiveType() { return additiveType; }
++    public int getAccumulateType() { return accumulateType; }
++
++    public void evalParametric(AnimationTimeEval state, double curTime)
++    {
++        evalParametric(state, curTime, Double.NaN, Double.NaN);
++    }
++
++    /**
++     * Compares current time to start and end times and determines what degree
++     * of time interpolation this track currently represents.  Returns
++     * Float.NaN if this track cannot be evaluated at the passed time (ie,
++     * it is before or past the end of the track, or it depends upon
++     * an unknown event)
++     * @param state - A structure that will be filled with information
++     * regarding the applicability of this animatoin element at the passed
++     * time.
++     * @param curTime - Current time in seconds
++     * @param repeatCount - Optional number of repetitions of length 'dur' to
++     * do.  Set to Double.NaN to not consider this in the calculation.
++     * @param repeatDur - Optional amoun tof time to repeat the animaiton.
++     * Set to Double.NaN to not consider this in the calculation.
++     */
++    protected void evalParametric(AnimationTimeEval state, double curTime, double repeatCount, double repeatDur)
++    {
++        double begin = (beginTime == null) ? 0 : beginTime.evalTime();
++        if (Double.isNaN(begin) || begin > curTime)
++        {
++            state.set(Double.NaN, 0);
++            return;
++        }
++
++        double dur = (durTime == null) ? Double.NaN : durTime.evalTime();
++        if (Double.isNaN(dur))
++        {
++            state.set(Double.NaN, 0);
++            return;
++        }
++
++        //Determine end point of this animation
++        double end = (endTime == null) ? Double.NaN : endTime.evalTime();
++        double repeat;
++//        if (Double.isNaN(repeatDur))
++//        {
++//            repeatDur = dur;
++//        }
++        if (Double.isNaN(repeatCount) && Double.isNaN(repeatDur))
++        {
++            repeat = Double.NaN;
++        }
++        else
++        {
++            repeat = Math.min(
++                Double.isNaN(repeatCount) ? Double.POSITIVE_INFINITY : dur * repeatCount,
++                Double.isNaN(repeatDur) ? Double.POSITIVE_INFINITY : repeatDur);
++        }
++        if (Double.isNaN(repeat) && Double.isNaN(end))
++        {
++            //If neither and end point nor a repeat is specified, end point is 
++            // implied by duration.
++            end = begin + dur;
++        }
++
++        double finishTime;
++        if (Double.isNaN(end))
++        {
++            finishTime = begin + repeat;
++        }
++        else if (Double.isNaN(repeat))
++        {
++            finishTime = end;
++        }
++        else
++        {
++            finishTime = Math.min(end, repeat);
++        }
++        
++        double evalTime = Math.min(curTime, finishTime);
++//        if (curTime > finishTime) evalTime = finishTime;
++        
++        
++//        double evalTime = curTime;
++
++//        boolean pastEnd = curTime > evalTime;
++        
++//        if (!Double.isNaN(end) && curTime > end) { pastEnd = true; evalTime = Math.min(evalTime, end); }
++//        if (!Double.isNaN(repeat) && curTime > repeat) { pastEnd = true; evalTime = Math.min(evalTime, repeat); }
++        
++        double ratio = (evalTime - begin) / dur;
++        int rep = (int)ratio;
++        double interp = ratio - rep;
++        
++        //Adjust for roundoff
++        if (interp < 0.00001) interp = 0;
++
++//        state.set(interp, rep);
++//        if (!pastEnd)
++//        {
++//            state.set(interp, rep, false);
++//            return;
++//        }
++
++        //If we are still within the clip, return value
++        if (curTime == evalTime)
++        {
++            state.set(interp, rep);
++            return;
++        }
++        
++        //We are past end of clip.  Determine to clamp or ignore.
++        switch (fillType)
++        {
++            default:
++            case FT_REMOVE:
++            case FT_AUTO:
++            case FT_DEFAULT:
++                state.set(Double.NaN, rep);
++                return;
++            case FT_FREEZE:
++            case FT_HOLD:
++            case FT_TRANSITION:
++                state.set(interp == 0 ? 1 : interp, rep);
++                return;
++        }
++
++    }
++
++    double evalStartTime()
++    {
++        return beginTime == null ? Double.NaN : beginTime.evalTime();
++    }
++
++    double evalDurTime()
++    {
++        return durTime == null ? Double.NaN : durTime.evalTime();
++    }
++
++    /**
++     * Evaluates the ending time of this element.  Returns 0 if not specified.
++     *
++     * @see hasEndTime
++     */
++    double evalEndTime()
++    {
++        return endTime == null ? Double.NaN : endTime.evalTime();
++    }
++
++    /**
++     * Checks to see if an end time has been specified for this element.
++     */
++    boolean hasEndTime() { return endTime != null; }
++
++    /**
++     * Updates all attributes in this diagram associated with a time event.
++     * Ie, all attributes with track information.
++     * @return - true if this node has changed state as a result of the time
++     * update
++     */
++    public boolean updateTime(double curTime)
++    {
++        //Animation elements to not change with time
++        return false;
++    }
++
++    public void rebuild() throws SVGException
++    {
++        AnimTimeParser animTimeParser = new AnimTimeParser(new StringReader(""));
++
++        rebuild(animTimeParser);
++    }
++
++    protected void rebuild(AnimTimeParser animTimeParser) throws SVGException
++    {
++        StyleAttribute sty = new StyleAttribute();
++
++        if (getPres(sty.setName("begin")))
++        {
++            String newVal = sty.getStringValue();
++            animTimeParser.ReInit(new StringReader(newVal));
++            try {
++                this.beginTime = animTimeParser.Expr();
++            } catch (ParseException ex) {
++                ex.printStackTrace();
++            }
++        }
++
++        if (getPres(sty.setName("dur")))
++        {
++            String newVal = sty.getStringValue();
++            animTimeParser.ReInit(new StringReader(newVal));
++            try {
++                this.durTime = animTimeParser.Expr();
++            } catch (ParseException ex) {
++                ex.printStackTrace();
++            }
++        }
++
++        if (getPres(sty.setName("end")))
++        {
++            String newVal = sty.getStringValue();
++            animTimeParser.ReInit(new StringReader(newVal));
++            try {
++                this.endTime = animTimeParser.Expr();
++            } catch (ParseException ex) {
++                ex.printStackTrace();
++            }
++        }
++
++        if (getPres(sty.setName("fill")))
++        {
++            String newVal = sty.getStringValue();
++            if (newVal.equals("remove")) this.fillType = FT_REMOVE;
++            if (newVal.equals("freeze")) this.fillType = FT_FREEZE;
++            if (newVal.equals("hold")) this.fillType = FT_HOLD;
++            if (newVal.equals("transiton")) this.fillType = FT_TRANSITION;
++            if (newVal.equals("auto")) this.fillType = FT_AUTO;
++            if (newVal.equals("default")) this.fillType = FT_DEFAULT;
++        }
++
++        if (getPres(sty.setName("additive")))
++        {
++            String newVal = sty.getStringValue();
++            if (newVal.equals("replace")) this.additiveType = AD_REPLACE;
++            if (newVal.equals("sum")) this.additiveType = AD_SUM;
++        }
++
++        if (getPres(sty.setName("accumulate")))
++        {
++            String newVal = sty.getStringValue();
++            if (newVal.equals("replace")) this.accumulateType = AC_REPLACE;
++            if (newVal.equals("sum")) this.accumulateType = AC_SUM;
++        }
++
++    }
++}
+Index: core/src/com/kitfox/svg/animation/AnimationTimeEval.java
 ===================================================================
---- josm.orig/src/com/kitfox/svg/animation/AnimationTimeEval.java       2011-07-17 10:45:41.530285870 +0200
-+++ /dev/null   1970-01-01 00:00:00.000000000 +0000
-@@ -1,65 +0,0 @@
--/*
-- * AnimateTimeEval.java
-- *
-- *  The Salamander Project - 2D and 3D graphics libraries in Java
-- *  Copyright (C) 2004 Mark McKay
-- *
-- *  This library is free software; you can redistribute it and/or
-- *  modify it under the terms of the GNU Lesser General Public
-- *  License as published by the Free Software Foundation; either
-- *  version 2.1 of the License, or (at your option) any later version.
-- *
-- *  This library is distributed in the hope that it will be useful,
-- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- *  Lesser General Public License for more details.
-- *
-- *  You should have received a copy of the GNU Lesser General Public
-- *  License along with this library; if not, write to the Free Software
-- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-- *
-- *  Mark McKay can be contacted at mark@kitfox.com.  Salamander and other
-- *  projects can be found at http://www.kitfox.com
-- *
-- *
-- * Created on September 21, 2004, 1:31 PM
-- */
--
--package com.kitfox.svg.animation;
--
--/**
-- *
-- * @author  kitfox
-- */
--public class AnimationTimeEval
--{
--    /**
--     * Value on [0..1] representing the interpolation value of queried animation
--     * element, or Double.NaN if element does not provide a valid evalutaion
--     */
--    public double interp;
--    
--    /**
--     * Number of completed repetitions
--     */
--    public int rep;
--    
--    /**
--     * True if this evaluation is in a frozen state; ie, past the end of the
--     * track and held in the "freeze" state.
--     */
--//    public boolean pastEnd;
--    
--    /** Creates a new instance of AnimateTimeEval */
--    public AnimationTimeEval()
--    {
--    }
--    
--//    public void set(double interp, int rep, boolean pastEnd)
--    public void set(double interp, int rep)
--    {
--        this.interp = interp;
--        this.rep = rep;
--//        this.pastEnd = pastEnd;
--    }
--}
-Index: josm/src/com/kitfox/svg/animation/Bezier.java
+--- /dev/null   1970-01-01 00:00:00.000000000 +0000
++++ core/src/com/kitfox/svg/animation/AnimationTimeEval.java    2012-06-17 23:56:57.676545050 +0200
+@@ -0,0 +1,65 @@
++/*
++ * AnimateTimeEval.java
++ *
++ *  The Salamander Project - 2D and 3D graphics libraries in Java
++ *  Copyright (C) 2004 Mark McKay
++ *
++ *  This library is free software; you can redistribute it and/or
++ *  modify it under the terms of the GNU Lesser General Public
++ *  License as published by the Free Software Foundation; either
++ *  version 2.1 of the License, or (at your option) any later version.
++ *
++ *  This library is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ *  Lesser General Public License for more details.
++ *
++ *  You should have received a copy of the GNU Lesser General Public
++ *  License along with this library; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ *
++ *  Mark McKay can be contacted at mark@kitfox.com.  Salamander and other
++ *  projects can be found at http://www.kitfox.com
++ *
++ *
++ * Created on September 21, 2004, 1:31 PM
++ */
++
++package com.kitfox.svg.animation;
++
++/**
++ *
++ * @author  kitfox
++ */
++public class AnimationTimeEval
++{
++    /**
++     * Value on [0..1] representing the interpolation value of queried animation
++     * element, or Double.NaN if element does not provide a valid evalutaion
++     */
++    public double interp;
++    
++    /**
++     * Number of completed repetitions
++     */
++    public int rep;
++    
++    /**
++     * True if this evaluation is in a frozen state; ie, past the end of the
++     * track and held in the "freeze" state.
++     */
++//    public boolean pastEnd;
++    
++    /** Creates a new instance of AnimateTimeEval */
++    public AnimationTimeEval()
++    {
++    }
++    
++//    public void set(double interp, int rep, boolean pastEnd)
++    public void set(double interp, int rep)
++    {
++        this.interp = interp;
++        this.rep = rep;
++//        this.pastEnd = pastEnd;
++    }
++}
+Index: core/src/com/kitfox/svg/animation/Bezier.java
 ===================================================================
---- josm.orig/src/com/kitfox/svg/animation/Bezier.java  2011-07-17 10:45:38.790272277 +0200
-+++ /dev/null   1970-01-01 00:00:00.000000000 +0000
-@@ -1,201 +0,0 @@
--/*
-- * Bezier.java
-- *
--
-- *  The Salamander Project - 2D and 3D graphics libraries in Java
-- *  Copyright (C) 2004 Mark McKay
-- *
-- *  This library is free software; you can redistribute it and/or
-- *  modify it under the terms of the GNU Lesser General Public
-- *  License as published by the Free Software Foundation; either
-- *  version 2.1 of the License, or (at your option) any later version.
-- *
-- *  This library is distributed in the hope that it will be useful,
-- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- *  Lesser General Public License for more details.
-- *
-- *  You should have received a copy of the GNU Lesser General Public
-- *  License along with this library; if not, write to the Free Software
-- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-- *
-- *  Mark McKay can be contacted at mark@kitfox.com.  Salamander and other
-- *  projects can be found at http://www.kitfox.com
-- *
-- * Created on January 14, 2005, 4:08 AM
-- */
--
--package com.kitfox.svg.animation;
--
--import java.awt.geom.*;
--
--/**
-- * http://mathworld.wolfram.com/BezierCurve.html
-- * @author kitfox
-- */
--public class Bezier
--{
--    double length;
--    double[] coord;
--
--    public Bezier(double sx, double sy, double[] coords, int numCoords)
--    {
--        setCoords(sx, sy, coords, numCoords);
--    }
--    
--    public void setCoords(double sx, double sy, double[] coords, int numCoords)
--    {
--        coord = new double[numCoords * 2 + 2];
--        coord[0] = sx;
--        coord[1] = sy;
--        for (int i = 0; i < numCoords; i++)
--        {
--            coord[i * 2 + 2] = coords[i * 2];
--            coord[i * 2 + 3] = coords[i * 2 + 1];
--        }
--        
--        calcLength();        
--    }
--    
--    /**
--     * Retuns aproximation of the length of the bezier
--     */
--    public double getLength()
--    {
--        return length;
--    }
--    
--    private void calcLength()
--    {
--        length = 0;
--        for (int i = 2; i < coord.length; i += 2)
--        {
--            length += lineLength(coord[i - 2], coord[i - 1], coord[i], coord[i + 1]);
--        }
--    }
--    
--    private double lineLength(double x1, double y1, double x2, double y2)
--    {
--        double dx = x2 - x1, dy = y2 - y1;
--        return Math.sqrt(dx * dx + dy * dy);
--    }
--    
--    public Point2D.Double getFinalPoint(Point2D.Double point)
--    {
--        point.x = coord[coord.length - 2];
--        point.y = coord[coord.length - 1];
--        return point;
--    }
--    
--    public Point2D.Double eval(double param, Point2D.Double point)
--    {
--        point.x = 0;
--        point.y = 0;
--        int numKnots = coord.length / 2;
--        
--        for (int i = 0; i < numKnots; i++)
--        {
--            double scale = bernstein(numKnots - 1, i, param);
--            point.x += coord[i * 2] * scale;
--            point.y += coord[i * 2 + 1] * scale;
--        }
--        
--        return point;
--    }
--    
--    /**
--     * Calculates the bernstein polynomial for evaluating parametric bezier
--     * @param numKnots - one less than number of knots in this curve hull
--     * @param knotNo - knot we are evaluating Bernstein for
--     * @param param - Parametric value we are evaluating at
--     */
--    private double bernstein(int numKnots, int knotNo, double param)
--    {
--        double iParam = 1 - param;
--        //Faster evaluation for easy cases:
--        switch (numKnots)
--        {
--            case 0:
--                return 1;
--            case 1:
--            {
--                switch (knotNo)
--                {
--                    case 0:
--                        return iParam;
--                    case 1:
--                        return param;
--                }
--                break;
--            }
--            case 2:
--            {
--                switch (knotNo)
--                {
--                    case 0:
--                        return iParam * iParam;
--                    case 1:
--                        return 2 * iParam * param;
--                    case 2:
--                        return param * param;
--                }
--                break;
--            }
--            case 3:
--            {
--                switch (knotNo)
--                {
--                    case 0:
--                        return iParam * iParam * iParam;
--                    case 1:
--                        return 3 * iParam * iParam * param;
--                    case 2:
--                        return 3 * iParam * param * param;
--                    case 3:
--                        return param * param * param;
--                }
--                break;
--            }
--        }
--        
--        //If this bezier has more than four points, calculate bernstein the hard way
--        double retVal = 1;
--        for (int i = 0; i < knotNo; i++)
--        {
--            retVal *= param;
--        }
--        for (int i = 0; i < numKnots - knotNo; i++)
--        {
--            retVal *= iParam;
--        }
--        retVal *= choose(numKnots, knotNo);
--        
--        return retVal;
--    }
--    
--    
--    
--    private int choose(int num, int denom)
--    {
--        int denom2 = num - denom;
--        if (denom < denom2)
--        {
--            int tmp = denom;
--            denom = denom2;
--            denom2 = tmp;
--        }
--        
--        int prod = 1;
--        for (int i = num; i > denom; i--)
--        {
--            prod *= num;
--        }
--        
--        for (int i = 2; i <= denom2; i++)
--        {
--            prod /= i;
--        }
--        
--        return prod;
--    }
--}
-Index: josm/src/com/kitfox/svg/animation/SetSmil.java
+--- /dev/null   1970-01-01 00:00:00.000000000 +0000
++++ core/src/com/kitfox/svg/animation/Bezier.java       2012-06-17 23:56:57.680545050 +0200
+@@ -0,0 +1,201 @@
++/*
++ * Bezier.java
++ *
++
++ *  The Salamander Project - 2D and 3D graphics libraries in Java
++ *  Copyright (C) 2004 Mark McKay
++ *
++ *  This library is free software; you can redistribute it and/or
++ *  modify it under the terms of the GNU Lesser General Public
++ *  License as published by the Free Software Foundation; either
++ *  version 2.1 of the License, or (at your option) any later version.
++ *
++ *  This library is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ *  Lesser General Public License for more details.
++ *
++ *  You should have received a copy of the GNU Lesser General Public
++ *  License along with this library; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ *
++ *  Mark McKay can be contacted at mark@kitfox.com.  Salamander and other
++ *  projects can be found at http://www.kitfox.com
++ *
++ * Created on January 14, 2005, 4:08 AM
++ */
++
++package com.kitfox.svg.animation;
++
++import java.awt.geom.*;
++
++/**
++ * http://mathworld.wolfram.com/BezierCurve.html
++ * @author kitfox
++ */
++public class Bezier
++{
++    double length;
++    double[] coord;
++
++    public Bezier(double sx, double sy, double[] coords, int numCoords)
++    {
++        setCoords(sx, sy, coords, numCoords);
++    }
++    
++    public void setCoords(double sx, double sy, double[] coords, int numCoords)
++    {
++        coord = new double[numCoords * 2 + 2];
++        coord[0] = sx;
++        coord[1] = sy;
++        for (int i = 0; i < numCoords; i++)
++        {
++            coord[i * 2 + 2] = coords[i * 2];
++            coord[i * 2 + 3] = coords[i * 2 + 1];
++        }
++        
++        calcLength();        
++    }
++    
++    /**
++     * Retuns aproximation of the length of the bezier
++     */
++    public double getLength()
++    {
++        return length;
++    }
++    
++    private void calcLength()
++    {
++        length = 0;
++        for (int i = 2; i < coord.length; i += 2)
++        {
++            length += lineLength(coord[i - 2], coord[i - 1], coord[i], coord[i + 1]);
++        }
++    }
++    
++    private double lineLength(double x1, double y1, double x2, double y2)
++    {
++        double dx = x2 - x1, dy = y2 - y1;
++        return Math.sqrt(dx * dx + dy * dy);
++    }
++    
++    public Point2D.Double getFinalPoint(Point2D.Double point)
++    {
++        point.x = coord[coord.length - 2];
++        point.y = coord[coord.length - 1];
++        return point;
++    }
++    
++    public Point2D.Double eval(double param, Point2D.Double point)
++    {
++        point.x = 0;
++        point.y = 0;
++        int numKnots = coord.length / 2;
++        
++        for (int i = 0; i < numKnots; i++)
++        {
++            double scale = bernstein(numKnots - 1, i, param);
++            point.x += coord[i * 2] * scale;
++            point.y += coord[i * 2 + 1] * scale;
++        }
++        
++        return point;
++    }
++    
++    /**
++     * Calculates the bernstein polynomial for evaluating parametric bezier
++     * @param numKnots - one less than number of knots in this curve hull
++     * @param knotNo - knot we are evaluating Bernstein for
++     * @param param - Parametric value we are evaluating at
++     */
++    private double bernstein(int numKnots, int knotNo, double param)
++    {
++        double iParam = 1 - param;
++        //Faster evaluation for easy cases:
++        switch (numKnots)
++        {
++            case 0:
++                return 1;
++            case 1:
++            {
++                switch (knotNo)
++                {
++                    case 0:
++                        return iParam;
++                    case 1:
++                        return param;
++                }
++                break;
++            }
++            case 2:
++            {
++                switch (knotNo)
++                {
++                    case 0:
++                        return iParam * iParam;
++                    case 1:
++                        return 2 * iParam * param;
++                    case 2:
++                        return param * param;
++                }
++                break;
++            }
++            case 3:
++            {
++                switch (knotNo)
++                {
++                    case 0:
++                        return iParam * iParam * iParam;
++                    case 1:
++                        return 3 * iParam * iParam * param;
++                    case 2:
++                        return 3 * iParam * param * param;
++                    case 3:
++                        return param * param * param;
++                }
++                break;
++            }
++        }
++        
++        //If this bezier has more than four points, calculate bernstein the hard way
++        double retVal = 1;
++        for (int i = 0; i < knotNo; i++)
++        {
++            retVal *= param;
++        }
++        for (int i = 0; i < numKnots - knotNo; i++)
++        {
++            retVal *= iParam;
++        }
++        retVal *= choose(numKnots, knotNo);
++        
++        return retVal;
++    }
++    
++    
++    
++    private int choose(int num, int denom)
++    {
++        int denom2 = num - denom;
++        if (denom < denom2)
++        {
++            int tmp = denom;
++            denom = denom2;
++            denom2 = tmp;
++        }
++        
++        int prod = 1;
++        for (int i = num; i > denom; i--)
++        {
++            prod *= num;
++        }
++        
++        for (int i = 2; i <= denom2; i++)
++        {
++            prod /= i;
++        }
++        
++        return prod;
++    }
++}
+Index: core/src/com/kitfox/svg/animation/SetSmil.java
 ===================================================================
---- josm.orig/src/com/kitfox/svg/animation/SetSmil.java 2011-07-17 10:45:40.546280989 +0200
-+++ /dev/null   1970-01-01 00:00:00.000000000 +0000
-@@ -1,73 +0,0 @@
--/*
-- * Set.java
-- *
-- *  The Salamander Project - 2D and 3D graphics libraries in Java
-- *  Copyright (C) 2004 Mark McKay
-- *
-- *  This library is free software; you can redistribute it and/or
-- *  modify it under the terms of the GNU Lesser General Public
-- *  License as published by the Free Software Foundation; either
-- *  version 2.1 of the License, or (at your option) any later version.
-- *
-- *  This library is distributed in the hope that it will be useful,
-- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- *  Lesser General Public License for more details.
-- *
-- *  You should have received a copy of the GNU Lesser General Public
-- *  License along with this library; if not, write to the Free Software
-- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-- *
-- *  Mark McKay can be contacted at mark@kitfox.com.  Salamander and other
-- *  projects can be found at http://www.kitfox.com
-- *
-- * Created on August 15, 2004, 2:51 AM
-- */
--
--package com.kitfox.svg.animation;
--
--import com.kitfox.svg.SVGElement;
--import com.kitfox.svg.SVGException;
--import com.kitfox.svg.SVGLoaderHelper;
--import com.kitfox.svg.animation.parser.AnimTimeParser;
--import com.kitfox.svg.xml.StyleAttribute;
--import org.xml.sax.Attributes;
--import org.xml.sax.SAXException;
--
--
--/**
-- * Set is used to set a textual value; most likely for a style element.
-- *
-- * @author Mark McKay
-- * @author <a href="mailto:mark@kitfox.com">Mark McKay</a>
-- */
--public class SetSmil extends AnimationElement
--{
--    String toValue;
--    
--    /** Creates a new instance of Set */
--    public SetSmil()
--    {
--    }
--    
--    public void loaderStartElement(SVGLoaderHelper helper, Attributes attrs, SVGElement parent) throws SAXException
--    {
--               //Load style string
--        super.loaderStartElement(helper, attrs, parent);
--
--        toValue = attrs.getValue("to");
--    }
--
--    protected void rebuild(AnimTimeParser animTimeParser) throws SVGException
--    {
--        super.rebuild(animTimeParser);
--
--        StyleAttribute sty = new StyleAttribute();
--
--        if (getPres(sty.setName("to")))
--        {
--            String newVal = sty.getStringValue();
--            toValue = newVal;
--        }
--    }
--}
-Index: josm/src/com/kitfox/svg/animation/TimeBase.java
+--- /dev/null   1970-01-01 00:00:00.000000000 +0000
++++ core/src/com/kitfox/svg/animation/SetSmil.java      2012-06-17 23:56:57.680545050 +0200
+@@ -0,0 +1,73 @@
++/*
++ * Set.java
++ *
++ *  The Salamander Project - 2D and 3D graphics libraries in Java
++ *  Copyright (C) 2004 Mark McKay
++ *
++ *  This library is free software; you can redistribute it and/or
++ *  modify it under the terms of the GNU Lesser General Public
++ *  License as published by the Free Software Foundation; either
++ *  version 2.1 of the License, or (at your option) any later version.
++ *
++ *  This library is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ *  Lesser General Public License for more details.
++ *
++ *  You should have received a copy of the GNU Lesser General Public
++ *  License along with this library; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ *
++ *  Mark McKay can be contacted at mark@kitfox.com.  Salamander and other
++ *  projects can be found at http://www.kitfox.com
++ *
++ * Created on August 15, 2004, 2:51 AM
++ */
++
++package com.kitfox.svg.animation;
++
++import com.kitfox.svg.SVGElement;
++import com.kitfox.svg.SVGException;
++import com.kitfox.svg.SVGLoaderHelper;
++import com.kitfox.svg.animation.parser.AnimTimeParser;
++import com.kitfox.svg.xml.StyleAttribute;
++import org.xml.sax.Attributes;
++import org.xml.sax.SAXException;
++
++
++/**
++ * Set is used to set a textual value; most likely for a style element.
++ *
++ * @author Mark McKay
++ * @author <a href="mailto:mark@kitfox.com">Mark McKay</a>
++ */
++public class SetSmil extends AnimationElement
++{
++    String toValue;
++    
++    /** Creates a new instance of Set */
++    public SetSmil()
++    {
++    }
++    
++    public void loaderStartElement(SVGLoaderHelper helper, Attributes attrs, SVGElement parent) throws SAXException
++    {
++               //Load style string
++        super.loaderStartElement(helper, attrs, parent);
++
++        toValue = attrs.getValue("to");
++    }
++
++    protected void rebuild(AnimTimeParser animTimeParser) throws SVGException
++    {
++        super.rebuild(animTimeParser);
++
++        StyleAttribute sty = new StyleAttribute();
++
++        if (getPres(sty.setName("to")))
++        {
++            String newVal = sty.getStringValue();
++            toValue = newVal;
++        }
++    }
++}
+Index: core/src/com/kitfox/svg/animation/TimeBase.java
 ===================================================================
---- josm.orig/src/com/kitfox/svg/animation/TimeBase.java        2011-07-17 10:45:40.206279304 +0200
-+++ /dev/null   1970-01-01 00:00:00.000000000 +0000
-@@ -1,99 +0,0 @@
--/*
-- * TimeBase.java
-- *
-- *  The Salamander Project - 2D and 3D graphics libraries in Java
-- *  Copyright (C) 2004 Mark McKay
-- *
-- *  This library is free software; you can redistribute it and/or
-- *  modify it under the terms of the GNU Lesser General Public
-- *  License as published by the Free Software Foundation; either
-- *  version 2.1 of the License, or (at your option) any later version.
-- *
-- *  This library is distributed in the hope that it will be useful,
-- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- *  Lesser General Public License for more details.
-- *
-- *  You should have received a copy of the GNU Lesser General Public
-- *  License along with this library; if not, write to the Free Software
-- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-- *
-- *  Mark McKay can be contacted at mark@kitfox.com.  Salamander and other
-- *  projects can be found at http://www.kitfox.com
-- *
-- * Created on August 15, 2004, 3:31 AM
-- */
--
--package com.kitfox.svg.animation;
--
--import java.util.regex.*;
--
--/**
-- * SVG has a complicated way of specifying time.  Potentially, a time could
-- * be represened as a summation of discrete times and times of other animation
-- * events.  This provides a root for the many elements we will need to define
-- * time.
-- *
-- * @author Mark McKay
-- * @author <a href="mailto:mark@kitfox.com">Mark McKay</a>
-- */
--abstract public class TimeBase
--{
--    static final Matcher matchIndefinite = Pattern.compile("\\s*indefinite\\s*").matcher("");
--    static final Matcher matchUnitTime = Pattern.compile("\\s*([-+]?((\\d*\\.\\d+)|(\\d+))([-+]?[eE]\\d+)?)\\s*(h|min|s|ms)?\\s*").matcher("");
--    
--    /*
--    public static TimeBase parseTime(String text) 
--    { 
--        if (text == null) return null;
--        
--        if (text.indexOf('+') == -1)
--        {
--            return parseTimeComponent(text);
--        }
--        
--        return new TimeCompound(text);
--    }
--     */
--    
--    protected static TimeBase parseTimeComponent(String text)
--    {
--        matchIndefinite.reset(text);
--        if (matchIndefinite.matches()) return new TimeIndefinite();
--        
--        matchUnitTime.reset(text);
--        if (matchUnitTime.matches())
--        {
--            String val = matchUnitTime.group(1);
--            String units = matchUnitTime.group(6);
--            
--            double time = 0;
--            try { time = Double.parseDouble(val); }
--            catch (Exception e) {}
--            
--            if (units.equals("ms")) time *= .001;
--            else if (units.equals("min")) time *= 60;
--            else if (units.equals("h")) time *= 3600;
--            
--            return new TimeDiscrete(time);
--        }
--        
--        return null;
--    }
--    
--    /**
--     * Calculates the (greater than or equal to 0) time in seconds this 
--     * time represents.  If the time cannot be determined, returns 
--     * Double.NaN.  If this represents an infinte amount of time, returns 
--     * Double.POSITIVE_INFINITY.
--     */
--    abstract public double evalTime();
--    
--    /**
--     * Some time elements need to refer to the animation element that contains 
--     * them to evaluate correctly
--     */
--    public void setParentElement(AnimationElement ele)
--    {
--    }
--}
-Index: josm/src/com/kitfox/svg/animation/TimeCompound.java
+--- /dev/null   1970-01-01 00:00:00.000000000 +0000
++++ core/src/com/kitfox/svg/animation/TimeBase.java     2012-06-17 23:56:57.680545050 +0200
+@@ -0,0 +1,99 @@
++/*
++ * TimeBase.java
++ *
++ *  The Salamander Project - 2D and 3D graphics libraries in Java
++ *  Copyright (C) 2004 Mark McKay
++ *
++ *  This library is free software; you can redistribute it and/or
++ *  modify it under the terms of the GNU Lesser General Public
++ *  License as published by the Free Software Foundation; either
++ *  version 2.1 of the License, or (at your option) any later version.
++ *
++ *  This library is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ *  Lesser General Public License for more details.
++ *
++ *  You should have received a copy of the GNU Lesser General Public
++ *  License along with this library; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ *
++ *  Mark McKay can be contacted at mark@kitfox.com.  Salamander and other
++ *  projects can be found at http://www.kitfox.com
++ *
++ * Created on August 15, 2004, 3:31 AM
++ */
++
++package com.kitfox.svg.animation;
++
++import java.util.regex.*;
++
++/**
++ * SVG has a complicated way of specifying time.  Potentially, a time could
++ * be represened as a summation of discrete times and times of other animation
++ * events.  This provides a root for the many elements we will need to define
++ * time.
++ *
++ * @author Mark McKay
++ * @author <a href="mailto:mark@kitfox.com">Mark McKay</a>
++ */
++abstract public class TimeBase
++{
++    static final Matcher matchIndefinite = Pattern.compile("\\s*indefinite\\s*").matcher("");
++    static final Matcher matchUnitTime = Pattern.compile("\\s*([-+]?((\\d*\\.\\d+)|(\\d+))([-+]?[eE]\\d+)?)\\s*(h|min|s|ms)?\\s*").matcher("");
++    
++    /*
++    public static TimeBase parseTime(String text) 
++    { 
++        if (text == null) return null;
++        
++        if (text.indexOf('+') == -1)
++        {
++            return parseTimeComponent(text);
++        }
++        
++        return new TimeCompound(text);
++    }
++     */
++    
++    protected static TimeBase parseTimeComponent(String text)
++    {
++        matchIndefinite.reset(text);
++        if (matchIndefinite.matches()) return new TimeIndefinite();
++        
++        matchUnitTime.reset(text);
++        if (matchUnitTime.matches())
++        {
++            String val = matchUnitTime.group(1);
++            String units = matchUnitTime.group(6);
++            
++            double time = 0;
++            try { time = Double.parseDouble(val); }
++            catch (Exception e) {}
++            
++            if (units.equals("ms")) time *= .001;
++            else if (units.equals("min")) time *= 60;
++            else if (units.equals("h")) time *= 3600;
++            
++            return new TimeDiscrete(time);
++        }
++        
++        return null;
++    }
++    
++    /**
++     * Calculates the (greater than or equal to 0) time in seconds this 
++     * time represents.  If the time cannot be determined, returns 
++     * Double.NaN.  If this represents an infinte amount of time, returns 
++     * Double.POSITIVE_INFINITY.
++     */
++    abstract public double evalTime();
++    
++    /**
++     * Some time elements need to refer to the animation element that contains 
++     * them to evaluate correctly
++     */
++    public void setParentElement(AnimationElement ele)
++    {
++    }
++}
+Index: core/src/com/kitfox/svg/animation/TimeCompound.java
 ===================================================================
---- josm.orig/src/com/kitfox/svg/animation/TimeCompound.java    2011-07-17 10:45:41.758286997 +0200
-+++ /dev/null   1970-01-01 00:00:00.000000000 +0000
-@@ -1,84 +0,0 @@
--/*
-- * TimeDiscrete.java
-- *
-- *  The Salamander Project - 2D and 3D graphics libraries in Java
-- *  Copyright (C) 2004 Mark McKay
-- *
-- *  This library is free software; you can redistribute it and/or
-- *  modify it under the terms of the GNU Lesser General Public
-- *  License as published by the Free Software Foundation; either
-- *  version 2.1 of the License, or (at your option) any later version.
-- *
-- *  This library is distributed in the hope that it will be useful,
-- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- *  Lesser General Public License for more details.
-- *
-- *  You should have received a copy of the GNU Lesser General Public
-- *  License along with this library; if not, write to the Free Software
-- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-- *
-- *  Mark McKay can be contacted at mark@kitfox.com.  Salamander and other
-- *  projects can be found at http://www.kitfox.com
-- *
-- * Created on August 15, 2004, 3:33 AM
-- */
--
--package com.kitfox.svg.animation;
--
--import java.util.Collections;
--import java.util.Iterator;
--import java.util.List;
--import java.util.regex.Pattern;
--
--
--/**
-- * This represents a summation of other time elements.  It is used for complex
-- * timing events with offsets.
-- *
-- * @author Mark McKay
-- * @author <a href="mailto:mark@kitfox.com">Mark McKay</a>
-- */
--public class TimeCompound extends TimeBase
--{
--    static final Pattern patPlus = Pattern.compile("\\+");
--    
--    /**
--     * This is a list of times.  This element's time is calculated as the greatest
--     * member that is less than the current time.
--    */
--    final List componentTimes;
--
--    private AnimationElement parent;
--    
--    /** Creates a new instance of TimeDiscrete */
--    public TimeCompound(List timeBases)
--    {
--        componentTimes = Collections.unmodifiableList(timeBases);
--    }
--    
--    public double evalTime()
--    {
--        double agg = 0.0;
--        
--        for (Iterator it = componentTimes.iterator(); it.hasNext();)
--        {
--            TimeBase timeEle = (TimeBase)it.next();
--            double time = timeEle.evalTime();
--            agg += time;
--        }
--        
--        return agg;
--    }
--    
--    public void setParentElement(AnimationElement ele)
--    {
--        this.parent = ele;
--        
--        for (Iterator it = componentTimes.iterator(); it.hasNext();)
--        {
--            TimeBase timeEle = (TimeBase)it.next();
--            timeEle.setParentElement(ele);
--        }
--    }
--}
-Index: josm/src/com/kitfox/svg/animation/TimeDiscrete.java
+--- /dev/null   1970-01-01 00:00:00.000000000 +0000
++++ core/src/com/kitfox/svg/animation/TimeCompound.java 2012-06-17 23:56:57.680545050 +0200
+@@ -0,0 +1,84 @@
++/*
++ * TimeDiscrete.java
++ *
++ *  The Salamander Project - 2D and 3D graphics libraries in Java
++ *  Copyright (C) 2004 Mark McKay
++ *
++ *  This library is free software; you can redistribute it and/or
++ *  modify it under the terms of the GNU Lesser General Public
++ *  License as published by the Free Software Foundation; either
++ *  version 2.1 of the License, or (at your option) any later version.
++ *
++ *  This library is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ *  Lesser General Public License for more details.
++ *
++ *  You should have received a copy of the GNU Lesser General Public
++ *  License along with this library; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ *
++ *  Mark McKay can be contacted at mark@kitfox.com.  Salamander and other
++ *  projects can be found at http://www.kitfox.com
++ *
++ * Created on August 15, 2004, 3:33 AM
++ */
++
++package com.kitfox.svg.animation;
++
++import java.util.Collections;
++import java.util.Iterator;
++import java.util.List;
++import java.util.regex.Pattern;
++
++
++/**
++ * This represents a summation of other time elements.  It is used for complex
++ * timing events with offsets.
++ *
++ * @author Mark McKay
++ * @author <a href="mailto:mark@kitfox.com">Mark McKay</a>
++ */
++public class TimeCompound extends TimeBase
++{
++    static final Pattern patPlus = Pattern.compile("\\+");
++    
++    /**
++     * This is a list of times.  This element's time is calculated as the greatest
++     * member that is less than the current time.
++    */
++    final List componentTimes;
++
++    private AnimationElement parent;
++    
++    /** Creates a new instance of TimeDiscrete */
++    public TimeCompound(List timeBases)
++    {
++        componentTimes = Collections.unmodifiableList(timeBases);
++    }
++    
++    public double evalTime()
++    {
++        double agg = 0.0;
++        
++        for (Iterator it = componentTimes.iterator(); it.hasNext();)
++        {
++            TimeBase timeEle = (TimeBase)it.next();
++            double time = timeEle.evalTime();
++            agg += time;
++        }
++        
++        return agg;
++    }
++    
++    public void setParentElement(AnimationElement ele)
++    {
++        this.parent = ele;
++        
++        for (Iterator it = componentTimes.iterator(); it.hasNext();)
++        {
++            TimeBase timeEle = (TimeBase)it.next();
++            timeEle.setParentElement(ele);
++        }
++    }
++}
+Index: core/src/com/kitfox/svg/animation/TimeDiscrete.java
 ===================================================================
---- josm.orig/src/com/kitfox/svg/animation/TimeDiscrete.java    2011-07-17 10:45:40.830282393 +0200
-+++ /dev/null   1970-01-01 00:00:00.000000000 +0000
-@@ -1,51 +0,0 @@
--/*
-- * TimeDiscrete.java
-- *
-- *  The Salamander Project - 2D and 3D graphics libraries in Java
-- *  Copyright (C) 2004 Mark McKay
-- *
-- *  This library is free software; you can redistribute it and/or
-- *  modify it under the terms of the GNU Lesser General Public
-- *  License as published by the Free Software Foundation; either
-- *  version 2.1 of the License, or (at your option) any later version.
-- *
-- *  This library is distributed in the hope that it will be useful,
-- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- *  Lesser General Public License for more details.
-- *
-- *  You should have received a copy of the GNU Lesser General Public
-- *  License along with this library; if not, write to the Free Software
-- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-- *
-- *  Mark McKay can be contacted at mark@kitfox.com.  Salamander and other
-- *  projects can be found at http://www.kitfox.com
-- *
-- * Created on August 15, 2004, 3:33 AM
-- */
--
--package com.kitfox.svg.animation;
--
--/**
-- * This is a time that represents a specific number of milliseconds
-- *
-- * @author Mark McKay
-- * @author <a href="mailto:mark@kitfox.com">Mark McKay</a>
-- */
--public class TimeDiscrete extends TimeBase
--{
--    //Milliseconds of delay
--    double secs;
--    
--    /** Creates a new instance of TimeDiscrete */
--    public TimeDiscrete(double secs)
--    {
--        this.secs = secs;
--    }
--    
--    public double evalTime()
--    {
--        return secs;
--    }
--    
--}
-Index: josm/src/com/kitfox/svg/animation/TimeIndefinite.java
+--- /dev/null   1970-01-01 00:00:00.000000000 +0000
++++ core/src/com/kitfox/svg/animation/TimeDiscrete.java 2012-06-17 23:56:57.680545050 +0200
+@@ -0,0 +1,51 @@
++/*
++ * TimeDiscrete.java
++ *
++ *  The Salamander Project - 2D and 3D graphics libraries in Java
++ *  Copyright (C) 2004 Mark McKay
++ *
++ *  This library is free software; you can redistribute it and/or
++ *  modify it under the terms of the GNU Lesser General Public
++ *  License as published by the Free Software Foundation; either
++ *  version 2.1 of the License, or (at your option) any later version.
++ *
++ *  This library is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ *  Lesser General Public License for more details.
++ *
++ *  You should have received a copy of the GNU Lesser General Public
++ *  License along with this library; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ *
++ *  Mark McKay can be contacted at mark@kitfox.com.  Salamander and other
++ *  projects can be found at http://www.kitfox.com
++ *
++ * Created on August 15, 2004, 3:33 AM
++ */
++
++package com.kitfox.svg.animation;
++
++/**
++ * This is a time that represents a specific number of milliseconds
++ *
++ * @author Mark McKay
++ * @author <a href="mailto:mark@kitfox.com">Mark McKay</a>
++ */
++public class TimeDiscrete extends TimeBase
++{
++    //Milliseconds of delay
++    double secs;
++    
++    /** Creates a new instance of TimeDiscrete */
++    public TimeDiscrete(double secs)
++    {
++        this.secs = secs;
++    }
++    
++    public double evalTime()
++    {
++        return secs;
++    }
++    
++}
+Index: core/src/com/kitfox/svg/animation/TimeIndefinite.java
 ===================================================================
---- josm.orig/src/com/kitfox/svg/animation/TimeIndefinite.java  2011-07-17 10:45:39.346275036 +0200
-+++ /dev/null   1970-01-01 00:00:00.000000000 +0000
-@@ -1,48 +0,0 @@
--/*
-- * TimeDiscrete.java
-- *
-- *  The Salamander Project - 2D and 3D graphics libraries in Java
-- *  Copyright (C) 2004 Mark McKay
-- *
-- *  This library is free software; you can redistribute it and/or
-- *  modify it under the terms of the GNU Lesser General Public
-- *  License as published by the Free Software Foundation; either
-- *  version 2.1 of the License, or (at your option) any later version.
-- *
-- *  This library is distributed in the hope that it will be useful,
-- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- *  Lesser General Public License for more details.
-- *
-- *  You should have received a copy of the GNU Lesser General Public
-- *  License along with this library; if not, write to the Free Software
-- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-- *
-- *  Mark McKay can be contacted at mark@kitfox.com.  Salamander and other
-- *  projects can be found at http://www.kitfox.com
-- *
-- * Created on August 15, 2004, 3:33 AM
-- */
--
--package com.kitfox.svg.animation;
--
--/**
-- * This represents the indefinite (infinite) amount of time.
-- *
-- * @author Mark McKay
-- * @author <a href="mailto:mark@kitfox.com">Mark McKay</a>
-- */
--public class TimeIndefinite extends TimeBase
--{
--    
--    /** Creates a new instance of TimeDiscrete */
--    public TimeIndefinite()
--    {
--    }
--    
--    public double evalTime()
--    {
--        return Double.POSITIVE_INFINITY;
--    }
--    
--}
-Index: josm/src/com/kitfox/svg/animation/TimeLookup.java
+--- /dev/null   1970-01-01 00:00:00.000000000 +0000
++++ core/src/com/kitfox/svg/animation/TimeIndefinite.java       2012-06-17 23:56:57.680545050 +0200
+@@ -0,0 +1,48 @@
++/*
++ * TimeDiscrete.java
++ *
++ *  The Salamander Project - 2D and 3D graphics libraries in Java
++ *  Copyright (C) 2004 Mark McKay
++ *
++ *  This library is free software; you can redistribute it and/or
++ *  modify it under the terms of the GNU Lesser General Public
++ *  License as published by the Free Software Foundation; either
++ *  version 2.1 of the License, or (at your option) any later version.
++ *
++ *  This library is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ *  Lesser General Public License for more details.
++ *
++ *  You should have received a copy of the GNU Lesser General Public
++ *  License along with this library; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ *
++ *  Mark McKay can be contacted at mark@kitfox.com.  Salamander and other
++ *  projects can be found at http://www.kitfox.com
++ *
++ * Created on August 15, 2004, 3:33 AM
++ */
++
++package com.kitfox.svg.animation;
++
++/**
++ * This represents the indefinite (infinite) amount of time.
++ *
++ * @author Mark McKay
++ * @author <a href="mailto:mark@kitfox.com">Mark McKay</a>
++ */
++public class TimeIndefinite extends TimeBase
++{
++    
++    /** Creates a new instance of TimeDiscrete */
++    public TimeIndefinite()
++    {
++    }
++    
++    public double evalTime()
++    {
++        return Double.POSITIVE_INFINITY;
++    }
++    
++}
+Index: core/src/com/kitfox/svg/animation/TimeLookup.java
 ===================================================================
---- josm.orig/src/com/kitfox/svg/animation/TimeLookup.java      2011-07-17 10:45:40.698281743 +0200
-+++ /dev/null   1970-01-01 00:00:00.000000000 +0000
-@@ -1,75 +0,0 @@
--/*
-- * TimeDiscrete.java
-- *
-- *  The Salamander Project - 2D and 3D graphics libraries in Java
-- *  Copyright (C) 2004 Mark McKay
-- *
-- *  This library is free software; you can redistribute it and/or
-- *  modify it under the terms of the GNU Lesser General Public
-- *  License as published by the Free Software Foundation; either
-- *  version 2.1 of the License, or (at your option) any later version.
-- *
-- *  This library is distributed in the hope that it will be useful,
-- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- *  Lesser General Public License for more details.
-- *
-- *  You should have received a copy of the GNU Lesser General Public
-- *  License along with this library; if not, write to the Free Software
-- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-- *
-- *  Mark McKay can be contacted at mark@kitfox.com.  Salamander and other
-- *  projects can be found at http://www.kitfox.com
-- *
-- * Created on August 15, 2004, 3:33 AM
-- */
--
--package com.kitfox.svg.animation;
--
--/**
-- * This is a time that represents a specific number of milliseconds
-- *
-- * @author Mark McKay
-- * @author <a href="mailto:mark@kitfox.com">Mark McKay</a>
-- */
--public class TimeLookup extends TimeBase
--{
--    /** 
--     * This time can only be resolved in relation to it's parent
--     */
--    private AnimationElement parent;
--    
--    /**
--     * Node this lookup acts upon
--     */
--    String node;
--    
--    /**
--     * Event to evalutae on this node
--     */
--    String event;
--    
--    /**
--     * Optional parameter used by some events
--     */
--    String paramList;
--    
--    /** Creates a new instance of TimeDiscrete */
--    public TimeLookup(AnimationElement parent, String node, String event, String paramList)
--    {
--        this.parent = parent;
--        this.node = node;
--        this.event = event;
--        this.paramList = paramList;
--    }
--    
--    public double evalTime()
--    {
--        return 0.0;
--    }
--    
--    public void setParentElement(AnimationElement ele)
--    {
--        parent = ele;
--    }
--}
-Index: josm/src/com/kitfox/svg/animation/TimeSum.java
+--- /dev/null   1970-01-01 00:00:00.000000000 +0000
++++ core/src/com/kitfox/svg/animation/TimeLookup.java   2012-06-17 23:56:57.684545050 +0200
+@@ -0,0 +1,75 @@
++/*
++ * TimeDiscrete.java
++ *
++ *  The Salamander Project - 2D and 3D graphics libraries in Java
++ *  Copyright (C) 2004 Mark McKay
++ *
++ *  This library is free software; you can redistribute it and/or
++ *  modify it under the terms of the GNU Lesser General Public
++ *  License as published by the Free Software Foundation; either
++ *  version 2.1 of the License, or (at your option) any later version.
++ *
++ *  This library is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ *  Lesser General Public License for more details.
++ *
++ *  You should have received a copy of the GNU Lesser General Public
++ *  License along with this library; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ *
++ *  Mark McKay can be contacted at mark@kitfox.com.  Salamander and other
++ *  projects can be found at http://www.kitfox.com
++ *
++ * Created on August 15, 2004, 3:33 AM
++ */
++
++package com.kitfox.svg.animation;
++
++/**
++ * This is a time that represents a specific number of milliseconds
++ *
++ * @author Mark McKay
++ * @author <a href="mailto:mark@kitfox.com">Mark McKay</a>
++ */
++public class TimeLookup extends TimeBase
++{
++    /** 
++     * This time can only be resolved in relation to it's parent
++     */
++    private AnimationElement parent;
++    
++    /**
++     * Node this lookup acts upon
++     */
++    String node;
++    
++    /**
++     * Event to evalutae on this node
++     */
++    String event;
++    
++    /**
++     * Optional parameter used by some events
++     */
++    String paramList;
++    
++    /** Creates a new instance of TimeDiscrete */
++    public TimeLookup(AnimationElement parent, String node, String event, String paramList)
++    {
++        this.parent = parent;
++        this.node = node;
++        this.event = event;
++        this.paramList = paramList;
++    }
++    
++    public double evalTime()
++    {
++        return 0.0;
++    }
++    
++    public void setParentElement(AnimationElement ele)
++    {
++        parent = ele;
++    }
++}
+Index: core/src/com/kitfox/svg/animation/TimeSum.java
 ===================================================================
---- josm.orig/src/com/kitfox/svg/animation/TimeSum.java 2011-07-17 10:45:39.754277058 +0200
-+++ /dev/null   1970-01-01 00:00:00.000000000 +0000
-@@ -1,60 +0,0 @@
--/*
-- * TimeDiscrete.java
-- *
-- *  The Salamander Project - 2D and 3D graphics libraries in Java
-- *  Copyright (C) 2004 Mark McKay
-- *
-- *  This library is free software; you can redistribute it and/or
-- *  modify it under the terms of the GNU Lesser General Public
-- *  License as published by the Free Software Foundation; either
-- *  version 2.1 of the License, or (at your option) any later version.
-- *
-- *  This library is distributed in the hope that it will be useful,
-- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- *  Lesser General Public License for more details.
-- *
-- *  You should have received a copy of the GNU Lesser General Public
-- *  License along with this library; if not, write to the Free Software
-- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-- *
-- *  Mark McKay can be contacted at mark@kitfox.com.  Salamander and other
-- *  projects can be found at http://www.kitfox.com
-- *
-- * Created on August 15, 2004, 3:33 AM
-- */
--
--package com.kitfox.svg.animation;
--
--/**
-- * This is a time that represents a specific number of milliseconds
-- *
-- * @author Mark McKay
-- * @author <a href="mailto:mark@kitfox.com">Mark McKay</a>
-- */
--public class TimeSum extends TimeBase
--{
--    //Milliseconds of delay
--    TimeBase t1;
--    TimeBase t2;
--    boolean add;
--    
--    /** Creates a new instance of TimeDiscrete */
--    public TimeSum(TimeBase t1, TimeBase t2, boolean add)
--    {
--        this.t1 = t1;
--        this.t2 = t2;
--        this.add = add;
--    }
--    
--    public double evalTime()
--    {
--        return add ? t1.evalTime() + t2.evalTime() : t1.evalTime() - t2.evalTime();
--    }
--    
--    public void setParentElement(AnimationElement ele)
--    {
--        t1.setParentElement(ele);
--        t2.setParentElement(ele);
--    }
--}
-Index: josm/src/com/kitfox/svg/animation/TrackBase.java
+--- /dev/null   1970-01-01 00:00:00.000000000 +0000
++++ core/src/com/kitfox/svg/animation/TimeSum.java      2012-06-17 23:56:57.684545050 +0200
+@@ -0,0 +1,60 @@
++/*
++ * TimeDiscrete.java
++ *
++ *  The Salamander Project - 2D and 3D graphics libraries in Java
++ *  Copyright (C) 2004 Mark McKay
++ *
++ *  This library is free software; you can redistribute it and/or
++ *  modify it under the terms of the GNU Lesser General Public
++ *  License as published by the Free Software Foundation; either
++ *  version 2.1 of the License, or (at your option) any later version.
++ *
++ *  This library is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ *  Lesser General Public License for more details.
++ *
++ *  You should have received a copy of the GNU Lesser General Public
++ *  License along with this library; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ *
++ *  Mark McKay can be contacted at mark@kitfox.com.  Salamander and other
++ *  projects can be found at http://www.kitfox.com
++ *
++ * Created on August 15, 2004, 3:33 AM
++ */
++
++package com.kitfox.svg.animation;
++
++/**
++ * This is a time that represents a specific number of milliseconds
++ *
++ * @author Mark McKay
++ * @author <a href="mailto:mark@kitfox.com">Mark McKay</a>
++ */
++public class TimeSum extends TimeBase
++{
++    //Milliseconds of delay
++    TimeBase t1;
++    TimeBase t2;
++    boolean add;
++    
++    /** Creates a new instance of TimeDiscrete */
++    public TimeSum(TimeBase t1, TimeBase t2, boolean add)
++    {
++        this.t1 = t1;
++        this.t2 = t2;
++        this.add = add;
++    }
++    
++    public double evalTime()
++    {
++        return add ? t1.evalTime() + t2.evalTime() : t1.evalTime() - t2.evalTime();
++    }
++    
++    public void setParentElement(AnimationElement ele)
++    {
++        t1.setParentElement(ele);
++        t2.setParentElement(ele);
++    }
++}
+Index: core/src/com/kitfox/svg/animation/TrackBase.java
 ===================================================================
---- josm.orig/src/com/kitfox/svg/animation/TrackBase.java       2011-07-17 10:45:41.126283861 +0200
-+++ /dev/null   1970-01-01 00:00:00.000000000 +0000
-@@ -1,103 +0,0 @@
--/*
-- * TrackManager.java
-- *
-- *  The Salamander Project - 2D and 3D graphics libraries in Java
-- *  Copyright (C) 2004 Mark McKay
-- *
-- *  This library is free software; you can redistribute it and/or
-- *  modify it under the terms of the GNU Lesser General Public
-- *  License as published by the Free Software Foundation; either
-- *  version 2.1 of the License, or (at your option) any later version.
-- *
-- *  This library is distributed in the hope that it will be useful,
-- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- *  Lesser General Public License for more details.
-- *
-- *  You should have received a copy of the GNU Lesser General Public
-- *  License along with this library; if not, write to the Free Software
-- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-- *
-- *  Mark McKay can be contacted at mark@kitfox.com.  Salamander and other
-- *  projects can be found at http://www.kitfox.com
-- *
-- * Created on August 15, 2004, 11:34 PM
-- */
--
--package com.kitfox.svg.animation;
--
--import java.util.*;
--
--import com.kitfox.svg.xml.*;
--import com.kitfox.svg.*;
--
--/**
-- * A track holds the animation events for a single parameter of a single SVG 
-- * element.  It also contains the default value for the element, should the
-- * user want to see the 'unanimated' value.
-- *
-- * @author Mark McKay
-- * @author <a href="mailto:mark@kitfox.com">Mark McKay</a>
-- */
--abstract public class TrackBase
--{
--    protected final String attribName;
--    protected final int attribType;  //AnimationElement.AT_*
-- 
--    /** Element we're animating */
--    protected final SVGElement parent;
--    
--    //It doesn't make sense to sort this, since some events will depend on
--    // other events - in many cases, there will be no meaningful sorted order.
--    final ArrayList animEvents = new ArrayList();
--    
--    /** Creates a new instance of TrackManager */
--//    public TrackBase(SVGElement parent)
--//    {
--//        this(parent, "", AnimationElement.AT_AUTO);
--//    }
--    
--    /**
--     * Creates a track that would be valid for the name and type of element
--     * passed in.  Does not actually add this elemnt to the track.
--     */
--    public TrackBase(SVGElement parent, AnimationElement ele) throws SVGElementException
--    {
--        this(parent, ele.getAttribName(), ele.getAttribType());
--    }
--    
--    public TrackBase(SVGElement parent, String attribName, int attribType) throws SVGElementException
--    {
--        this.parent = parent;
--        this.attribName = attribName;
--        this.attribType = attribType;
--        
--        //Make sure parent has an attribute we will write to
--        if (attribType == AnimationElement.AT_AUTO 
--            && !parent.hasAttribute(attribName, AnimationElement.AT_CSS)
--            && !parent.hasAttribute(attribName, AnimationElement.AT_XML))
--        {
--            parent.addAttribute(attribName, AnimationElement.AT_CSS, "");
--        }
--        else if (!parent.hasAttribute(attribName, attribType))
--        {
--            parent.addAttribute(attribName, attribType, "");
--        }
--    }
--    
--    public String getAttribName() { return attribName; }
--    public int getAttribType() { return attribType; }
--    
--    public void addElement(AnimationElement ele)
--    {
--        animEvents.add(ele);
--    }
--    
--    /**
--     * Returns a StyleAttribute representing the value of this track at the
--     * passed time.  If this track does not apply, returns null.
--     * @return - True if successful, false if a value could not be obtained
--     */
--    abstract public boolean getValue(StyleAttribute attrib, double curTime) throws SVGException;
--    
--}
-Index: josm/src/com/kitfox/svg/animation/TrackColor.java
+--- /dev/null   1970-01-01 00:00:00.000000000 +0000
++++ core/src/com/kitfox/svg/animation/TrackBase.java    2012-06-17 23:56:57.684545050 +0200
+@@ -0,0 +1,103 @@
++/*
++ * TrackManager.java
++ *
++ *  The Salamander Project - 2D and 3D graphics libraries in Java
++ *  Copyright (C) 2004 Mark McKay
++ *
++ *  This library is free software; you can redistribute it and/or
++ *  modify it under the terms of the GNU Lesser General Public
++ *  License as published by the Free Software Foundation; either
++ *  version 2.1 of the License, or (at your option) any later version.
++ *
++ *  This library is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ *  Lesser General Public License for more details.
++ *
++ *  You should have received a copy of the GNU Lesser General Public
++ *  License along with this library; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ *
++ *  Mark McKay can be contacted at mark@kitfox.com.  Salamander and other
++ *  projects can be found at http://www.kitfox.com
++ *
++ * Created on August 15, 2004, 11:34 PM
++ */
++
++package com.kitfox.svg.animation;
++
++import java.util.*;
++
++import com.kitfox.svg.xml.*;
++import com.kitfox.svg.*;
++
++/**
++ * A track holds the animation events for a single parameter of a single SVG 
++ * element.  It also contains the default value for the element, should the
++ * user want to see the 'unanimated' value.
++ *
++ * @author Mark McKay
++ * @author <a href="mailto:mark@kitfox.com">Mark McKay</a>
++ */
++abstract public class TrackBase
++{
++    protected final String attribName;
++    protected final int attribType;  //AnimationElement.AT_*
++ 
++    /** Element we're animating */
++    protected final SVGElement parent;
++    
++    //It doesn't make sense to sort this, since some events will depend on
++    // other events - in many cases, there will be no meaningful sorted order.
++    final ArrayList animEvents = new ArrayList();
++    
++    /** Creates a new instance of TrackManager */
++//    public TrackBase(SVGElement parent)
++//    {
++//        this(parent, "", AnimationElement.AT_AUTO);
++//    }
++    
++    /**
++     * Creates a track that would be valid for the name and type of element
++     * passed in.  Does not actually add this elemnt to the track.
++     */
++    public TrackBase(SVGElement parent, AnimationElement ele) throws SVGElementException
++    {
++        this(parent, ele.getAttribName(), ele.getAttribType());
++    }
++    
++    public TrackBase(SVGElement parent, String attribName, int attribType) throws SVGElementException
++    {
++        this.parent = parent;
++        this.attribName = attribName;
++        this.attribType = attribType;
++        
++        //Make sure parent has an attribute we will write to
++        if (attribType == AnimationElement.AT_AUTO 
++            && !parent.hasAttribute(attribName, AnimationElement.AT_CSS)
++            && !parent.hasAttribute(attribName, AnimationElement.AT_XML))
++        {
++            parent.addAttribute(attribName, AnimationElement.AT_CSS, "");
++        }
++        else if (!parent.hasAttribute(attribName, attribType))
++        {
++            parent.addAttribute(attribName, attribType, "");
++        }
++    }
++    
++    public String getAttribName() { return attribName; }
++    public int getAttribType() { return attribType; }
++    
++    public void addElement(AnimationElement ele)
++    {
++        animEvents.add(ele);
++    }
++    
++    /**
++     * Returns a StyleAttribute representing the value of this track at the
++     * passed time.  If this track does not apply, returns null.
++     * @return - True if successful, false if a value could not be obtained
++     */
++    abstract public boolean getValue(StyleAttribute attrib, double curTime) throws SVGException;
++    
++}
+Index: core/src/com/kitfox/svg/animation/TrackColor.java
 ===================================================================
---- josm.orig/src/com/kitfox/svg/animation/TrackColor.java      2011-07-17 10:45:41.638286404 +0200
-+++ /dev/null   1970-01-01 00:00:00.000000000 +0000
-@@ -1,95 +0,0 @@
--/*
-- * TrackManager.java
-- *
-- *  The Salamander Project - 2D and 3D graphics libraries in Java
-- *  Copyright (C) 2004 Mark McKay
-- *
-- *  This library is free software; you can redistribute it and/or
-- *  modify it under the terms of the GNU Lesser General Public
-- *  License as published by the Free Software Foundation; either
-- *  version 2.1 of the License, or (at your option) any later version.
-- *
-- *  This library is distributed in the hope that it will be useful,
-- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- *  Lesser General Public License for more details.
-- *
-- *  You should have received a copy of the GNU Lesser General Public
-- *  License along with this library; if not, write to the Free Software
-- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-- *
-- *  Mark McKay can be contacted at mark@kitfox.com.  Salamander and other
-- *  projects can be found at http://www.kitfox.com
-- *
-- * Created on September 21, 2004, 11:34 PM
-- */
--
--package com.kitfox.svg.animation;
--
--import com.kitfox.svg.xml.StyleAttribute;
--import java.awt.*;
--import java.util.*;
--
--import com.kitfox.svg.*;
--import com.kitfox.svg.xml.*;
--
--/**
-- * A track holds the animation events for a single parameter of a single SVG
-- * element.  It also contains the default value for the element, should the
-- * user want to see the 'unanimated' value.
-- *
-- * @author Mark McKay
-- * @author <a href="mailto:mark@kitfox.com">Mark McKay</a>
-- */
--public class TrackColor extends TrackBase
--{
--
--    public TrackColor(AnimationElement ele) throws SVGElementException
--    {
--        super(ele.getParent(), ele);
--    }
--
--    public boolean getValue(StyleAttribute attrib, double curTime)
--    {
--        Color col = getValue(curTime);
--        if (col == null) return false;
--
--        attrib.setStringValue("#" + Integer.toHexString(col.getRGB()));
--        return true;
--    }
--
--    public Color getValue(double curTime)
--    {
--        Color retVal = null;
--        AnimationTimeEval state = new AnimationTimeEval();
--
--        for (Iterator it = animEvents.iterator(); it.hasNext();)
--        {
--            AnimateBase ele = (AnimateBase)it.next();
--            AnimateColorIface eleColor = (AnimateColorIface)ele;
--            ele.evalParametric(state, curTime);
--
--            //Reject value if it is in the invalid state
--            if (Double.isNaN(state.interp)) continue;
--
--            if (retVal == null)
--            {
--                retVal = eleColor.evalColor(state.interp);
--                continue;
--            }
--            
--            Color curCol = eleColor.evalColor(state.interp);
--            switch (ele.getAdditiveType())
--            {
--                case AnimationElement.AD_REPLACE:
--                    retVal = curCol;
--                    break;
--                case AnimationElement.AD_SUM:
--                    retVal = new Color(curCol.getRed() + retVal.getRed(), curCol.getGreen() + retVal.getGreen(), curCol.getBlue() + retVal.getBlue());
--                    break;
--            }
--        }
--
--        return retVal;
--    }
--}
-Index: josm/src/com/kitfox/svg/animation/TrackDouble.java
+--- /dev/null   1970-01-01 00:00:00.000000000 +0000
++++ core/src/com/kitfox/svg/animation/TrackColor.java   2012-06-17 23:56:57.684545050 +0200
+@@ -0,0 +1,95 @@
++/*
++ * TrackManager.java
++ *
++ *  The Salamander Project - 2D and 3D graphics libraries in Java
++ *  Copyright (C) 2004 Mark McKay
++ *
++ *  This library is free software; you can redistribute it and/or
++ *  modify it under the terms of the GNU Lesser General Public
++ *  License as published by the Free Software Foundation; either
++ *  version 2.1 of the License, or (at your option) any later version.
++ *
++ *  This library is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ *  Lesser General Public License for more details.
++ *
++ *  You should have received a copy of the GNU Lesser General Public
++ *  License along with this library; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ *
++ *  Mark McKay can be contacted at mark@kitfox.com.  Salamander and other
++ *  projects can be found at http://www.kitfox.com
++ *
++ * Created on September 21, 2004, 11:34 PM
++ */
++
++package com.kitfox.svg.animation;
++
++import com.kitfox.svg.xml.StyleAttribute;
++import java.awt.*;
++import java.util.*;
++
++import com.kitfox.svg.*;
++import com.kitfox.svg.xml.*;
++
++/**
++ * A track holds the animation events for a single parameter of a single SVG
++ * element.  It also contains the default value for the element, should the
++ * user want to see the 'unanimated' value.
++ *
++ * @author Mark McKay
++ * @author <a href="mailto:mark@kitfox.com">Mark McKay</a>
++ */
++public class TrackColor extends TrackBase
++{
++
++    public TrackColor(AnimationElement ele) throws SVGElementException
++    {
++        super(ele.getParent(), ele);
++    }
++
++    public boolean getValue(StyleAttribute attrib, double curTime)
++    {
++        Color col = getValue(curTime);
++        if (col == null) return false;
++
++        attrib.setStringValue("#" + Integer.toHexString(col.getRGB()));
++        return true;
++    }
++
++    public Color getValue(double curTime)
++    {
++        Color retVal = null;
++        AnimationTimeEval state = new AnimationTimeEval();
++
++        for (Iterator it = animEvents.iterator(); it.hasNext();)
++        {
++            AnimateBase ele = (AnimateBase)it.next();
++            AnimateColorIface eleColor = (AnimateColorIface)ele;
++            ele.evalParametric(state, curTime);
++
++            //Reject value if it is in the invalid state
++            if (Double.isNaN(state.interp)) continue;
++
++            if (retVal == null)
++            {
++                retVal = eleColor.evalColor(state.interp);
++                continue;
++            }
++            
++            Color curCol = eleColor.evalColor(state.interp);
++            switch (ele.getAdditiveType())
++            {
++                case AnimationElement.AD_REPLACE:
++                    retVal = curCol;
++                    break;
++                case AnimationElement.AD_SUM:
++                    retVal = new Color(curCol.getRed() + retVal.getRed(), curCol.getGreen() + retVal.getGreen(), curCol.getBlue() + retVal.getBlue());
++                    break;
++            }
++        }
++
++        return retVal;
++    }
++}
+Index: core/src/com/kitfox/svg/animation/TrackDouble.java
 ===================================================================
---- josm.orig/src/com/kitfox/svg/animation/TrackDouble.java     2011-07-17 10:45:39.874277657 +0200
-+++ /dev/null   1970-01-01 00:00:00.000000000 +0000
-@@ -1,119 +0,0 @@
--/*
-- * TrackManager.java
-- *
-- *  The Salamander Project - 2D and 3D graphics libraries in Java
-- *  Copyright (C) 2004 Mark McKay
-- *
-- *  This library is free software; you can redistribute it and/or
-- *  modify it under the terms of the GNU Lesser General Public
-- *  License as published by the Free Software Foundation; either
-- *  version 2.1 of the License, or (at your option) any later version.
-- *
-- *  This library is distributed in the hope that it will be useful,
-- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- *  Lesser General Public License for more details.
-- *
-- *  You should have received a copy of the GNU Lesser General Public
-- *  License along with this library; if not, write to the Free Software
-- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-- *
-- *  Mark McKay can be contacted at mark@kitfox.com.  Salamander and other
-- *  projects can be found at http://www.kitfox.com
-- *
-- * Created on August 15, 2004, 11:34 PM
-- */
--
--package com.kitfox.svg.animation;
--
--import com.kitfox.svg.xml.StyleAttribute;
--import java.util.*;
--
--import com.kitfox.svg.*;
--import com.kitfox.svg.xml.*;
--
--/**
-- * A track holds the animation events for a single parameter of a single SVG
-- * element.  It also contains the default value for the element, should the
-- * user want to see the 'unanimated' value.
-- *
-- * @author Mark McKay
-- * @author <a href="mailto:mark@kitfox.com">Mark McKay</a>
-- */
--public class TrackDouble extends TrackBase
--{
--    public TrackDouble(AnimationElement ele) throws SVGElementException
--    {
--        super(ele.getParent(), ele);
--    }
--
--    public boolean getValue(StyleAttribute attrib, double curTime)
--    {
--        double val = getValue(curTime);
--        if (Double.isNaN(val)) return false;
--
--        attrib.setStringValue("" + val);
--        return true;
--    }
--
--    public double getValue(double curTime)
--    {
--        double retVal = Double.NaN;
--        
--        StyleAttribute attr = null;
--        switch (attribType)
--        {
--            case AnimationElement.AT_CSS:
--                attr = parent.getStyleAbsolute(attribName);
--                retVal = attr.getDoubleValue();
--                break;
--            case AnimationElement.AT_XML:
--                attr = parent.getPresAbsolute(attribName);
--                retVal = attr.getDoubleValue();
--                break;
--            case AnimationElement.AT_AUTO:
--                attr = parent.getStyleAbsolute(attribName);
--                if (attr == null) attr = parent.getPresAbsolute(attribName);
--                retVal = attr.getDoubleValue();
--                break;
--        }
--        
--        
--        
--        AnimationTimeEval state = new AnimationTimeEval();
--//        boolean pastEnd = true;
--
--        for (Iterator it = animEvents.iterator(); it.hasNext();)
--        {
--            Animate ele = (Animate)it.next();
--            ele.evalParametric(state, curTime);
--
--            //Go to next element if this one does not affect processing
--            if (Double.isNaN(state.interp)) continue;
--
--            switch (ele.getAdditiveType())
--            {
--                case AnimationElement.AD_SUM:
--                    retVal += ele.eval(state.interp);
--                    break;
--                case AnimationElement.AD_REPLACE:
--                    retVal = ele.eval(state.interp);
--                    break;
--            }
--            
--            //Evalutae accumulation if applicable
--            if (state.rep > 0)
--            {
--                switch (ele.getAccumulateType())
--                {
--                    case AnimationElement.AC_SUM:
--                        retVal += ele.repeatSkipSize(state.rep);
--                        break;
--                }
--                
--            }
--        }
--
--        return retVal;
--    }
--}
-Index: josm/src/com/kitfox/svg/animation/TrackManager.java
+--- /dev/null   1970-01-01 00:00:00.000000000 +0000
++++ core/src/com/kitfox/svg/animation/TrackDouble.java  2012-06-17 23:56:57.684545050 +0200
+@@ -0,0 +1,119 @@
++/*
++ * TrackManager.java
++ *
++ *  The Salamander Project - 2D and 3D graphics libraries in Java
++ *  Copyright (C) 2004 Mark McKay
++ *
++ *  This library is free software; you can redistribute it and/or
++ *  modify it under the terms of the GNU Lesser General Public
++ *  License as published by the Free Software Foundation; either
++ *  version 2.1 of the License, or (at your option) any later version.
++ *
++ *  This library is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ *  Lesser General Public License for more details.
++ *
++ *  You should have received a copy of the GNU Lesser General Public
++ *  License along with this library; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ *
++ *  Mark McKay can be contacted at mark@kitfox.com.  Salamander and other
++ *  projects can be found at http://www.kitfox.com
++ *
++ * Created on August 15, 2004, 11:34 PM
++ */
++
++package com.kitfox.svg.animation;
++
++import com.kitfox.svg.xml.StyleAttribute;
++import java.util.*;
++
++import com.kitfox.svg.*;
++import com.kitfox.svg.xml.*;
++
++/**
++ * A track holds the animation events for a single parameter of a single SVG
++ * element.  It also contains the default value for the element, should the
++ * user want to see the 'unanimated' value.
++ *
++ * @author Mark McKay
++ * @author <a href="mailto:mark@kitfox.com">Mark McKay</a>
++ */
++public class TrackDouble extends TrackBase
++{
++    public TrackDouble(AnimationElement ele) throws SVGElementException
++    {
++        super(ele.getParent(), ele);
++    }
++
++    public boolean getValue(StyleAttribute attrib, double curTime)
++    {
++        double val = getValue(curTime);
++        if (Double.isNaN(val)) return false;
++
++        attrib.setStringValue("" + val);
++        return true;
++    }
++
++    public double getValue(double curTime)
++    {
++        double retVal = Double.NaN;
++        
++        StyleAttribute attr = null;
++        switch (attribType)
++        {
++            case AnimationElement.AT_CSS:
++                attr = parent.getStyleAbsolute(attribName);
++                retVal = attr.getDoubleValue();
++                break;
++            case AnimationElement.AT_XML:
++                attr = parent.getPresAbsolute(attribName);
++                retVal = attr.getDoubleValue();
++                break;
++            case AnimationElement.AT_AUTO:
++                attr = parent.getStyleAbsolute(attribName);
++                if (attr == null) attr = parent.getPresAbsolute(attribName);
++                retVal = attr.getDoubleValue();
++                break;
++        }
++        
++        
++        
++        AnimationTimeEval state = new AnimationTimeEval();
++//        boolean pastEnd = true;
++
++        for (Iterator it = animEvents.iterator(); it.hasNext();)
++        {
++            Animate ele = (Animate)it.next();
++            ele.evalParametric(state, curTime);
++
++            //Go to next element if this one does not affect processing
++            if (Double.isNaN(state.interp)) continue;
++
++            switch (ele.getAdditiveType())
++            {
++                case AnimationElement.AD_SUM:
++                    retVal += ele.eval(state.interp);
++                    break;
++                case AnimationElement.AD_REPLACE:
++                    retVal = ele.eval(state.interp);
++                    break;
++            }
++            
++            //Evalutae accumulation if applicable
++            if (state.rep > 0)
++            {
++                switch (ele.getAccumulateType())
++                {
++                    case AnimationElement.AC_SUM:
++                        retVal += ele.repeatSkipSize(state.rep);
++                        break;
++                }
++                
++            }
++        }
++
++        return retVal;
++    }
++}
+Index: core/src/com/kitfox/svg/animation/TrackManager.java
 ===================================================================
---- josm.orig/src/com/kitfox/svg/animation/TrackManager.java    2011-07-17 10:45:41.278284615 +0200
-+++ /dev/null   1970-01-01 00:00:00.000000000 +0000
-@@ -1,153 +0,0 @@
--/*
-- * TrackManager.java
-- *
-- *  The Salamander Project - 2D and 3D graphics libraries in Java
-- *  Copyright (C) 2004 Mark McKay
-- *
-- *  This library is free software; you can redistribute it and/or
-- *  modify it under the terms of the GNU Lesser General Public
-- *  License as published by the Free Software Foundation; either
-- *  version 2.1 of the License, or (at your option) any later version.
-- *
-- *  This library is distributed in the hope that it will be useful,
-- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- *  Lesser General Public License for more details.
-- *
-- *  You should have received a copy of the GNU Lesser General Public
-- *  License along with this library; if not, write to the Free Software
-- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-- *
-- *  Mark McKay can be contacted at mark@kitfox.com.  Salamander and other
-- *  projects can be found at http://www.kitfox.com
-- *
-- * Created on August 15, 2004, 11:34 PM
-- */
--
--package com.kitfox.svg.animation;
--
--import java.util.*;
--
--import com.kitfox.svg.*;
--import java.io.Serializable;
--
--/**
-- * Every element contains tracks, which manage the animation.  There is one track
-- * for every parameter with animation, and each track in turn is composed of
-- * many events.
-- *
-- * @author Mark McKay
-- * @author <a href="mailto:mark@kitfox.com">Mark McKay</a>
-- */
--public class TrackManager implements Serializable
--{
--    public static final long serialVersionUID = 0;
--    
--    static class TrackKey
--    {
--        String name;
--        int type;
--        
--        TrackKey(AnimationElement base)
--        {
--            this(base.getAttribName(), base.getAttribType());
--        }
--        
--        TrackKey(String name, int type)
--        {
--            this.name = name;
--            this.type = type;
--        }
--        
--        public int hashCode() { return name.hashCode() ^ type; } 
--        public boolean equals(Object obj) 
--        {
--            if (!(obj instanceof TrackKey)) return false;
--            TrackKey key = (TrackKey)obj;
--            return key.type == type && key.name.equals(name);
--        }
--    }
--    
--    HashMap tracks = new HashMap();
--    
--    /** Creates a new instance of TrackManager */
--    public TrackManager()
--    {
--    }
--    
--    /**
--     * Adds a new animation element to this track
--     */
--    public void addTrackElement(AnimationElement element) throws SVGElementException
--    {
--        TrackKey key = new TrackKey(element);
--        
--        TrackBase track = (TrackBase)tracks.get(key);
--        
--        if (track == null)
--        {
--            //Create a track for this element
--            if (element instanceof Animate)
--            {
--                switch (((Animate)element).getDataType())
--                {
--                    case Animate.DT_REAL:
--                        track = new TrackDouble(element);
--                        break;
--                    case Animate.DT_COLOR:
--                        track = new TrackColor(element);
--                        break;
--                    case Animate.DT_PATH:
--                        track = new TrackPath(element);
--                        break;
--                    default:
--                        throw new RuntimeException("");
--                }
--            }
--            else if (element instanceof AnimateColor)
--            {
--                track = new TrackColor(element);
--            }
--            else if (element instanceof AnimateTransform || element instanceof AnimateMotion)
--            {
--                track = new TrackTransform(element);
--            }
--            
--            tracks.put(key, track);
--        }
--  
--        track.addElement(element);
--    }
--    
--    public TrackBase getTrack(String name, int type)
--    {
--        //Handle AUTO, which will match either CSS or XML (in that order)
--        if (type == AnimationElement.AT_AUTO)
--        {
--            TrackBase t = getTrack(name, AnimationElement.AT_CSS);
--            if (t != null) return t;
--            t = getTrack(name, AnimationElement.AT_XML);
--            if (t != null) return t;
--            return null;
--        }
--        
--        //Get requested attribute
--        TrackKey key = new TrackKey(name, type);
--        TrackBase t = (TrackBase)tracks.get(key);
--        if (t != null) return t;
--        
--        //If that didn't exist, see if one exists of type AUTO
--        key = new TrackKey(name, AnimationElement.AT_AUTO);
--        return (TrackBase)tracks.get(key);
--    }
--    
--    public int getNumTracks()
--    {
--        return tracks.size();
--    }
--    
--    public Iterator iterator()
--    {
--        return tracks.values().iterator();
--    }
--}
-Index: josm/src/com/kitfox/svg/animation/TrackMotion.java
+--- /dev/null   1970-01-01 00:00:00.000000000 +0000
++++ core/src/com/kitfox/svg/animation/TrackManager.java 2012-06-17 23:56:57.684545050 +0200
+@@ -0,0 +1,153 @@
++/*
++ * TrackManager.java
++ *
++ *  The Salamander Project - 2D and 3D graphics libraries in Java
++ *  Copyright (C) 2004 Mark McKay
++ *
++ *  This library is free software; you can redistribute it and/or
++ *  modify it under the terms of the GNU Lesser General Public
++ *  License as published by the Free Software Foundation; either
++ *  version 2.1 of the License, or (at your option) any later version.
++ *
++ *  This library is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ *  Lesser General Public License for more details.
++ *
++ *  You should have received a copy of the GNU Lesser General Public
++ *  License along with this library; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ *
++ *  Mark McKay can be contacted at mark@kitfox.com.  Salamander and other
++ *  projects can be found at http://www.kitfox.com
++ *
++ * Created on August 15, 2004, 11:34 PM
++ */
++
++package com.kitfox.svg.animation;
++
++import java.util.*;
++
++import com.kitfox.svg.*;
++import java.io.Serializable;
++
++/**
++ * Every element contains tracks, which manage the animation.  There is one track
++ * for every parameter with animation, and each track in turn is composed of
++ * many events.
++ *
++ * @author Mark McKay
++ * @author <a href="mailto:mark@kitfox.com">Mark McKay</a>
++ */
++public class TrackManager implements Serializable
++{
++    public static final long serialVersionUID = 0;
++    
++    static class TrackKey
++    {
++        String name;
++        int type;
++        
++        TrackKey(AnimationElement base)
++        {
++            this(base.getAttribName(), base.getAttribType());
++        }
++        
++        TrackKey(String name, int type)
++        {
++            this.name = name;
++            this.type = type;
++        }
++        
++        public int hashCode() { return name.hashCode() ^ type; } 
++        public boolean equals(Object obj) 
++        {
++            if (!(obj instanceof TrackKey)) return false;
++            TrackKey key = (TrackKey)obj;
++            return key.type == type && key.name.equals(name);
++        }
++    }
++    
++    HashMap tracks = new HashMap();
++    
++    /** Creates a new instance of TrackManager */
++    public TrackManager()
++    {
++    }
++    
++    /**
++     * Adds a new animation element to this track
++     */
++    public void addTrackElement(AnimationElement element) throws SVGElementException
++    {
++        TrackKey key = new TrackKey(element);
++        
++        TrackBase track = (TrackBase)tracks.get(key);
++        
++        if (track == null)
++        {
++            //Create a track for this element
++            if (element instanceof Animate)
++            {
++                switch (((Animate)element).getDataType())
++                {
++                    case Animate.DT_REAL:
++                        track = new TrackDouble(element);
++                        break;
++                    case Animate.DT_COLOR:
++                        track = new TrackColor(element);
++                        break;
++                    case Animate.DT_PATH:
++                        track = new TrackPath(element);
++                        break;
++                    default:
++                        throw new RuntimeException("");
++                }
++            }
++            else if (element instanceof AnimateColor)
++            {
++                track = new TrackColor(element);
++            }
++            else if (element instanceof AnimateTransform || element instanceof AnimateMotion)
++            {
++                track = new TrackTransform(element);
++            }
++            
++            tracks.put(key, track);
++        }
++  
++        track.addElement(element);
++    }
++    
++    public TrackBase getTrack(String name, int type)
++    {
++        //Handle AUTO, which will match either CSS or XML (in that order)
++        if (type == AnimationElement.AT_AUTO)
++        {
++            TrackBase t = getTrack(name, AnimationElement.AT_CSS);
++            if (t != null) return t;
++            t = getTrack(name, AnimationElement.AT_XML);
++            if (t != null) return t;
++            return null;
++        }
++        
++        //Get requested attribute
++        TrackKey key = new TrackKey(name, type);
++        TrackBase t = (TrackBase)tracks.get(key);
++        if (t != null) return t;
++        
++        //If that didn't exist, see if one exists of type AUTO
++        key = new TrackKey(name, AnimationElement.AT_AUTO);
++        return (TrackBase)tracks.get(key);
++    }
++    
++    public int getNumTracks()
++    {
++        return tracks.size();
++    }
++    
++    public Iterator iterator()
++    {
++        return tracks.values().iterator();
++    }
++}
+Index: core/src/com/kitfox/svg/animation/TrackMotion.java
 ===================================================================
---- josm.orig/src/com/kitfox/svg/animation/TrackMotion.java     2011-07-17 10:45:40.966283072 +0200
-+++ /dev/null   1970-01-01 00:00:00.000000000 +0000
-@@ -1,128 +0,0 @@
--/*
-- * TrackManager.java
-- *
-- *  The Salamander Project - 2D and 3D graphics libraries in Java
-- *  Copyright (C) 2004 Mark McKay
-- *
-- *  This library is free software; you can redistribute it and/or
-- *  modify it under the terms of the GNU Lesser General Public
-- *  License as published by the Free Software Foundation; either
-- *  version 2.1 of the License, or (at your option) any later version.
-- *
-- *  This library is distributed in the hope that it will be useful,
-- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- *  Lesser General Public License for more details.
-- *
-- *  You should have received a copy of the GNU Lesser General Public
-- *  License along with this library; if not, write to the Free Software
-- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-- *
-- *  Mark McKay can be contacted at mark@kitfox.com.  Salamander and other
-- *  projects can be found at http://www.kitfox.com
-- *
-- * Created on September 21, 2004, 11:34 PM
-- */
--
--package com.kitfox.svg.animation;
--
--import com.kitfox.svg.xml.StyleAttribute;
--import java.awt.geom.*;
--import java.util.*;
--
--import com.kitfox.svg.*;
--import com.kitfox.svg.xml.*;
--
--/**
-- * A track holds the animation events for a single parameter of a single SVG
-- * element.  It also contains the default value for the element, should the
-- * user want to see the 'unanimated' value.
-- *
-- * @author Mark McKay
-- * @author <a href="mailto:mark@kitfox.com">Mark McKay</a>
-- */
--public class TrackMotion extends TrackBase
--{
--    public TrackMotion(AnimationElement ele) throws SVGElementException
--    {
--        //The motion element implies a CSS attribute of transform
--//        super(ele.getParent(), "transform", AnimationElement.AT_CSS);
--        super(ele.getParent(), ele);
--    }
--
--    public boolean getValue(StyleAttribute attrib, double curTime) throws SVGException
--    {
--        AffineTransform retVal = new AffineTransform();
--        retVal = getValue(retVal, curTime);
--//        AffineTransform val = getValue(curTime);
--//        if (val == null) return false;
--
--        double[] mat = new double[6];
--        retVal.getMatrix(mat);
--        attrib.setStringValue("matrix(" + mat[0] + " " + mat[1] + " " + mat[2] + " " + mat[3] + " " + mat[4] + " " + mat[5] + ")");
--        return true;
--    }
--
--    public AffineTransform getValue(AffineTransform retVal, double curTime) throws SVGException
--    {
--        //Init transform with default state
--        StyleAttribute attr = null;
--        switch (attribType)
--        {
--            case AnimationElement.AT_CSS:
--                attr = parent.getStyleAbsolute(attribName);
--                retVal.setTransform(SVGElement.parseSingleTransform(attr.getStringValue()));
--                break;
--            case AnimationElement.AT_XML:
--                attr = parent.getPresAbsolute(attribName);
--                retVal.setTransform(SVGElement.parseSingleTransform(attr.getStringValue()));
--                break;
--            case AnimationElement.AT_AUTO:
--                attr = parent.getStyleAbsolute(attribName);
--                if (attr == null) attr = parent.getPresAbsolute(attribName);
--                retVal.setTransform(SVGElement.parseSingleTransform(attr.getStringValue()));
--                break;
--        }
--
--
--        //Update transform with time based information
--        AnimationTimeEval state = new AnimationTimeEval();
--        AffineTransform xform = new AffineTransform();
--//        boolean pastEnd = true;
--
--        for (Iterator it = animEvents.iterator(); it.hasNext();)
--        {
--            AnimateMotion ele = (AnimateMotion)it.next();
--            ele.evalParametric(state, curTime);
--
--            //Go to next element if this one does not affect processing
--            if (Double.isNaN(state.interp)) continue;
--
--            switch (ele.getAdditiveType())
--            {
--                case AnimationElement.AD_SUM:
--                    retVal.concatenate(ele.eval(xform, state.interp));
--                    break;
--                case AnimationElement.AD_REPLACE:
--                    retVal.setTransform(ele.eval(xform, state.interp));
--                    break;
--            }
--
--            //Evaluate accumulation if applicable
--/*
--            if (state.rep > 0)
--            {
--                switch (ele.getAccumulateType())
--                {
--                    case AnimationElement.AC_SUM:
--                        retVal += ele.repeatSkipSize(state.rep);
--                        break;
--                }
--
--            }
--*/
--        }
--
--        return retVal;
--    }
--}
-Index: josm/src/com/kitfox/svg/animation/TrackPath.java
+--- /dev/null   1970-01-01 00:00:00.000000000 +0000
++++ core/src/com/kitfox/svg/animation/TrackMotion.java  2012-06-17 23:56:57.684545050 +0200
+@@ -0,0 +1,128 @@
++/*
++ * TrackManager.java
++ *
++ *  The Salamander Project - 2D and 3D graphics libraries in Java
++ *  Copyright (C) 2004 Mark McKay
++ *
++ *  This library is free software; you can redistribute it and/or
++ *  modify it under the terms of the GNU Lesser General Public
++ *  License as published by the Free Software Foundation; either
++ *  version 2.1 of the License, or (at your option) any later version.
++ *
++ *  This library is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ *  Lesser General Public License for more details.
++ *
++ *  You should have received a copy of the GNU Lesser General Public
++ *  License along with this library; if not, write to the Free Software
++ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
++ *
++ *  Mark McKay can be contacted at mark@kitfox.com.  Salamander and other
++ *  projects can be found at http://www.kitfox.com
++ *
++ * Created on September 21, 2004, 11:34 PM
++ */
++
++package com.kitfox.svg.animation;
++
++import com.kitfox.svg.xml.StyleAttribute;
++import java.awt.geom.*;
++import java.util.*;
++
++import com.kitfox.svg.*;
++import com.kitfox.svg.xml.*;
++
++/**
++ * A track holds the animation events for a single parameter of a single SVG
++ * element.  It also contains the default value for the element, should the
++ * user want to see the 'unanimated' value.
++ *
++ * @author Mark McKay
++ * @author <a href="mailto:mark@kitfox.com">Mark McKay</a>
++ */
++public class TrackMotion extends TrackBase
++{
++    public TrackMotion(AnimationElement ele) throws SVGElementException
++    {
++        //The motion element implies a CSS attribute of transform
++//        super(ele.getParent(), "transform", AnimationElement.AT_CSS);
++        super(ele.getParent(), ele);
++    }
++
++    public boolean getValue(StyleAttribute attrib, double curTime) throws SVGException
++    {
++        AffineTransform retVal = new AffineTransform();
++        retVal = getValue(retVal, curTime);
++//        AffineTransform val = getValue(curTime);
++//        if (val == null) return false;
++
++        double[] mat = new double[6];
++        retVal.getMatrix(mat);
++        attrib.setStringValue("matrix(" + mat[0] + " " + mat[1] + " " + mat[2] + " " + mat[3] + " " + mat[4] + " " + mat[5] + ")");
++        return true;
++    }
++
++    public AffineTransform getValue(AffineTransform retVal, double curTime) throws SVGException
++    {
++        //Init transform with default state
++        StyleAttribute attr = null;
++        switch (attribType)
++        {
++            case AnimationElement.AT_CSS:
++                attr = parent.getStyleAbsolute(attribName);
++                retVal.setTransform(SVGElement.parseSingleTransform(attr.getStringValue()));
++                break;
++            case AnimationElement.AT_XML:
++                attr = parent.getPresAbsolute(attribName);
++                retVal.setTransform(SVGElement.parseSingleTransform(attr.getStringValue()));
++                break;
++            case AnimationElement.AT_AUTO:
++                attr = parent.getStyleAbsolute(attribName);
++                if (attr == null) attr = parent.getPresAbsolute(attribName);
++                retVal.setTransform(SVGElement.parseSingleTransform(attr.getStringValue()))