merge silveiro's and my changes

diff --git a/src/extension/internal/javafx-out.cpp b/src/extension/internal/javafx-out.cpp
index e31d06b129ad7e5cfec7d5388f439f926b91ca2c..070b59781a0334cd91aeef8dd4b21899d0990637 100644 (file)
--- a/src/extension/internal/javafx-out.cpp
+++ b/src/extension/internal/javafx-out.cpp
@@ -6,6 +6,8 @@
  *\r
  * Authors:\r
  *   Bob Jamison <ishmal@inkscape.org>\r
+ *   Silveira Neto <silveiraneto@gmail.com>\r
+ *   Jim Clarke <Jim.Clarke@sun.com>\r
  *\r
  * Copyright (C) 2008 Authors\r
  *\r
@@ -24,6 +26,7 @@
 #include <sp-radial-gradient.h>\r
 #include <style.h>\r
 #include <display/curve.h>\r
+#include <display/canvas-bpath.h>\r
 #include <svg/svg.h>\r
 #include <extension/system.h>\r
 #include <2geom/pathvector.h>\r
@@ -104,20 +107,31 @@ static JavaFXOutput::String dstr(double d)
     return s;\r
 }\r
 \r
+#define DSTR(d) (dstr(d).c_str())\r
 \r
+static JavaFXOutput::String istr(double d)\r
+{\r
+    char dbuf[G_ASCII_DTOSTR_BUF_SIZE+1];\r
+    g_ascii_formatd(dbuf, G_ASCII_DTOSTR_BUF_SIZE,\r
+                  "%.0f", (gdouble)d);\r
+    JavaFXOutput::String s = dbuf;\r
+    return s;\r
+}\r
+\r
+#define ISTR(d) (istr(d).c_str())\r
 \r
 /**\r
  * Format an rgba() string\r
  */\r
 static JavaFXOutput::String rgba(guint32 rgba)\r
 {\r
-    double r = SP_RGBA32_R_F(rgba);\r
-    double g = SP_RGBA32_G_F(rgba);\r
-    double b = SP_RGBA32_B_F(rgba);\r
-    double a = SP_RGBA32_A_F(rgba);\r
-    char buf[128];\r
-    snprintf(buf, 79, "Color.color(%s, %s, %s, %s)", \r
-          dstr(r).c_str(), dstr(g).c_str(), dstr(b).c_str(), dstr(a).c_str());\r
+    unsigned int r = SP_RGBA32_R_U(rgba);\r
+    unsigned int g = SP_RGBA32_G_U(rgba);\r
+    unsigned int b = SP_RGBA32_B_U(rgba);\r
+    unsigned int a = SP_RGBA32_A_U(rgba);\r
+    char buf[80];\r
+    snprintf(buf, 79, "Color.rgb(0x%02x, 0x%02x, 0x%02x, %s)",\r
+                           r, g, b, DSTR((double)a/256.0));\r
     JavaFXOutput::String s = buf;\r
     return s;\r
 }\r
@@ -131,6 +145,38 @@ static JavaFXOutput::String rgba(SPColor color, gdouble alpha)
     return rgba(color.toRGBA32(alpha));\r
 }\r
 \r
+/**\r
+ * Map Inkscape linecap styles to JavaFX\r
+ */\r
+static JavaFXOutput::String getStrokeLineCap(unsigned value) {\r
+    switch(value) {\r
+        case SP_STROKE_LINECAP_BUTT:\r
+            return "StrokeLineCap.BUTT";\r
+        case SP_STROKE_LINECAP_ROUND:\r
+            return "StrokeLineCap.ROUND";\r
+        case SP_STROKE_LINECAP_SQUARE:\r
+            return "StrokeLineCap.SQUARE";\r
+        default:\r
+            return "INVALID LINE CAP";\r
+    }\r
+}\r
+\r
+\r
+/**\r
+ * Map Inkscape linejoin styles to JavaFX\r
+ */\r
+static JavaFXOutput::String getStrokeLineJoin(unsigned value) {\r
+    switch(value) {\r
+        case SP_STROKE_LINEJOIN_MITER:\r
+            return "StrokeLineJoin.MITER";\r
+        case SP_STROKE_LINEJOIN_ROUND:\r
+            return "StrokeLineJoin.ROUND";\r
+        case SP_STROKE_LINEJOIN_BEVEL:\r
+            return "StrokeLineJoin.BEVEL";\r
+        default:\r
+            return "INVALID LINE JOIN";\r
+    }\r
+}\r
 \r
 \r
 \r
@@ -147,18 +193,6 @@ void JavaFXOutput::out(const char *fmt, ...)
     g_free(output);\r
 }\r
 \r
-/**\r
- *  Output header data to the buffer, printf()-style\r
- */\r
-void JavaFXOutput::fout(const char *fmt, ...)\r
-{\r
-    va_list args;\r
-    va_start(args, fmt);\r
-    gchar *output = g_strdup_vprintf(fmt, args);\r
-    va_end(args);\r
-    foutbuf.append(output);\r
-    g_free(output);\r
-}\r
 \r
 \r
 /**\r
@@ -191,24 +225,20 @@ bool JavaFXOutput::doHeader()
     out("##    Nodes    : %d\n", nrNodes);\r
     out("###################################################################*/\n");\r
     out("\n\n");\r
+\r
+    // import javafx libraries we can need\r
     out("import javafx.application.*;\n");\r
     out("import javafx.scene.*;\n");\r
     out("import javafx.scene.geometry.*;\n");\r
-    out("import javafx.scene.paint.*;\n");\r
     out("import javafx.scene.transform.*;\n");\r
+    out("import javafx.scene.paint.*;\n");\r
     out("\n");\r
-    out("import java.lang.System;\n");\r
+\r
     out("\n\n");\r
+\r
+    // Creates a class extended from CustomNode\r
     out("public class %s extends CustomNode {\n", name.c_str());\r
-    out("\n\n");\r
-    outbuf.append(foutbuf);\r
-    out("\n\n");\r
-    out("public function create() : Node\n");\r
-    out("{\n");\r
-    out("return Group\n");\r
-    out("    {\n");\r
-    out("    content:\n");\r
-    out("        [\n");\r
+\r
     return true;\r
 }\r
 \r
@@ -219,33 +249,33 @@ bool JavaFXOutput::doHeader()
  */\r
 bool JavaFXOutput::doTail()\r
 {\r
-    int border = 25.0;\r
-    out("        ] // content\n");\r
-    out("    transform: [ Translate.translate(%s, %s), ]\n",\r
-                 dstr((-minx) + border).c_str(), dstr((-miny) + border).c_str());\r
-    out("    } // Group\n");\r
-    out("}  // end function create()\n");\r
-    out("\n\n");\r
-    out("}\n");\r
-    out("/*###################################################################\n");\r
-    out("### E N D   C L A S S    %s\n", name.c_str());\r
-    out("###################################################################*/\n");\r
-    out("\n\n\n\n");\r
+    float border = 25.0;\r
+\r
+    // Write the tail of CustomNode\r
+    out("           ] // content\n");\r
+    out("           transform: Translate { x : %s, y : %s }\n",\r
+                 DSTR((-minx) + border), DSTR((-miny) + border) );\r
+    out("       } // Group\n");\r
+    out("   } // function create()\n");\r
+    out("} // class %s\n", name.c_str());\r
     out("\n");\r
+\r
+    // Frame\r
     out("Frame {\n");\r
-    out("    title: \"TestFrame\"\n");\r
-    out("    width: (%s).intValue()\n", dstr(maxx-minx + border * 2.0).c_str());\r
-    out("    height: (%s).intValue()\n", dstr(maxy-miny + border * 2.0).c_str());\r
-    out("    closeAction: function()\n");\r
-    out("        {\n");\r
-    out("        System.exit( 0 );\n");\r
-    out("        }\n");\r
+    out("    title: \"%s\"\n", name.c_str());\r
+    out("    width: %s\n", ISTR(maxx-minx + border * 2.0));\r
+    out("    height: %s\n", ISTR(maxy-miny + border * 2.0));\r
     out("    visible: true\n");\r
+\r
+    // Stage\r
     out("    stage: Stage {\n");\r
     out("        content: %s{}\n", name.c_str());\r
-    out("    }\n");\r
-    out("}\n");\r
-    out("\n\n");\r
+    out("    } // Stage\n");\r
+\r
+    out("} // Frame\n");\r
+\r
+    out("\n");\r
+\r
     out("/*###################################################################\n");\r
     out("### E N D   C L A S S    %s\n", name.c_str());\r
     out("###################################################################*/\n");\r
@@ -263,61 +293,57 @@ bool JavaFXOutput::doGradient(SPGradient *grad, const String &id)
     if (SP_IS_LINEARGRADIENT(grad))\r
         {\r
         SPLinearGradient *g = SP_LINEARGRADIENT(grad);\r
-        fout("function %s() : LinearGradient\n", id.c_str());\r
-        fout("{\n");\r
-        fout("    return LinearGradient\n");\r
-        fout("        {\n");\r
+        out("    /* create LinearGradient for %s */\n", id.c_str());\r
+        out("    private function %s(): LinearGradient {\n",  id.c_str());\r
+        out("        LinearGradient {\n");\r
         std::vector<SPGradientStop> stops = g->vector.stops;\r
         if (stops.size() > 0)\r
             {\r
-            fout("        stops:\n");\r
-            fout("            [\n");\r
+            out("            stops:\n");\r
+            out("                [\n");\r
             for (unsigned int i = 0 ; i<stops.size() ; i++)\r
                 {\r
                 SPGradientStop stop = stops[i];\r
-                fout("            Stop\n");\r
-                fout("                {\n");\r
-                fout("                offset: %s\n", dstr(stop.offset).c_str());\r
-                fout("                color: %s\n", rgba(stop.color, stop.opacity).c_str());\r
-                fout("                },\n");\r
+                out("                Stop {\n");\r
+                out("                    offset: %s\n", DSTR(stop.offset));\r
+                out("                    color: %s\n", rgba(stop.color, stop.opacity).c_str());\r
+                out("                },\n");\r
                 }\r
-            fout("            ]\n");\r
+            out("            ]\n");\r
             }\r
-        fout("        }\n");\r
-        fout("}\n");\r
-        fout("\n\n");\r
+        out("        };\n");\r
+        out("    } // end LinearGradient: %s\n", id.c_str());\r
+        out("\n\n");\r
         }\r
     else if (SP_IS_RADIALGRADIENT(grad))\r
         {\r
         SPRadialGradient *g = SP_RADIALGRADIENT(grad);\r
-        fout("function %s() : RadialGradient\n", id.c_str());\r
-        fout("{\n");\r
-        fout("    return RadialGradient\n");\r
-        fout("        {\n");\r
-        fout("        centerX: %s\n", dstr(g->cx.value).c_str());\r
-        fout("        centerY: %s\n", dstr(g->cy.value).c_str());\r
-        fout("        focusX: %s\n", dstr(g->fx.value).c_str());\r
-        fout("        focusY: %s\n", dstr(g->fy.value).c_str());\r
-        fout("        radius: %s\n", dstr(g->r.value).c_str());\r
+        out("    /* create RadialGradient for %s */\n", id.c_str());\r
+        out("    private function %s() {\n", id.c_str());\r
+        out("        RadialGradient {\n");\r
+        out("            centerX: %s\n", DSTR(g->cx.value));\r
+        out("            centerY: %s\n", DSTR(g->cy.value));\r
+        out("            focusX: %s\n", DSTR(g->fx.value));\r
+        out("            focusY: %s\n", DSTR(g->fy.value));\r
+        out("            radius: %s\n", DSTR(g->r.value));\r
         std::vector<SPGradientStop> stops = g->vector.stops;\r
         if (stops.size() > 0)\r
             {\r
-            fout("        stops:\n");\r
-            fout("            [\n");\r
+            out("            stops:\n");\r
+            out("            [\n");\r
             for (unsigned int i = 0 ; i<stops.size() ; i++)\r
                 {\r
                 SPGradientStop stop = stops[i];\r
-                fout("            Stop\n");\r
-                fout("                {\n");\r
-                fout("                offset: %s\n", dstr(stop.offset).c_str());\r
-                fout("                color: %s\n", rgba(stop.color, stop.opacity).c_str());\r
-                fout("                },\n");\r
+                out("                Stop {\n");\r
+                out("                    offset: %s\n", DSTR(stop.offset));\r
+                out("                    color: %s\n", rgba(stop.color, stop.opacity).c_str());\r
+                out("                },\n");\r
                 }\r
-            fout("            ]\n");\r
+            out("            ]\n");\r
             }\r
-        fout("        }\n");\r
-        fout("}\n");\r
-        fout("\n\n");\r
+        out("        };\n");\r
+        out("    } // end RadialGradient: %s\n", id.c_str());\r
+        out("\n\n");\r
         }\r
     else\r
         {\r
@@ -340,7 +366,7 @@ bool JavaFXOutput::doStyle(SPStyle *style)
     if (!style)\r
         return true;\r
 \r
-    out("        opacity: %s\n", dstr(effective_opacity(style)).c_str());\r
+    out("            opacity: %s\n", DSTR(effective_opacity(style)));\r
 \r
     /**\r
      * Fill\r
@@ -349,19 +375,18 @@ bool JavaFXOutput::doStyle(SPStyle *style)
     if (fill.isColor())\r
         {\r
         // see color.h for how to parse SPColor\r
-        out("        fill: %s\n",\r
+        out("            fill: %s\n",\r
             rgba(fill.value.color, SP_SCALE24_TO_FLOAT(style->fill_opacity.value)).c_str());\r
         }\r
-    else if (fill.isPaintserver())\r
-        {\r
-        if (fill.value.href && fill.value.href->getURI() )\r
-            {\r
+    else if (fill.isPaintserver()){\r
+        if (fill.value.href && fill.value.href->getURI() ){\r
             String uri = fill.value.href->getURI()->toString();\r
-            if (uri.size()>0 && uri[0]=='#')\r
+            /* trim the anchor '#' from the front */\r
+            if (uri.size() > 0 && uri[0]=='#')\r
                 uri = uri.substr(1);\r
-            out("        fill: %s()\n", uri.c_str());\r
-            }\r
+            out("            fill: %s()\n", uri.c_str());\r
         }\r
+    }\r
 \r
 \r
     /**\r
@@ -383,17 +408,172 @@ bool JavaFXOutput::doStyle(SPStyle *style)
     if (style->stroke_opacity.value > 0)\r
         {\r
         SPIPaint stroke = style->stroke;\r
-        out("        stroke: %s\n",\r
+        out("            stroke: %s\n",\r
             rgba(stroke.value.color, SP_SCALE24_TO_FLOAT(style->stroke_opacity.value)).c_str());\r
         double strokewidth = style->stroke_width.value;\r
-        out("        strokeWidth: %s\n", dstr(strokewidth).c_str());\r
+        unsigned linecap = style->stroke_linecap.value;\r
+        unsigned linejoin = style->stroke_linejoin.value;\r
+        out("            strokeWidth: %s\n", DSTR(strokewidth));\r
+        out("            strokeLineCap: %s\n", getStrokeLineCap(linecap).c_str());\r
+        out("            strokeLineJoin: %s\n", getStrokeLineJoin(linejoin).c_str());\r
+        out("            strokeMiterLimit: %s\n", DSTR(style->stroke_miterlimit.value));\r
+        if(style->stroke_dasharray_set) {\r
+           if(style->stroke_dashoffset_set) {\r
+               out("            strokeDashOffset: %s\n", DSTR(style->stroke_dash.offset));\r
+           }\r
+           out("            strokeDashArray: [ ");\r
+           for(int i = 0; i < style->stroke_dash.n_dash; i++ ) {\r
+               if(i > 0) {\r
+                   out(", %.2lf", style->stroke_dash.dash[i]);\r
+               }else {\r
+                   out(" %.2lf", style->stroke_dash.dash[i]);\r
+               }\r
+           }\r
+           out(" ]\n");\r
+        }\r
+\r
         }\r
 \r
     return true;\r
 }\r
 \r
 \r
+#if 1\r
+\r
+/**\r
+ *  Output the curve data to buffer\r
+ */\r
+bool JavaFXOutput::doCurve(SPItem *item, const String &id)\r
+{\r
+    using Geom::X;\r
+    using Geom::Y;\r
+\r
+    //### Get the Shape\r
+    if (!SP_IS_SHAPE(item))//Bulia's suggestion.  Allow all shapes\r
+        return true;\r
+\r
+    SPShape *shape = SP_SHAPE(item);\r
+    SPCurve *curve = shape->curve;\r
+    if (curve->is_empty())\r
+        return true;\r
+\r
+    nrShapes++;\r
+\r
+    out("    /** path %s */\n", id.c_str());\r
+    out("    private function %s() : Path {\n",id.c_str());\r
+    out("        Path {\n");\r
+    out("            id: \"%s\"\n", id.c_str());\r
+\r
+    /**\r
+     * Output the style information\r
+     */\r
+    if (!doStyle(SP_OBJECT_STYLE(shape)))\r
+        return false;\r
+\r
+    // convert the path to only lineto's and cubic curveto's:\r
+    Geom::Scale yflip(1.0, -1.0);\r
+    Geom::Matrix tf = sp_item_i2d_affine(item) * yflip;\r
+    Geom::PathVector pathv = pathv_to_linear_and_cubic_beziers( curve->get_pathvector() * tf );\r
+\r
+    //Count the NR_CURVETOs/LINETOs (including closing line segment)\r
+    guint segmentCount = 0;\r
+    for(Geom::PathVector::const_iterator it = pathv.begin(); it != pathv.end(); ++it) {\r
+        segmentCount += (*it).size();\r
+        if (it->closed())\r
+            segmentCount += 1;\r
+    }\r
+\r
+    out("            elements: [\n");\r
 \r
+    unsigned int segmentNr = 0;\r
+\r
+    nrNodes += segmentCount;\r
+\r
+    Geom::Rect cminmax( pathv.front().initialPoint(), pathv.front().initialPoint() );\r
+\r
+    /**\r
+     * For all Subpaths in the <path>\r
+     */\r
+    for (Geom::PathVector::const_iterator pit = pathv.begin(); pit != pathv.end(); ++pit)\r
+        {\r
+        Geom::Point p = pit->front().initialPoint();\r
+        cminmax.expandTo(p);\r
+        out("                MoveTo {\n");\r
+        out("                    x: %s\n", DSTR(p[X]));\r
+        out("                    y: %s\n", DSTR(p[Y]));\r
+        out("                },\n");\r
+\r
+        /**\r
+         * For all segments in the subpath\r
+         */\r
+        for (Geom::Path::const_iterator cit = pit->begin(); cit != pit->end_closed(); ++cit)\r
+            {\r
+            //### LINE\r
+            if( dynamic_cast<Geom::LineSegment const *> (&*cit) ||\r
+                dynamic_cast<Geom::HLineSegment const *>(&*cit) ||\r
+                dynamic_cast<Geom::VLineSegment const *>(&*cit) )\r
+                {\r
+                Geom::Point p = cit->finalPoint();\r
+                out("                LineTo {\n");\r
+                out("                    x: %s\n", DSTR(p[X]));\r
+                out("                    y: %s\n", DSTR(p[Y]));\r
+                out("                },\n");\r
+                nrNodes++;\r
+                }\r
+            //### BEZIER\r
+            else if(Geom::CubicBezier const *cubic = dynamic_cast<Geom::CubicBezier const*>(&*cit))\r
+                {\r
+                std::vector<Geom::Point> points = cubic->points();\r
+                Geom::Point p1 = points[1];\r
+                Geom::Point p2 = points[2];\r
+                Geom::Point p3 = points[3];\r
+                out("                CurveTo {\n");\r
+                out("                    controlX1: %s\n", DSTR(p1[X]));\r
+                out("                    controlY1: %s\n", DSTR(p1[Y]));\r
+                out("                    controlX2: %s\n", DSTR(p2[X]));\r
+                out("                    controlY2: %s\n", DSTR(p2[Y]));\r
+                out("                    x: %s\n", DSTR(p3[X]));\r
+                out("                    y: %s\n", DSTR(p3[Y]));\r
+                out("                },\n");\r
+                nrNodes++;\r
+                }\r
+            else\r
+                {\r
+                g_error ("logical error, because pathv_to_linear_and_cubic_beziers was used");\r
+                }\r
+            segmentNr++;\r
+            cminmax.expandTo(cit->finalPoint());\r
+            }\r
+        if (pit->closed())\r
+            {\r
+            out("                ClosePath {},\n");\r
+            }\r
+        }\r
+\r
+    out("            ] // elements\n");\r
+    out("        }; // Path\n");\r
+    out("    } // end path %s\n\n", id.c_str());\r
+\r
+    double cminx = cminmax.min()[X];\r
+    double cmaxx = cminmax.max()[X];\r
+    double cminy = cminmax.min()[Y];\r
+    double cmaxy = cminmax.max()[Y];\r
+\r
+    if (cminx < minx)\r
+        minx = cminx;\r
+    if (cmaxx > maxx)\r
+        maxx = cmaxx;\r
+    if (cminy < miny)\r
+        miny = cminy;\r
+    if (cmaxy > maxy)\r
+        maxy = cmaxy;\r
+\r
+    return true;\r
+}\r
+\r
+\r
+\r
+#else\r
 \r
 /**\r
  *  Output the curve data to buffer\r
@@ -479,6 +659,11 @@ bool JavaFXOutput::doCurve(SPItem *item, const String &id)
 }\r
 \r
 \r
+\r
+#endif  /* #if o */\r
+\r
+\r
+\r
 /**\r
  *  Output the tree data to buffer\r
  */\r
@@ -544,6 +729,51 @@ bool JavaFXOutput::doTree(SPDocument *doc)
 }\r
 \r
 \r
+bool JavaFXOutput::doBody(SPDocument *doc, SPObject *obj) {\r
+    /**\r
+     * Check the type of node and process\r
+     */\r
+    String id;\r
+    if (!obj->id)\r
+        {\r
+        char buf[16];\r
+        sprintf(buf, "id%d", idindex++);\r
+        id = buf;\r
+        }\r
+    else\r
+        {\r
+        id = obj->id;\r
+        }\r
+\r
+    if (SP_IS_ITEM(obj)) {\r
+        SPItem *item = SP_ITEM(obj);\r
+        //### Get the Shape\r
+        if (SP_IS_SHAPE(item)) {//Bulia's suggestion.  Allow all shapes\r
+            SPShape *shape = SP_SHAPE(item);\r
+            SPCurve *curve = shape->curve;\r
+            if (!curve->is_empty())\r
+                out("               %s(),\n", id.c_str());\r
+        }\r
+    }\r
+    else if (SP_IS_GRADIENT(obj)) {\r
+        //TODO: what to do with Gradient within body?????\r
+        //SPGradient *grad = SP_GRADIENT(reprobj);\r
+        //if (!doGradient(grad, id))\r
+        //    return false;\r
+    }\r
+\r
+    /**\r
+     * Descend into children\r
+     */\r
+    for (SPObject *child = obj->firstChild() ; child ; child = child->next)\r
+        {\r
+               if (!doBody(doc, child))\r
+                   return false;\r
+               }\r
+\r
+    return true;\r
+}\r
+\r
 \r
 \r
 //########################################################################\r
@@ -581,9 +811,9 @@ bool JavaFXOutput::saveDocument(SPDocument *doc, gchar const *uri)
         name = name.substr(0, pos);\r
 \r
 \r
-    //###### SAVE IN POV FORMAT TO BUFFER\r
+    //###### SAVE IN JAVAFX FORMAT TO BUFFER\r
     //# Lets do the curves first, to get the stats\r
-    \r
+\r
     if (!doTree(doc))\r
         return false;\r
     String curveBuf = outbuf;\r
@@ -591,15 +821,25 @@ bool JavaFXOutput::saveDocument(SPDocument *doc, gchar const *uri)
 \r
     if (!doHeader())\r
         return false;\r
-    \r
+\r
     outbuf.append(curveBuf);\r
 \r
+#ifdef JAVAFX_SDK_1_0\r
+    out("   override function create(): Node {\n");\r
+#else\r
+    out("   public function create(): Node {\n");\r
+#endif\r
+    out("       Group {\n");\r
+    out("           content: [\n");\r
+    idindex    = 0;\r
+\r
+    doBody(doc, doc->root);\r
+\r
     if (!doTail())\r
         return false;\r
 \r
 \r
 \r
-\r
     //###### WRITE TO FILE\r
     FILE *f = Inkscape::IO::fopen_utf8name(uri, "w");\r
     if (!f)\r

diff --git a/src/extension/internal/javafx-out.h b/src/extension/internal/javafx-out.h
index c82dfa0df8784d6ec8d7401396dfaabf8aa0b709..b3552097f5b5408d5455bb31ee99d9571b91e62e 100644 (file)
--- a/src/extension/internal/javafx-out.h
+++ b/src/extension/internal/javafx-out.h
@@ -1,9 +1,11 @@
 /*\r
  * A simple utility for exporting an Inkscape svg image as a JavaFX\r
  * scene tree.\r
-\ *\r
+ *\r
  * Authors:\r
  *   Bob Jamison <ishmal@inkscape.org>\r
+ *   Silveira Neto <silveiraneto@gmail.com>\r
+ *   Jim Clarke <Jim.Clarke@sun.com>\r
  *\r
  * Copyright (C) 2008 Authors\r
  *\r
@@ -104,12 +106,14 @@ private:
     bool doStyle(SPStyle *style);\r
 \r
     /**\r
-     * Output the SVG document's curve data as POV curves\r
+     * Output the SVG document's curve data as JavaFX geometry types\r
      */\r
     bool doCurve(SPItem *item, const String &id);\r
     bool doTreeRecursive(SPDocument *doc, SPObject *obj);\r
     bool doTree(SPDocument *doc);\r
 \r
+    bool doBody(SPDocument *doc, SPObject *obj);\r
+\r
     /**\r
      * Output the file footer\r
      */\r