Code

NR:: to Geom:: for most of src/extension/
[inkscape.git] / src / extension / internal / odf.cpp
index ff2946af0edc93837b4e5168176b49170184d917..01690628964480c352f800d5e9c811d49831bd6a 100644 (file)
@@ -5,14 +5,17 @@
  * the inputting and outputting of OpenDocument Format (ODF) files from
  * within Inkscape.  Although the initial implementations will be very lossy
  * do to the differences in the models of SVG and ODF, they will hopefully
- * improve greatly with time.
+ * improve greatly with time.  People should consider this to be a framework
+ * that can be continously upgraded for ever improving fidelity.  Potential
+ * developers should especially look in preprocess() and writeTree() to see how
+ * the SVG tree is scanned, read, translated, and then written to ODF.
  *
  * http://www.w3.org/TR/2004/REC-DOM-Level-3-Core-20040407/idl-definitions.html
  *
  * Authors:
  *   Bob Jamison
  *
- * Copyright (C) 2006 Bob Jamison
+ * Copyright (C) 2006, 2007 Bob Jamison
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
 #include "inkscape.h"
 #include <style.h>
 #include "display/curve.h"
-#include "libnr/n-art-bpath.h"
+#include <2geom/pathvector.h>
+#include <2geom/bezier-curve.h>
+#include <2geom/hvlinesegment.h>
+#include <2geom/transforms.h>
+#include <helper/geom.h>
+#include "helper/geom-curves.h"
 #include "extension/system.h"
 
 #include "xml/repr.h"
 #include "xml/attribute-record.h"
 #include "sp-image.h"
+#include "sp-gradient.h"
+#include "sp-stop.h"
+#include "gradient-chemistry.h"
+#include "sp-linear-gradient.h"
+#include "sp-radial-gradient.h"
 #include "sp-path.h"
 #include "sp-text.h"
 #include "sp-flowtext.h"
 #include "dom/util/ziptool.h"
 #include "dom/io/domstream.h"
 #include "dom/io/bufferstream.h"
+#include "dom/io/stringstream.h"
+
+
+
+
+
+
+namespace Inkscape
+{
+namespace Extension
+{
+namespace Internal
+{
+
 
 
 //# Shorthand notation
 typedef org::w3c::dom::DOMString DOMString;
+typedef org::w3c::dom::XMLCh XMLCh;
 typedef org::w3c::dom::io::OutputStreamWriter OutputStreamWriter;
 typedef org::w3c::dom::io::BufferOutputStream BufferOutputStream;
+typedef org::w3c::dom::io::StringOutputStream StringOutputStream;
 
+//########################################################################
+//# C L A S S    SingularValueDecomposition
+//########################################################################
+#include <math.h>
 
+class SVDMatrix
+{
+public:
 
+    SVDMatrix()
+        {
+        init();
+        }
 
-namespace Inkscape
+    SVDMatrix(unsigned int rowSize, unsigned int colSize)
+        {
+        init();
+        rows = rowSize;
+        cols = colSize;
+        size = rows * cols;
+        d    = new double[size];
+        for (unsigned int i=0 ; i<size ; i++)
+            d[i] = 0.0;
+        }
+
+    SVDMatrix(double *vals, unsigned int rowSize, unsigned int colSize)
+        {
+        init();
+        rows = rowSize;
+        cols = colSize;
+        size = rows * cols;
+        d    = new double[size];
+        for (unsigned int i=0 ; i<size ; i++)
+            d[i] = vals[i];
+        }
+
+
+    SVDMatrix(const SVDMatrix &other)
+        {
+        init();
+        assign(other);
+        }
+
+    SVDMatrix &operator=(const SVDMatrix &other)
+        {
+        assign(other);
+        return *this;
+        }
+
+    virtual ~SVDMatrix()
+        {
+        delete[] d;
+        }
+
+     double& operator() (unsigned int row, unsigned int col)
+         {
+         if (row >= rows || col >= cols)
+             return badval;
+         return d[cols*row + col];
+         }
+
+     double operator() (unsigned int row, unsigned int col) const
+         {
+         if (row >= rows || col >= cols)
+             return badval;
+         return d[cols*row + col];
+         }
+
+     unsigned int getRows()
+         {
+         return rows;
+         }
+
+     unsigned int getCols()
+         {
+         return cols;
+         }
+
+     SVDMatrix multiply(const SVDMatrix &other)
+         {
+         if (cols != other.rows)
+             {
+             SVDMatrix dummy;
+             return dummy;
+             }
+         SVDMatrix result(rows, other.cols);
+         for (unsigned int i=0 ; i<rows ; i++)
+             {
+             for (unsigned int j=0 ; j<other.cols ; j++)
+             {
+                 double sum = 0.0;
+                 for (unsigned int k=0 ; k<cols ; k++)
+                     {
+                     //sum += a[i][k] * b[k][j];
+                     sum += d[i*cols +k] * other(k, j);
+                     }
+                 result(i, j) = sum;
+                 }
+
+             }
+         return result;
+         }
+
+     SVDMatrix transpose()
+         {
+         SVDMatrix result(cols, rows);
+         for (unsigned int i=0 ; i<rows ; i++)
+             for (unsigned int j=0 ; j<cols ; j++)
+                 result(j, i) = d[i*cols + j];
+         return result;
+         }
+
+private:
+
+
+    virtual void init()
+        {
+        badval = 0.0;
+        d      = NULL;
+        rows   = 0;
+        cols   = 0;
+        size   = 0;
+        }
+
+     void assign(const SVDMatrix &other)
+        {
+        if (d)
+            {
+            delete[] d;
+            d = 0;
+            }
+        rows = other.rows;
+        cols = other.cols;
+        size = other.size;
+        d = new double[size];
+        for (unsigned int i=0 ; i<size ; i++)
+            d[i] = other.d[i];
+        }
+
+    double badval;
+
+    double *d;
+    unsigned int rows;
+    unsigned int cols;
+    unsigned int size;
+};
+
+
+
+/**
+ *
+ * ====================================================
+ *
+ * NOTE:
+ * This class is ported almost verbatim from the public domain
+ * JAMA Matrix package.  It is modified to handle only 3x3 matrices
+ * and our Geom::Matrix affine transform class.  We give full
+ * attribution to them, along with many thanks.  JAMA can be found at:
+ *     http://math.nist.gov/javanumerics/jama
+ *
+ * ====================================================
+ *
+ * Singular Value Decomposition.
+ * <P>
+ * For an m-by-n matrix A with m >= n, the singular value decomposition is
+ * an m-by-n orthogonal matrix U, an n-by-n diagonal matrix S, and
+ * an n-by-n orthogonal matrix V so that A = U*S*V'.
+ * <P>
+ * The singular values, sigma[k] = S[k][k], are ordered so that
+ * sigma[0] >= sigma[1] >= ... >= sigma[n-1].
+ * <P>
+ * The singular value decompostion always exists, so the constructor will
+ * never fail.  The matrix condition number and the effective numerical
+ * rank can be computed from this decomposition.
+ */
+class SingularValueDecomposition
 {
-namespace Extension
+public:
+
+   /** Construct the singular value decomposition
+   @param A    Rectangular matrix
+   @return     Structure to access U, S and V.
+   */
+
+    SingularValueDecomposition (const SVDMatrix &mat)
+        {
+        A      = mat;
+        s      = NULL;
+        s_size = 0;
+        calculate();
+        }
+
+    virtual ~SingularValueDecomposition()
+        {
+        delete[] s;
+        }
+
+    /**
+     * Return the left singular vectors
+     * @return     U
+     */
+    SVDMatrix &getU();
+
+    /**
+     * Return the right singular vectors
+     * @return     V
+     */
+    SVDMatrix &getV();
+
+    /**
+     *  Return the s[index] value
+     */    double getS(unsigned int index);
+
+    /**
+     * Two norm
+     * @return max(S)
+     */
+    double norm2();
+
+    /**
+     * Two norm condition number
+     *  @return max(S)/min(S)
+     */
+    double cond();
+
+    /**
+     *  Effective numerical matrix rank
+     *  @return     Number of nonnegligible singular values.
+     */
+    int rank();
+
+private:
+
+      void calculate();
+
+      SVDMatrix A;
+      SVDMatrix U;
+      double *s;
+      unsigned int s_size;
+      SVDMatrix V;
+
+};
+
+
+static double svd_hypot(double a, double b)
 {
-namespace Internal
+    double r;
+
+    if (fabs(a) > fabs(b))
+        {
+        r = b/a;
+        r = fabs(a) * sqrt(1+r*r);
+        }
+    else if (b != 0)
+        {
+        r = a/b;
+        r = fabs(b) * sqrt(1+r*r);
+        }
+    else
+        {
+        r = 0.0;
+        }
+    return r;
+}
+
+
+
+void SingularValueDecomposition::calculate()
 {
+      // Initialize.
+      int m = A.getRows();
+      int n = A.getCols();
+
+      int nu = (m > n) ? m : n;
+      s_size = (m+1 < n) ? m+1 : n;
+      s = new double[s_size];
+      U = SVDMatrix(m, nu);
+      V = SVDMatrix(n, n);
+      double *e = new double[n];
+      double *work = new double[m];
+      bool wantu = true;
+      bool wantv = true;
+
+      // Reduce A to bidiagonal form, storing the diagonal elements
+      // in s and the super-diagonal elements in e.
+
+      int nct = (m-1<n) ? m-1 : n;
+      int nrtx = (n-2<m) ? n-2 : m;
+      int nrt = (nrtx>0) ? nrtx : 0;
+      for (int k = 0; k < 2; k++) {
+         if (k < nct) {
+
+            // Compute the transformation for the k-th column and
+            // place the k-th diagonal in s[k].
+            // Compute 2-norm of k-th column without under/overflow.
+            s[k] = 0;
+            for (int i = k; i < m; i++) {
+               s[k] = svd_hypot(s[k],A(i, k));
+            }
+            if (s[k] != 0.0) {
+               if (A(k, k) < 0.0) {
+                  s[k] = -s[k];
+               }
+               for (int i = k; i < m; i++) {
+                  A(i, k) /= s[k];
+               }
+               A(k, k) += 1.0;
+            }
+            s[k] = -s[k];
+         }
+         for (int j = k+1; j < n; j++) {
+            if ((k < nct) & (s[k] != 0.0))  {
+
+            // Apply the transformation.
+
+               double t = 0;
+               for (int i = k; i < m; i++) {
+                  t += A(i, k) * A(i, j);
+               }
+               t = -t/A(k, k);
+               for (int i = k; i < m; i++) {
+                  A(i, j) += t*A(i, k);
+               }
+            }
+
+            // Place the k-th row of A into e for the
+            // subsequent calculation of the row transformation.
 
+            e[j] = A(k, j);
+         }
+         if (wantu & (k < nct)) {
 
+            // Place the transformation in U for subsequent back
+            // multiplication.
+
+            for (int i = k; i < m; i++) {
+               U(i, k) = A(i, k);
+            }
+         }
+         if (k < nrt) {
+
+            // Compute the k-th row transformation and place the
+            // k-th super-diagonal in e[k].
+            // Compute 2-norm without under/overflow.
+            e[k] = 0;
+            for (int i = k+1; i < n; i++) {
+               e[k] = svd_hypot(e[k],e[i]);
+            }
+            if (e[k] != 0.0) {
+               if (e[k+1] < 0.0) {
+                  e[k] = -e[k];
+               }
+               for (int i = k+1; i < n; i++) {
+                  e[i] /= e[k];
+               }
+               e[k+1] += 1.0;
+            }
+            e[k] = -e[k];
+            if ((k+1 < m) & (e[k] != 0.0)) {
+
+            // Apply the transformation.
+
+               for (int i = k+1; i < m; i++) {
+                  work[i] = 0.0;
+               }
+               for (int j = k+1; j < n; j++) {
+                  for (int i = k+1; i < m; i++) {
+                     work[i] += e[j]*A(i, j);
+                  }
+               }
+               for (int j = k+1; j < n; j++) {
+                  double t = -e[j]/e[k+1];
+                  for (int i = k+1; i < m; i++) {
+                     A(i, j) += t*work[i];
+                  }
+               }
+            }
+            if (wantv) {
+
+            // Place the transformation in V for subsequent
+            // back multiplication.
+
+               for (int i = k+1; i < n; i++) {
+                  V(i, k) = e[i];
+               }
+            }
+         }
+      }
+
+      // Set up the final bidiagonal matrix or order p.
+
+      int p = (n < m+1) ? n : m+1;
+      if (nct < n) {
+         s[nct] = A(nct, nct);
+      }
+      if (m < p) {
+         s[p-1] = 0.0;
+      }
+      if (nrt+1 < p) {
+         e[nrt] = A(nrt, p-1);
+      }
+      e[p-1] = 0.0;
+
+      // If required, generate U.
+
+      if (wantu) {
+         for (int j = nct; j < nu; j++) {
+            for (int i = 0; i < m; i++) {
+               U(i, j) = 0.0;
+            }
+            U(j, j) = 1.0;
+         }
+         for (int k = nct-1; k >= 0; k--) {
+            if (s[k] != 0.0) {
+               for (int j = k+1; j < nu; j++) {
+                  double t = 0;
+                  for (int i = k; i < m; i++) {
+                     t += U(i, k)*U(i, j);
+                  }
+                  t = -t/U(k, k);
+                  for (int i = k; i < m; i++) {
+                     U(i, j) += t*U(i, k);
+                  }
+               }
+               for (int i = k; i < m; i++ ) {
+                  U(i, k) = -U(i, k);
+               }
+               U(k, k) = 1.0 + U(k, k);
+               for (int i = 0; i < k-1; i++) {
+                  U(i, k) = 0.0;
+               }
+            } else {
+               for (int i = 0; i < m; i++) {
+                  U(i, k) = 0.0;
+               }
+               U(k, k) = 1.0;
+            }
+         }
+      }
+
+      // If required, generate V.
+
+      if (wantv) {
+         for (int k = n-1; k >= 0; k--) {
+            if ((k < nrt) & (e[k] != 0.0)) {
+               for (int j = k+1; j < nu; j++) {
+                  double t = 0;
+                  for (int i = k+1; i < n; i++) {
+                     t += V(i, k)*V(i, j);
+                  }
+                  t = -t/V(k+1, k);
+                  for (int i = k+1; i < n; i++) {
+                     V(i, j) += t*V(i, k);
+                  }
+               }
+            }
+            for (int i = 0; i < n; i++) {
+               V(i, k) = 0.0;
+            }
+            V(k, k) = 1.0;
+         }
+      }
+
+      // Main iteration loop for the singular values.
+
+      int pp = p-1;
+      int iter = 0;
+      //double eps = pow(2.0,-52.0);
+      //double tiny = pow(2.0,-966.0);
+      //let's just calculate these now
+      //a double can be e ± 308.25, so this is safe
+      double eps = 2.22e-16;
+      double tiny = 1.6e-291;
+      while (p > 0) {
+         int k,kase;
+
+         // Here is where a test for too many iterations would go.
+
+         // This section of the program inspects for
+         // negligible elements in the s and e arrays.  On
+         // completion the variables kase and k are set as follows.
+
+         // kase = 1     if s(p) and e[k-1] are negligible and k<p
+         // kase = 2     if s(k) is negligible and k<p
+         // kase = 3     if e[k-1] is negligible, k<p, and
+         //              s(k), ..., s(p) are not negligible (qr step).
+         // kase = 4     if e(p-1) is negligible (convergence).
+
+         for (k = p-2; k >= -1; k--) {
+            if (k == -1) {
+               break;
+            }
+            if (fabs(e[k]) <=
+                  tiny + eps*(fabs(s[k]) + fabs(s[k+1]))) {
+               e[k] = 0.0;
+               break;
+            }
+         }
+         if (k == p-2) {
+            kase = 4;
+         } else {
+            int ks;
+            for (ks = p-1; ks >= k; ks--) {
+               if (ks == k) {
+                  break;
+               }
+               double t = (ks != p ? fabs(e[ks]) : 0.) +
+                          (ks != k+1 ? fabs(e[ks-1]) : 0.);
+               if (fabs(s[ks]) <= tiny + eps*t)  {
+                  s[ks] = 0.0;
+                  break;
+               }
+            }
+            if (ks == k) {
+               kase = 3;
+            } else if (ks == p-1) {
+               kase = 1;
+            } else {
+               kase = 2;
+               k = ks;
+            }
+         }
+         k++;
+
+         // Perform the task indicated by kase.
+
+         switch (kase) {
+
+            // Deflate negligible s(p).
+
+            case 1: {
+               double f = e[p-2];
+               e[p-2] = 0.0;
+               for (int j = p-2; j >= k; j--) {
+                  double t = svd_hypot(s[j],f);
+                  double cs = s[j]/t;
+                  double sn = f/t;
+                  s[j] = t;
+                  if (j != k) {
+                     f = -sn*e[j-1];
+                     e[j-1] = cs*e[j-1];
+                  }
+                  if (wantv) {
+                     for (int i = 0; i < n; i++) {
+                        t = cs*V(i, j) + sn*V(i, p-1);
+                        V(i, p-1) = -sn*V(i, j) + cs*V(i, p-1);
+                        V(i, j) = t;
+                     }
+                  }
+               }
+            }
+            break;
+
+            // Split at negligible s(k).
+
+            case 2: {
+               double f = e[k-1];
+               e[k-1] = 0.0;
+               for (int j = k; j < p; j++) {
+                  double t = svd_hypot(s[j],f);
+                  double cs = s[j]/t;
+                  double sn = f/t;
+                  s[j] = t;
+                  f = -sn*e[j];
+                  e[j] = cs*e[j];
+                  if (wantu) {
+                     for (int i = 0; i < m; i++) {
+                        t = cs*U(i, j) + sn*U(i, k-1);
+                        U(i, k-1) = -sn*U(i, j) + cs*U(i, k-1);
+                        U(i, j) = t;
+                     }
+                  }
+               }
+            }
+            break;
+
+            // Perform one qr step.
+
+            case 3: {
+
+               // Calculate the shift.
+
+               double scale = fabs(s[p-1]);
+               double d = fabs(s[p-2]);
+               if (d>scale) scale=d;
+               d = fabs(e[p-2]);
+               if (d>scale) scale=d;
+               d = fabs(s[k]);
+               if (d>scale) scale=d;
+               d = fabs(e[k]);
+               if (d>scale) scale=d;
+               double sp = s[p-1]/scale;
+               double spm1 = s[p-2]/scale;
+               double epm1 = e[p-2]/scale;
+               double sk = s[k]/scale;
+               double ek = e[k]/scale;
+               double b = ((spm1 + sp)*(spm1 - sp) + epm1*epm1)/2.0;
+               double c = (sp*epm1)*(sp*epm1);
+               double shift = 0.0;
+               if ((b != 0.0) | (c != 0.0)) {
+                  shift = sqrt(b*b + c);
+                  if (b < 0.0) {
+                     shift = -shift;
+                  }
+                  shift = c/(b + shift);
+               }
+               double f = (sk + sp)*(sk - sp) + shift;
+               double g = sk*ek;
+
+               // Chase zeros.
+
+               for (int j = k; j < p-1; j++) {
+                  double t = svd_hypot(f,g);
+                  double cs = f/t;
+                  double sn = g/t;
+                  if (j != k) {
+                     e[j-1] = t;
+                  }
+                  f = cs*s[j] + sn*e[j];
+                  e[j] = cs*e[j] - sn*s[j];
+                  g = sn*s[j+1];
+                  s[j+1] = cs*s[j+1];
+                  if (wantv) {
+                     for (int i = 0; i < n; i++) {
+                        t = cs*V(i, j) + sn*V(i, j+1);
+                        V(i, j+1) = -sn*V(i, j) + cs*V(i, j+1);
+                        V(i, j) = t;
+                     }
+                  }
+                  t = svd_hypot(f,g);
+                  cs = f/t;
+                  sn = g/t;
+                  s[j] = t;
+                  f = cs*e[j] + sn*s[j+1];
+                  s[j+1] = -sn*e[j] + cs*s[j+1];
+                  g = sn*e[j+1];
+                  e[j+1] = cs*e[j+1];
+                  if (wantu && (j < m-1)) {
+                     for (int i = 0; i < m; i++) {
+                        t = cs*U(i, j) + sn*U(i, j+1);
+                        U(i, j+1) = -sn*U(i, j) + cs*U(i, j+1);
+                        U(i, j) = t;
+                     }
+                  }
+               }
+               e[p-2] = f;
+               iter = iter + 1;
+            }
+            break;
+
+            // Convergence.
+
+            case 4: {
+
+               // Make the singular values positive.
+
+               if (s[k] <= 0.0) {
+                  s[k] = (s[k] < 0.0 ? -s[k] : 0.0);
+                  if (wantv) {
+                     for (int i = 0; i <= pp; i++) {
+                        V(i, k) = -V(i, k);
+                     }
+                  }
+               }
+
+               // Order the singular values.
+
+               while (k < pp) {
+                  if (s[k] >= s[k+1]) {
+                     break;
+                  }
+                  double t = s[k];
+                  s[k] = s[k+1];
+                  s[k+1] = t;
+                  if (wantv && (k < n-1)) {
+                     for (int i = 0; i < n; i++) {
+                        t = V(i, k+1); V(i, k+1) = V(i, k); V(i, k) = t;
+                     }
+                  }
+                  if (wantu && (k < m-1)) {
+                     for (int i = 0; i < m; i++) {
+                        t = U(i, k+1); U(i, k+1) = U(i, k); U(i, k) = t;
+                     }
+                  }
+                  k++;
+               }
+               iter = 0;
+               p--;
+            }
+            break;
+         }
+      }
+
+    delete e;
+    delete work;
+
+}
+
+
+
+/**
+ * Return the left singular vectors
+ * @return     U
+ */
+SVDMatrix &SingularValueDecomposition::getU()
+{
+    return U;
+}
+
+/**
+ * Return the right singular vectors
+ * @return     V
+ */
+
+SVDMatrix &SingularValueDecomposition::getV()
+{
+    return V;
+}
+
+/**
+ *  Return the s[0] value
+ */
+double SingularValueDecomposition::getS(unsigned int index)
+{
+    if (index >= s_size)
+        return 0.0;
+    return s[index];
+}
+
+/**
+ * Two norm
+ * @return     max(S)
+ */
+double SingularValueDecomposition::norm2()
+{
+    return s[0];
+}
+
+/**
+ * Two norm condition number
+ *  @return     max(S)/min(S)
+ */
+
+double SingularValueDecomposition::cond()
+{
+    return s[0]/s[2];
+}
+
+/**
+ *  Effective numerical matrix rank
+ *  @return     Number of nonnegligible singular values.
+ */
+int SingularValueDecomposition::rank()
+{
+    double eps = pow(2.0,-52.0);
+    double tol = 3.0*s[0]*eps;
+    int r = 0;
+    for (int i = 0; i < 3; i++)
+        {
+        if (s[i] > tol)
+            r++;
+        }
+    return r;
+}
+
+//########################################################################
+//# E N D    C L A S S    SingularValueDecomposition
+//########################################################################
+
+
+
+
+
+#define pi 3.14159
 //#define pxToCm  0.0275
-#define pxToCm  0.04
+#define pxToCm  0.03
 #define piToRad 0.0174532925
 #define docHeightCm 22.86
 
@@ -94,21 +886,28 @@ namespace Internal
 //# O U T P U T
 //########################################################################
 
-static std::string getAttribute( Inkscape::XML::Node *node, char *attrName)
+/**
+ * Get the value of a node/attribute pair
+ */
+static Glib::ustring getAttribute( Inkscape::XML::Node *node, char const *attrName)
 {
-    std::string val;
-    char *valstr = (char *)node->attribute(attrName);
+    Glib::ustring val;
+    char const *valstr = node->attribute(attrName);
     if (valstr)
-        val = (const char *)valstr;
+        val = valstr;
     return val;
 }
 
 
-static std::string getExtension(const std::string &fname)
+
+/**
+ * Get the extension suffix from the end of a file name
+ */
+static Glib::ustring getExtension(const Glib::ustring &fname)
 {
-    std::string ext;
+    Glib::ustring ext;
 
-    unsigned int pos = fname.rfind('.');
+    std::string::size_type pos = fname.rfind('.');
     if (pos == fname.npos)
         {
         ext = "";
@@ -121,177 +920,212 @@ static std::string getExtension(const std::string &fname)
 }
 
 
-static std::string formatTransform(NR::Matrix &tf)
+static Glib::ustring formatTransform(Geom::Matrix &tf)
 {
-    std::string str;
-    if (!tf.test_identity())
+    Glib::ustring str;
+    if (!tf.isIdentity())
         {
-        char buf[128];
-        snprintf(buf, 127, "matrix(%.3f %.3f %.3f %.3f %.3f %.3f)",
+        StringOutputStream outs;
+        OutputStreamWriter out(outs);
+        out.printf("matrix(%.3f %.3f %.3f %.3f %.3f %.3f)",
                 tf[0], tf[1], tf[2], tf[3], tf[4], tf[5]);
-        str = buf;
+        str = outs.getString();
         }
     return str;
 }
 
 
+
+
+
+/**
+ * Get the general transform from SVG pixels to
+ * ODF cm
+ */
+static Geom::Matrix getODFTransform(const SPItem *item)
+{
+    //### Get SVG-to-ODF transform
+    Geom::Matrix tf (sp_item_i2d_affine(item));
+    //Flip Y into document coordinates
+    double doc_height    = sp_document_height(SP_ACTIVE_DOCUMENT);
+    Geom::Matrix doc2dt_tf = Geom::Matrix(Geom::Scale(1.0, -1.0));
+    doc2dt_tf            = doc2dt_tf * Geom::Matrix(Geom::Translate(0, doc_height));
+    tf                   = tf * doc2dt_tf;
+    tf                   = tf * Geom::Matrix(Geom::Scale(pxToCm));
+    return tf;
+}
+
+
+
+
+/**
+ * Get the bounding box of an item, as mapped onto
+ * an ODF document, in cm.
+ */
+static boost::optional<Geom::Rect> getODFBoundingBox(const SPItem *item)
+{
+    boost::optional<NR::Rect> bbox_temp = sp_item_bbox_desktop((SPItem *)item);
+    boost::optional<Geom::Rect> bbox;
+    if (bbox_temp) {
+        bbox = to_2geom(*bbox_temp);
+        double doc_height    = sp_document_height(SP_ACTIVE_DOCUMENT);
+        Geom::Matrix doc2dt_tf = Geom::Matrix(Geom::Scale(1.0, -1.0));
+        doc2dt_tf            = doc2dt_tf * Geom::Matrix(Geom::Translate(0, doc_height));
+        bbox                 = *bbox * doc2dt_tf;
+        bbox                 = *bbox * Geom::Matrix(Geom::Scale(pxToCm));
+    }
+    return bbox;
+}
+
+
+
+/**
+ * Get the transform for an item, correcting for
+ * handedness reversal
+ */
+static Geom::Matrix getODFItemTransform(const SPItem *item)
+{
+    Geom::Matrix itemTransform (Geom::Scale(1, -1));
+    itemTransform = itemTransform * (Geom::Matrix)item->transform;
+    itemTransform = itemTransform * Geom::Scale(1, -1);
+    return itemTransform;
+}
+
+
+
 /**
- * Method descends into the repr tree, converting image and style info
+ * Get some fun facts from the transform
+ */
+static void analyzeTransform(Geom::Matrix &tf,
+                             double &rotate, double &/*xskew*/, double &/*yskew*/,
+                             double &xscale, double &yscale)
+{
+    SVDMatrix mat(2, 2);
+    mat(0, 0) = tf[0];
+    mat(0, 1) = tf[1];
+    mat(1, 0) = tf[2];
+    mat(1, 1) = tf[3];
+
+    SingularValueDecomposition svd(mat);
+
+    SVDMatrix U = svd.getU();
+    SVDMatrix V = svd.getV();
+    SVDMatrix Vt = V.transpose();
+    SVDMatrix UVt = U.multiply(Vt);
+    double s0 = svd.getS(0);
+    double s1 = svd.getS(1);
+    xscale = s0;
+    yscale = s1;
+    //g_message("## s0:%.3f s1:%.3f", s0, s1);
+    //g_message("## u:%.3f %.3f %.3f %.3f", U(0,0), U(0,1), U(1,0), U(1,1));
+    //g_message("## v:%.3f %.3f %.3f %.3f", V(0,0), V(0,1), V(1,0), V(1,1));
+    //g_message("## vt:%.3f %.3f %.3f %.3f", Vt(0,0), Vt(0,1), Vt(1,0), Vt(1,1));
+    //g_message("## uvt:%.3f %.3f %.3f %.3f", UVt(0,0), UVt(0,1), UVt(1,0), UVt(1,1));
+    rotate = UVt(0,0);
+}
+
+
+
+static void gatherText(Inkscape::XML::Node *node, Glib::ustring &buf)
+{
+    if (node->type() == Inkscape::XML::TEXT_NODE)
+        {
+        char *s = (char *)node->content();
+        if (s)
+            buf.append(s);
+        }
+
+    for (Inkscape::XML::Node *child = node->firstChild() ;
+                child != NULL; child = child->next())
+        {
+        gatherText(child, buf);
+        }
+
+}
+
+/**
+ * FIRST PASS.
+ * Method descends into the repr tree, converting image, style, and gradient info
  * into forms compatible in ODF.
  */
 void
 OdfOutput::preprocess(ZipFile &zf, Inkscape::XML::Node *node)
 {
 
-    std::string nodeName = node->name();
-    std::string id       = getAttribute(node, "id");
+    Glib::ustring nodeName = node->name();
+    Glib::ustring id       = getAttribute(node, "id");
+
+    //### First, check for metadata
+    if (nodeName == "metadata" || nodeName == "svg:metadata")
+        {
+        Inkscape::XML::Node *mchild = node->firstChild() ;
+        if (!mchild || strcmp(mchild->name(), "rdf:RDF"))
+            return;
+        Inkscape::XML::Node *rchild = mchild->firstChild() ;
+        if (!rchild || strcmp(rchild->name(), "cc:Work"))
+            return;
+        for (Inkscape::XML::Node *cchild = rchild->firstChild() ;
+            cchild ; cchild = cchild->next())
+            {
+            Glib::ustring ccName = cchild->name();
+            Glib::ustring ccVal;
+            gatherText(cchild, ccVal);
+            //g_message("ccName: %s  ccVal:%s", ccName.c_str(), ccVal.c_str());
+            metadata[ccName] = ccVal;
+            }
+        return;
+        }
+
+    //Now consider items.
+    SPObject *reprobj = SP_ACTIVE_DOCUMENT->getObjectByRepr(node);
+    if (!reprobj)
+        return;
+    if (!SP_IS_ITEM(reprobj))
+        {
+        return;
+        }
+    SPItem *item  = SP_ITEM(reprobj);
+    //### Get SVG-to-ODF transform
+    Geom::Matrix tf = getODFTransform(item);
 
     if (nodeName == "image" || nodeName == "svg:image")
         {
         //g_message("image");
-        std::string href = getAttribute(node, "xlink:href");
+        Glib::ustring href = getAttribute(node, "xlink:href");
         if (href.size() > 0)
             {
-            std::string oldName = href;
-            std::string ext = getExtension(oldName);
+            Glib::ustring oldName = href;
+            Glib::ustring ext = getExtension(oldName);
             if (ext == ".jpeg")
                 ext = ".jpg";
             if (imageTable.find(oldName) == imageTable.end())
                 {
                 char buf[64];
-                snprintf(buf, 63, "Pictures/image%d%s",
-                    imageTable.size(), ext.c_str());
-                std::string newName = buf;
+                snprintf(buf, sizeof(buf), "Pictures/image%u%s",
+                         static_cast<unsigned int>(imageTable.size()), ext.c_str());
+                Glib::ustring newName = buf;
                 imageTable[oldName] = newName;
-                std::string comment = "old name was: ";
+                Glib::ustring comment = "old name was: ";
                 comment.append(oldName);
-                ZipEntry *ze = zf.addFile(oldName, comment);
+                URI oldUri(oldName);
+                //g_message("oldpath:%s", oldUri.getNativePath().c_str());
+                //# if relative to the documentURI, get proper path
+                URI resUri = documentUri.resolve(oldUri);
+                DOMString pathName = resUri.getNativePath();
+                //g_message("native path:%s", pathName.c_str());
+                ZipEntry *ze = zf.addFile(pathName, comment);
                 if (ze)
                     {
                     ze->setFileName(newName);
                     }
                 else
                     {
-                    g_warning("Could not load image file '%s'", oldName.c_str());
+                    g_warning("Could not load image file '%s'", pathName.c_str());
                     }
                 }
             }
         }
 
-
-
-    SPObject *reprobj = SP_ACTIVE_DOCUMENT->getObjectByRepr(node);
-    if (!reprobj)
-        return;
-    if (!SP_IS_ITEM(reprobj))
-        {
-        return;
-        }
-    SPItem *item = SP_ITEM(reprobj);
-    SPStyle *style = SP_OBJECT_STYLE(item);
-    if (style && id.size()>0)
-        {
-        StyleInfo si;
-        if (style->fill.type == SP_PAINT_TYPE_COLOR)
-            {
-            guint32 fillCol =
-                sp_color_get_rgba32_ualpha(&style->fill.value.color, 0);
-            char buf[16];
-            int r = (fillCol >> 24) & 0xff;
-            int g = (fillCol >> 16) & 0xff;
-            int b = (fillCol >>  8) & 0xff;
-            //g_message("## %s %lx", id.c_str(), (unsigned int)fillCol);
-            snprintf(buf, 15, "#%02x%02x%02x", r, g, b);
-            si.fillColor = buf;
-            si.fill      = "solid";
-            double opacityPercent = 100.0;
-            snprintf(buf, 15, "%.2f%%", opacityPercent);
-            si.fillOpacity = buf;
-            }
-        if (style->stroke.type == SP_PAINT_TYPE_COLOR)
-            {
-            guint32 strokeCol =
-                sp_color_get_rgba32_ualpha(&style->stroke.value.color, 0);
-            char buf[16];
-            int r = (strokeCol >> 24) & 0xff;
-            int g = (strokeCol >> 16) & 0xff;
-            int b = (strokeCol >>  8) & 0xff;
-            snprintf(buf, 15, "#%02x%02x%02x", r, g, b);
-            si.strokeColor = buf;
-            snprintf(buf, 15, "%.2fpt", style->stroke_width.value);
-            si.strokeWidth = buf;
-            si.stroke      = "solid";
-            double opacityPercent = 100.0;
-            snprintf(buf, 15, "%.2f%%", opacityPercent);
-            si.strokeOpacity = buf;
-            }
-
-        //Look for existing identical style;
-        bool styleMatch = false;
-        std::map<std::string, StyleInfo>::iterator iter;
-        for (iter=styleTable.begin() ; iter!=styleTable.end() ; iter++)
-            {
-            if (si.equals(iter->second))
-                {
-                //map to existing styleTable entry
-                std::string styleName = iter->first;
-                //g_message("found duplicate style:%s", styleName.c_str());
-                styleLookupTable[id] = styleName;
-                styleMatch = true;
-                break;
-                }
-            }
-        //None found, make a new pair or entries
-        if (!styleMatch)
-            {
-            char buf[16];
-            snprintf(buf, 15, "style%d", styleTable.size());
-            std::string styleName = buf;
-            styleTable[styleName] = si;
-            styleLookupTable[id] = styleName;
-            }
-        }
-
-    /*
-    //Look for style values in the svg element
-    Inkscape::Util::List<Inkscape::XML::AttributeRecord const> attr =
-        node->attributeList();
-    for ( ; attr ; ++attr)
-        {
-        if (!attr->key || !attr->value)
-            {
-            g_warning("null key or value in attribute");
-            continue;
-            }
-        //g_message("key:%s value:%s", g_quark_to_string(attr->key),
-        //                             g_quark_to_string(attr->value)  );
-
-        std::string attrName  = (const char *)g_quark_to_string(attr->key);
-        std::string attrValue = (const char *)attr->value;
-        //g_message("tag:'%s'    key:'%s'    value:'%s'",
-        //    nodeName.c_str(), attrName.c_str(), attrValue.c_str()  );
-        if (attrName == "style")
-            {
-            StyleInfo si(attrName, attrValue);
-            if (styleTable.find(attrValue) != styleTable.end())
-                {
-                //g_message("duplicate style");
-                }
-            else
-                {
-                char buf[16];
-                snprintf(buf, 15, "style%d", styleTable.size());
-                std::string attrName  = buf;
-                //Map from value-->name .   Looks backwards, i know
-                styleTable[attrValue] = si;
-                //g_message("mapping '%s' to '%s'",
-                //    attrValue.c_str(), attrName.c_str());
-                }
-            }
-        }
-    */
-
-
     for (Inkscape::XML::Node *child = node->firstChild() ;
             child ; child = child->next())
         preprocess(zf, child);
@@ -299,6 +1133,10 @@ OdfOutput::preprocess(ZipFile &zf, Inkscape::XML::Node *node)
 
 
 
+/**
+ * Writes the manifest.  Currently it only changes according to the
+ * file names of images packed into the zip file.
+ */
 bool OdfOutput::writeManifest(ZipFile &zf)
 {
     BufferOutputStream bouts;
@@ -323,15 +1161,16 @@ bool OdfOutput::writeManifest(ZipFile &zf)
     outs.printf("<manifest:manifest xmlns:manifest=\"urn:oasis:names:tc:opendocument:xmlns:manifest:1.0\">\n");
     outs.printf("    <manifest:file-entry manifest:media-type=\"application/vnd.oasis.opendocument.graphics\" manifest:full-path=\"/\"/>\n");
     outs.printf("    <manifest:file-entry manifest:media-type=\"text/xml\" manifest:full-path=\"content.xml\"/>\n");
+    outs.printf("    <manifest:file-entry manifest:media-type=\"text/xml\" manifest:full-path=\"styles.xml\"/>\n");
     outs.printf("    <manifest:file-entry manifest:media-type=\"text/xml\" manifest:full-path=\"meta.xml\"/>\n");
     outs.printf("    <!--List our images here-->\n");
-    std::map<std::string, std::string>::iterator iter;
+    std::map<Glib::ustring, Glib::ustring>::iterator iter;
     for (iter = imageTable.begin() ; iter!=imageTable.end() ; iter++)
         {
-        std::string oldName = iter->first;
-        std::string newName = iter->second;
+        Glib::ustring oldName = iter->first;
+        Glib::ustring newName = iter->second;
 
-        std::string ext = getExtension(oldName);
+        Glib::ustring ext = getExtension(oldName);
         if (ext == ".jpeg")
             ext = ".jpg";
         outs.printf("    <manifest:file-entry manifest:media-type=\"");
@@ -342,7 +1181,7 @@ bool OdfOutput::writeManifest(ZipFile &zf)
         else if (ext == ".jpg")
             outs.printf("image/jpeg");
         outs.printf("\" manifest:full-path=\"");
-        outs.printf((char *)newName.c_str());
+        outs.printf(newName.c_str());
         outs.printf("\"/>\n");
         }
     outs.printf("</manifest:manifest>\n");
@@ -358,6 +1197,9 @@ bool OdfOutput::writeManifest(ZipFile &zf)
 }
 
 
+/**
+ * This writes the document meta information to meta.xml
+ */
 bool OdfOutput::writeMeta(ZipFile &zf)
 {
     BufferOutputStream bouts;
@@ -366,6 +1208,16 @@ bool OdfOutput::writeMeta(ZipFile &zf)
     time_t tim;
     time(&tim);
 
+    std::map<Glib::ustring, Glib::ustring>::iterator iter;
+    Glib::ustring creator = "unknown";
+    iter = metadata.find("dc:creator");
+    if (iter != metadata.end())
+        creator = iter->second;
+    Glib::ustring date = "";
+    iter = metadata.find("dc:date");
+    if (iter != metadata.end())
+        date = iter->second;
+
     outs.printf("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
     outs.printf("\n");
     outs.printf("\n");
@@ -389,12 +1241,20 @@ bool OdfOutput::writeMeta(ZipFile &zf)
     outs.printf("xmlns:anim=\"urn:oasis:names:tc:opendocument:xmlns:animation:1.0\"\n");
     outs.printf("office:version=\"1.0\">\n");
     outs.printf("<office:meta>\n");
-    outs.printf("    <meta:generator>Inkscape.org - 0.44</meta:generator>\n");
-    outs.printf("    <meta:initial-creator>clark kent</meta:initial-creator>\n");
-    outs.printf("    <meta:creation-date>2006-04-13T17:12:29</meta:creation-date>\n");
-    outs.printf("    <dc:creator>clark kent</dc:creator>\n");
-    outs.printf("    <dc:date>2006-04-13T17:13:20</dc:date>\n");
-    outs.printf("    <dc:language>en-US</dc:language>\n");
+    outs.printf("    <meta:generator>Inkscape.org - 0.45</meta:generator>\n");
+    outs.printf("    <meta:initial-creator>%#s</meta:initial-creator>\n",
+                                  creator.c_str());
+    outs.printf("    <meta:creation-date>%#s</meta:creation-date>\n", date.c_str());
+    for (iter = metadata.begin() ; iter != metadata.end() ; iter++)
+        {
+        Glib::ustring name  = iter->first;
+        Glib::ustring value = iter->second;
+        if (name.size() > 0 && value.size()>0)
+            {
+            outs.printf("    <%#s>%#s</%#s>\n",
+                      name.c_str(), value.c_str(), name.c_str());
+            }
+        }
     outs.printf("    <meta:editing-cycles>2</meta:editing-cycles>\n");
     outs.printf("    <meta:editing-duration>PT56S</meta:editing-duration>\n");
     outs.printf("    <meta:user-defined meta:name=\"Info 1\"/>\n");
@@ -419,28 +1279,38 @@ bool OdfOutput::writeMeta(ZipFile &zf)
 }
 
 
-bool OdfOutput::writeStyle(Writer &outs)
+
+
+/**
+ * This is called just before writeTree(), since it will write style and
+ * gradient information above the <draw> tag in the content.xml file
+ */
+bool OdfOutput::writeStyle(ZipFile &zf)
 {
-    outs.printf("<office:automatic-styles>\n");
-    outs.printf("<style:style style:name=\"dp1\" style:family=\"drawing-page\"/>\n");
-    outs.printf("<style:style style:name=\"gr1\" style:family=\"graphic\" style:parent-style-name=\"standard\">\n");
-    outs.printf("  <style:graphic-properties draw:stroke=\"none\" draw:fill=\"none\"\n");
-    outs.printf("       draw:textarea-horizontal-align=\"center\"\n");
-    outs.printf("       draw:textarea-vertical-align=\"middle\" draw:color-mode=\"standard\"\n");
-    outs.printf("       draw:luminance=\"0%\" draw:contrast=\"0%\" draw:gamma=\"100%\" draw:red=\"0%\"\n");
-    outs.printf("       draw:green=\"0%\" draw:blue=\"0%\" fo:clip=\"rect(0cm 0cm 0cm 0cm)\"\n");
-    outs.printf("       draw:image-opacity=\"100%\" style:mirror=\"none\"/>\n");
-    outs.printf("</style:style>\n");
-    outs.printf("<style:style style:name=\"P1\" style:family=\"paragraph\">\n");
-    outs.printf("  <style:paragraph-properties fo:text-align=\"center\"/>\n");
-    outs.printf("</style:style>\n");
+    BufferOutputStream bouts;
+    OutputStreamWriter outs(bouts);
 
-    //##  Dump our style table
-    std::map<std::string, StyleInfo>::iterator iter;
+    /*
+    ==========================================================
+    Dump our style table.  Styles should have a general layout
+    something like the following.  Look in:
+    http://books.evc-cit.info/odbook/ch06.html#draw-style-file-section
+    for style and gradient information.
+    <style:style style:name="gr13"
+      style:family="graphic" style:parent-style-name="standard">
+        <style:graphic-properties draw:stroke="solid"
+            svg:stroke-width="0.1cm"
+            svg:stroke-color="#ff0000"
+            draw:fill="solid" draw:fill-color="#e6e6ff"/>
+    </style:style>
+    ==========================================================
+    */
+    outs.printf("<!-- ####### Styles from Inkscape document ####### -->\n");
+    std::vector<StyleInfo>::iterator iter;
     for (iter = styleTable.begin() ; iter != styleTable.end() ; iter++)
         {
-        outs.printf("<style:style style:name=\"%s\"", iter->first.c_str());
-        StyleInfo s(iter->second);
+        outs.printf("<style:style style:name=\"%s\"", iter->name.c_str());
+        StyleInfo s(*iter);
         outs.printf(" style:family=\"graphic\" style:parent-style-name=\"standard\">\n");
         outs.printf("  <style:graphic-properties");
         outs.printf(" draw:fill=\"%s\" ", s.fill.c_str());
@@ -452,73 +1322,531 @@ bool OdfOutput::writeStyle(Writer &outs)
         outs.printf(" draw:stroke=\"%s\" ", s.stroke.c_str());
         if (s.stroke != "none")
             {
-            outs.printf(" svg:stroke-width=\"%s\" ", s.strokeWidth.c_str());
-            outs.printf(" svg:stroke-color=\"%s\" ", s.strokeColor.c_str());
-            outs.printf(" svg:stroke-opacity=\"%s\" ", s.strokeOpacity.c_str());
+            outs.printf(" svg:stroke-width=\"%s\" ", s.strokeWidth.c_str());
+            outs.printf(" svg:stroke-color=\"%s\" ", s.strokeColor.c_str());
+            outs.printf(" svg:stroke-opacity=\"%s\" ", s.strokeOpacity.c_str());
+            }
+        outs.printf("/>\n");
+        outs.printf("</style:style>\n");
+        }
+
+    //##  Dump our gradient table
+    int gradientCount = 0;
+    outs.printf("\n");
+    outs.printf("<!-- ####### Gradients from Inkscape document ####### -->\n");
+    std::vector<GradientInfo>::iterator giter;
+    for (giter = gradientTable.begin() ; giter != gradientTable.end() ; giter++)
+        {
+        GradientInfo gi(*giter);
+        if (gi.style == "linear")
+            {
+            /*
+            ===================================================================
+            LINEAR gradient.  We need something that looks like this:
+            <draw:gradient draw:name="Gradient_20_7"
+                draw:display-name="Gradient 7"
+                draw:style="linear"
+                draw:start-color="#008080" draw:end-color="#993366"
+                draw:start-intensity="100%" draw:end-intensity="100%"
+                draw:angle="150" draw:border="0%"/>
+            ===================================================================
+            */
+            if (gi.stops.size() < 2)
+                {
+                g_warning("Need at least 2 tops for a linear gradient");
+                continue;
+                }
+            outs.printf("<svg:linearGradient ");
+            outs.printf("id=\"%#s_g\" ", gi.name.c_str());
+            outs.printf("draw:name=\"%#s_g\"\n", gi.name.c_str());
+            outs.printf("    draw:display-name=\"imported linear %u\"\n",
+                        gradientCount);
+            outs.printf("    svg:x1=\"%05.3fcm\" svg:y1=\"%05.3fcm\"\n",
+                        gi.x1, gi.y1);
+            outs.printf("    svg:x2=\"%05.3fcm\" svg:y2=\"%05.3fcm\"\n",
+                        gi.x2, gi.y2);
+            outs.printf("    svg:gradientUnits=\"objectBoundingBox\">\n");
+            outs.printf("    <svg:stop\n");
+            outs.printf("        svg:stop-color=\"#%06lx\"\n",
+                        gi.stops[0].rgb);
+            outs.printf("        svg:stop-opacity=\"%f%%\"\n",
+                        gi.stops[0].opacity * 100.0);
+            outs.printf("        svg:offset=\"0\"/>\n");
+            outs.printf("    <svg:stop\n");
+            outs.printf("        svg:stop-color=\"#%06lx\"\n",
+                        gi.stops[1].rgb);
+            outs.printf("        svg:stop-opacity=\"%f%%\"\n",
+                        gi.stops[1].opacity * 100.0);
+            outs.printf("        svg:offset=\"1\"/>\n");
+            outs.printf("</svg:linearGradient>\n");
+            }
+        else if (gi.style == "radial")
+            {
+            /*
+            ===================================================================
+            RADIAL gradient.  We need something that looks like this:
+            <!-- radial gradient, light gray to white, centered, 0% border -->
+            <draw:gradient draw:name="radial_20_borderless"
+                draw:display-name="radial borderless"
+                draw:style="radial"
+                draw:cx="50%" draw:cy="50%"
+                draw:start-color="#999999" draw:end-color="#ffffff"
+                draw:border="0%"/>
+            ===================================================================
+            */
+            if (gi.stops.size() < 2)
+                {
+                g_warning("Need at least 2 tops for a radial gradient");
+                continue;
+                }
+            outs.printf("<svg:radialGradient ");
+            outs.printf("id=\"%#s_g\" ", gi.name.c_str());
+            outs.printf("draw:name=\"%#s_g\"\n", gi.name.c_str());
+            outs.printf("    draw:display-name=\"imported radial %d\"\n",
+                        gradientCount);
+            outs.printf("    svg:cx=\"%05.3f\" svg:cy=\"%05.3f\"\n",
+                        gi.cx, gi.cy);
+            outs.printf("    svg:fx=\"%05.3f\" svg:fy=\"%05.3f\"\n",
+                        gi.fx, gi.fy);
+            outs.printf("    svg:r=\"%05.3f\"\n",
+                        gi.r);
+            outs.printf("    svg:gradientUnits=\"objectBoundingBox\">\n");
+            outs.printf("    <svg:stop\n");
+            outs.printf("        svg:stop-color=\"#%06lx\"\n",
+                        gi.stops[0].rgb);
+            outs.printf("        svg:stop-opacity=\"%f%%\"\n",
+                        gi.stops[0].opacity * 100.0);
+            outs.printf("        svg:offset=\"0\"/>\n");
+            outs.printf("    <svg:stop\n");
+            outs.printf("        svg:stop-color=\"#%06lx\"\n",
+                        gi.stops[1].rgb);
+            outs.printf("        svg:stop-opacity=\"%f%%\"\n",
+                        gi.stops[1].opacity * 100.0);
+            outs.printf("        svg:offset=\"1\"/>\n");
+            outs.printf("</svg:radialGradient>\n");
+            }
+        else
+            {
+            g_warning("unsupported gradient style '%s'", gi.style.c_str());
+            }
+        outs.printf("<style:style style:name=\"%#s\" style:family=\"graphic\" ",
+                  gi.name.c_str());
+        outs.printf("style:parent-style-name=\"standard\">\n");
+        outs.printf("    <style:graphic-properties draw:fill=\"gradient\" ");
+        outs.printf("draw:fill-gradient-name=\"%#s_g\"\n",
+                  gi.name.c_str());
+        outs.printf("        draw:textarea-horizontal-align=\"center\" ");
+        outs.printf("draw:textarea-vertical-align=\"middle\"/>\n");
+        outs.printf("</style:style>\n\n");
+
+        gradientCount++;
+        }
+
+    outs.printf("\n");
+    outs.printf("</office:automatic-styles>\n");
+    outs.printf("\n");
+    outs.printf("\n");
+    outs.printf("<office:master-styles>\n");
+    outs.printf("<draw:layer-set>\n");
+    outs.printf("    <draw:layer draw:name=\"layout\"/>\n");
+    outs.printf("    <draw:layer draw:name=\"background\"/>\n");
+    outs.printf("    <draw:layer draw:name=\"backgroundobjects\"/>\n");
+    outs.printf("    <draw:layer draw:name=\"controls\"/>\n");
+    outs.printf("    <draw:layer draw:name=\"measurelines\"/>\n");
+    outs.printf("</draw:layer-set>\n");
+    outs.printf("\n");
+    outs.printf("<style:master-page style:name=\"Default\"\n");
+    outs.printf("    style:page-master-name=\"PM1\" draw:style-name=\"dp1\"/>\n");
+    outs.printf("</office:master-styles>\n");
+    outs.printf("\n");
+    outs.printf("\n");
+    outs.printf("\n");
+    outs.printf("</office:document-styles>\n");
+    outs.printf("\n");
+    outs.printf("<!--\n");
+    outs.printf("*************************************************************************\n");
+    outs.printf("  E N D    O F    F I L E\n");
+    outs.printf("  Have a nice day  - ishmal\n");
+    outs.printf("*************************************************************************\n");
+    outs.printf("-->\n");
+    outs.printf("\n");
+
+    //Make our entry
+    ZipEntry *ze = zf.newEntry("styles.xml", "ODF style file");
+    ze->setUncompressedData(bouts.getBuffer());
+    ze->finish();
+
+    return true;
+}
+
+
+
+/**
+ * Writes an SVG path as an ODF <draw:path> and returns the number of points written
+ */
+static int
+writePath(Writer &outs, Geom::PathVector const &pathv,
+          Geom::Matrix const &tf, double xoff, double yoff)
+{
+    using Geom::X;
+    using Geom::Y;
+
+    int nrPoints  = 0;
+
+    // convert the path to only lineto's and cubic curveto's:
+    Geom::PathVector pv = pathv_to_linear_and_cubic_beziers(pathv * tf * Geom::Translate(xoff, yoff) * Geom::Scale(1000.));
+
+        for (Geom::PathVector::const_iterator pit = pathv.begin(); pit != pathv.end(); ++pit) {
+
+            double destx = pit->initialPoint()[X];
+            double desty = pit->initialPoint()[Y];
+            if (fabs(destx)<1.0) destx = 0.0;   // Why is this needed? Shouldn't we just round all numbers then?
+            if (fabs(desty)<1.0) desty = 0.0;
+            outs.printf("M %.3f %.3f ", destx, desty);
+            nrPoints++;
+
+            for (Geom::Path::const_iterator cit = pit->begin(); cit != pit->end_closed(); ++cit) {
+
+                if( is_straight_curve(*cit) )
+                {
+                    double destx = cit->finalPoint()[X];
+                    double desty = cit->finalPoint()[Y];
+                    if (fabs(destx)<1.0) destx = 0.0;   // Why is this needed? Shouldn't we just round all numbers then?
+                    if (fabs(desty)<1.0) desty = 0.0;
+                    outs.printf("L %.3f %.3f ",  destx, desty);
+                }
+                else if(Geom::CubicBezier const *cubic = dynamic_cast<Geom::CubicBezier const*>(&*cit)) {
+                    std::vector<Geom::Point> points = cubic->points();
+                    for (unsigned i = 1; i <= 3; i++) {
+                        if (fabs(points[i][X])<1.0) points[i][X] = 0.0;   // Why is this needed? Shouldn't we just round all numbers then?
+                        if (fabs(points[i][Y])<1.0) points[i][Y] = 0.0;
+                    }
+                    outs.printf("C %.3f %.3f %.3f %.3f %.3f %.3f ", points[1][X],points[1][Y], points[2][X],points[2][Y], points[3][X],points[3][Y]);
+                }
+                else {
+                    g_error ("logical error, because pathv_to_linear_and_cubic_beziers was used");
+                }
+
+                nrPoints++;
+            }
+
+            if (pit->closed()) {
+                outs.printf("Z");
+            }
+        }
+
+    return nrPoints;
+}
+
+
+
+bool OdfOutput::processStyle(Writer &outs, SPItem *item,
+                             const Glib::ustring &id)
+{
+    SPStyle *style = item->style;
+
+    StyleInfo si;
+
+    //## FILL
+    if (style->fill.isColor())
+        {
+        guint32 fillCol = style->fill.value.color.toRGBA32( 0 );
+        char buf[16];
+        int r = (fillCol >> 24) & 0xff;
+        int g = (fillCol >> 16) & 0xff;
+        int b = (fillCol >>  8) & 0xff;
+        //g_message("## %s %lx", id.c_str(), (unsigned int)fillCol);
+        snprintf(buf, 15, "#%02x%02x%02x", r, g, b);
+        si.fillColor = buf;
+        si.fill      = "solid";
+        double opacityPercent = 100.0 *
+             (SP_SCALE24_TO_FLOAT(style->fill_opacity.value));
+        snprintf(buf, 15, "%.3f%%", opacityPercent);
+        si.fillOpacity = buf;
+        }
+
+    //## STROKE
+    if (style->stroke.isColor())
+        {
+        guint32 strokeCol = style->stroke.value.color.toRGBA32( 0 );
+        char buf[16];
+        int r = (strokeCol >> 24) & 0xff;
+        int g = (strokeCol >> 16) & 0xff;
+        int b = (strokeCol >>  8) & 0xff;
+        snprintf(buf, 15, "#%02x%02x%02x", r, g, b);
+        si.strokeColor = buf;
+        snprintf(buf, 15, "%.3fpt", style->stroke_width.value);
+        si.strokeWidth = buf;
+        si.stroke      = "solid";
+        double opacityPercent = 100.0 *
+             (SP_SCALE24_TO_FLOAT(style->stroke_opacity.value));
+        snprintf(buf, 15, "%.3f%%", opacityPercent);
+        si.strokeOpacity = buf;
+        }
+
+    //Look for existing identical style;
+    bool styleMatch = false;
+    std::vector<StyleInfo>::iterator iter;
+    for (iter=styleTable.begin() ; iter!=styleTable.end() ; iter++)
+        {
+        if (si.equals(*iter))
+            {
+            //map to existing styleTable entry
+            Glib::ustring styleName = iter->name;
+            //g_message("found duplicate style:%s", styleName.c_str());
+            styleLookupTable[id] = styleName;
+            styleMatch = true;
+            break;
             }
-        outs.printf("/>\n");
-        outs.printf("</style:style>\n");
         }
 
-    outs.printf("</office:automatic-styles>\n");
-    outs.printf("\n");
+    //## Dont need a new style
+    if (styleMatch)
+        return false;
+
+    char buf[16];
+    snprintf(buf, 15, "style%d", (int)styleTable.size());
+    Glib::ustring styleName = buf;
+    si.name = styleName;
+    styleTable.push_back(si);
+    styleLookupTable[id] = styleName;
+
+    outs.printf("<style:style style:name=\"%s\"", si.name.c_str());
+    outs.printf(" style:family=\"graphic\" style:parent-style-name=\"standard\">\n");
+    outs.printf("  <style:graphic-properties");
+    outs.printf(" draw:fill=\"%s\" ", si.fill.c_str());
+    if (si.fill != "none")
+        {
+        outs.printf(" draw:fill-color=\"%s\" ", si.fillColor.c_str());
+        outs.printf(" draw:fill-opacity=\"%s\" ", si.fillOpacity.c_str());
+        }
+    outs.printf(" draw:stroke=\"%s\" ", si.stroke.c_str());
+    if (si.stroke != "none")
+        {
+        outs.printf(" svg:stroke-width=\"%s\" ", si.strokeWidth.c_str());
+        outs.printf(" svg:stroke-color=\"%s\" ", si.strokeColor.c_str());
+        outs.printf(" svg:stroke-opacity=\"%s\" ", si.strokeOpacity.c_str());
+        }
+    outs.printf("/>\n");
+    outs.printf("</style:style>\n");
 
     return true;
 }
 
 
-static void
-writePath(Writer &outs, NArtBpath const *bpath,
-          NR::Matrix &tf, double xoff, double yoff)
+
+
+bool OdfOutput::processGradient(Writer &outs, SPItem *item,
+                                const Glib::ustring &id, Geom::Matrix &/*tf*/)
 {
-    bool closed = false;
-    NArtBpath *bp = (NArtBpath *)bpath;
-    for (  ; bp->code != NR_END; bp++)
+    if (!item)
+        return false;
+
+    SPStyle *style = item->style;
+
+    if (!style)
+        return false;
+
+    if (!style->fill.isPaintserver())
+        return false;
+
+    //## Gradient.  Look in writeStyle() below to see what info
+    //   we need to read into GradientInfo.
+    if (!SP_IS_GRADIENT(SP_STYLE_FILL_SERVER(style)))
+        return false;
+
+    SPGradient *gradient = SP_GRADIENT(SP_STYLE_FILL_SERVER(style));
+
+    GradientInfo gi;
+
+    SPGradient *grvec = sp_gradient_get_vector(gradient, FALSE);
+    for (SPStop *stop = sp_first_stop(grvec) ;
+          stop ; stop = sp_next_stop(stop))
+        {
+        unsigned long rgba = sp_stop_get_rgba32(stop);
+        unsigned long rgb  = (rgba >> 8) & 0xffffff;
+        double opacity     = ((double)(rgba & 0xff)) / 256.0;
+        GradientStop gs(rgb, opacity);
+        gi.stops.push_back(gs);
+        }
+
+    if (SP_IS_LINEARGRADIENT(gradient))
         {
-        NR::Point const p1(bp->c(1) * tf);
-       NR::Point const p2(bp->c(2) * tf);
-       NR::Point const p3(bp->c(3) * tf);
-       double x1 = (p1[NR::X] * pxToCm - xoff) * 1000.0;
-       double y1 = (p1[NR::Y] * pxToCm - yoff) * 1000.0;
-       double x2 = (p2[NR::X] * pxToCm - xoff) * 1000.0;
-       double y2 = (p2[NR::Y] * pxToCm - yoff) * 1000.0;
-       double x3 = (p3[NR::X] * pxToCm - xoff) * 1000.0;
-       double y3 = (p3[NR::Y] * pxToCm - yoff) * 1000.0;
+        gi.style = "linear";
+        SPLinearGradient *linGrad = SP_LINEARGRADIENT(gradient);
+        /*
+        Geom::Point p1(linGrad->x1.value, linGrad->y1.value);
+        p1 = p1 * tf;
+        gi.x1 = p1[Geom::X];
+        gi.y1 = p1[Geom::Y];
+        Geom::Point p2(linGrad->x2.value, linGrad->y2.value);
+        p2 = p2 * tf;
+        gi.x2 = p2[Geom::X];
+        gi.y2 = p2[Geom::Y];
+        */
+        gi.x1 = linGrad->x1.value;
+        gi.y1 = linGrad->y1.value;
+        gi.x2 = linGrad->x2.value;
+        gi.y2 = linGrad->y2.value;
+        }
+    else if (SP_IS_RADIALGRADIENT(gradient))
+        {
+        gi.style = "radial";
+        SPRadialGradient *radGrad = SP_RADIALGRADIENT(gradient);
+        gi.cx = radGrad->cx.computed * 100.0;//ODG cx is percentages
+        gi.cy = radGrad->cy.computed * 100.0;
+        }
+    else
+        {
+        g_warning("not a supported gradient type");
+        return false;
+        }
 
-        switch (bp->code)
+    //Look for existing identical style;
+    bool gradientMatch = false;
+    std::vector<GradientInfo>::iterator iter;
+    for (iter=gradientTable.begin() ; iter!=gradientTable.end() ; iter++)
+        {
+        if (gi.equals(*iter))
             {
-            case NR_LINETO:
-                outs.printf("L %.3f,%.3f ",  x3 , y3);
-                break;
+            //map to existing gradientTable entry
+            Glib::ustring gradientName = iter->name;
+            //g_message("found duplicate style:%s", gradientName.c_str());
+            gradientLookupTable[id] = gradientName;
+            gradientMatch = true;
+            break;
+            }
+        }
 
-            case NR_CURVETO:
-                outs.printf("C %.3f,%.3f %.3f,%.3f %.3f,%.3f ",
-                              x1, y1, x2, y2, x3, y3);
-                break;
+    if (gradientMatch)
+        return true;
 
-            case NR_MOVETO_OPEN:
-            case NR_MOVETO:
-                if (closed)
-                    outs.printf("z ");
-                closed = ( bp->code == NR_MOVETO );
-                outs.printf("M %.3f,%.3f ",  x3 , y3);
-                break;
+    //## No match, let us write a new entry
+    char buf[16];
+    snprintf(buf, 15, "gradient%d", (int)gradientTable.size());
+    Glib::ustring gradientName = buf;
+    gi.name = gradientName;
+    gradientTable.push_back(gi);
+    gradientLookupTable[id] = gradientName;
 
-            default:
-                break;
+    int gradientCount = gradientTable.size();
 
+    if (gi.style == "linear")
+        {
+        /*
+        ===================================================================
+        LINEAR gradient.  We need something that looks like this:
+        <draw:gradient draw:name="Gradient_20_7"
+            draw:display-name="Gradient 7"
+            draw:style="linear"
+            draw:start-color="#008080" draw:end-color="#993366"
+            draw:start-intensity="100%" draw:end-intensity="100%"
+            draw:angle="150" draw:border="0%"/>
+        ===================================================================
+        */
+        if (gi.stops.size() < 2)
+            {
+            g_warning("Need at least 2 stops for a linear gradient");
+            return false;;
             }
-
+        outs.printf("<svg:linearGradient ");
+        outs.printf("id=\"%#s_g\" ", gi.name.c_str());
+        outs.printf("draw:name=\"%#s_g\"\n", gi.name.c_str());
+        outs.printf("    draw:display-name=\"imported linear %d\"\n",
+                    gradientCount);
+        outs.printf("    svg:gradientUnits=\"objectBoundingBox\"\n");
+        outs.printf("    svg:x1=\"%05.3fcm\" svg:y1=\"%05.3fcm\"\n",
+                    gi.x1 * pxToCm, gi.y1 * pxToCm);
+        outs.printf("    svg:x2=\"%05.3fcm\" svg:y2=\"%05.3fcm\">\n",
+                    gi.x2 * pxToCm, gi.y2 * pxToCm);
+        outs.printf("    <svg:stop\n");
+        outs.printf("        svg:stop-color=\"#%06lx\"\n",
+                    gi.stops[0].rgb);
+        outs.printf("        svg:stop-opacity=\"%f%%\"\n",
+                    gi.stops[0].opacity * 100.0);
+        outs.printf("        svg:offset=\"0\"/>\n");
+        outs.printf("    <svg:stop\n");
+        outs.printf("        svg:stop-color=\"#%06lx\"\n",
+                    gi.stops[1].rgb);
+        outs.printf("        svg:stop-opacity=\"%f%%\"\n",
+                    gi.stops[1].opacity * 100.0);
+        outs.printf("        svg:offset=\"1\"/>\n");
+        outs.printf("</svg:linearGradient>\n");
         }
+    else if (gi.style == "radial")
+        {
+        /*
+        ===================================================================
+        RADIAL gradient.  We need something that looks like this:
+        <!-- radial gradient, light gray to white, centered, 0% border -->
+        <draw:gradient draw:name="radial_20_borderless"
+            draw:display-name="radial borderless"
+            draw:style="radial"
+            draw:cx="50%" draw:cy="50%"
+            draw:start-color="#999999" draw:end-color="#ffffff"
+            draw:border="0%"/>
+        ===================================================================
+        */
+        if (gi.stops.size() < 2)
+            {
+            g_warning("Need at least 2 stops for a radial gradient");
+            return false;
+            }
+        outs.printf("<svg:radialGradient ");
+        outs.printf("id=\"%#s_g\" ", gi.name.c_str());
+        outs.printf("draw:name=\"%#s_g\"\n", gi.name.c_str());
+        outs.printf("    draw:display-name=\"imported radial %d\"\n",
+                    gradientCount);
+        outs.printf("    svg:gradientUnits=\"objectBoundingBox\"\n");
+        outs.printf("    svg:cx=\"%05.3f\" svg:cy=\"%05.3f\"\n",
+                    gi.cx, gi.cy);
+        outs.printf("    svg:fx=\"%05.3f\" svg:fy=\"%05.3f\"\n",
+                    gi.fx, gi.fy);
+        outs.printf("    svg:r=\"%05.3f\">\n",
+                    gi.r);
+        outs.printf("    <svg:stop\n");
+        outs.printf("        svg:stop-color=\"#%06lx\"\n",
+                    gi.stops[0].rgb);
+        outs.printf("        svg:stop-opacity=\"%f%%\"\n",
+                    gi.stops[0].opacity * 100.0);
+        outs.printf("        svg:offset=\"0\"/>\n");
+        outs.printf("    <svg:stop\n");
+        outs.printf("        svg:stop-color=\"#%06lx\"\n",
+                    gi.stops[1].rgb);
+        outs.printf("        svg:stop-opacity=\"%f%%\"\n",
+                    gi.stops[1].opacity * 100.0);
+        outs.printf("        svg:offset=\"1\"/>\n");
+        outs.printf("</svg:radialGradient>\n");
+        }
+    else
+        {
+        g_warning("unsupported gradient style '%s'", gi.style.c_str());
+        return false;
+        }
+    outs.printf("<style:style style:name=\"%#s\" style:family=\"graphic\" ",
+              gi.name.c_str());
+    outs.printf("style:parent-style-name=\"standard\">\n");
+    outs.printf("    <style:graphic-properties draw:fill=\"gradient\" ");
+    outs.printf("draw:fill-gradient-name=\"%#s_g\"\n",
+              gi.name.c_str());
+    outs.printf("        draw:textarea-horizontal-align=\"center\" ");
+    outs.printf("draw:textarea-vertical-align=\"middle\"/>\n");
+    outs.printf("</style:style>\n\n");
 
-    if (closed)
-        outs.printf("z");;
-
+    return true;
 }
 
 
 
-bool OdfOutput::writeTree(Writer &outs, Inkscape::XML::Node *node)
+
+/**
+ * SECOND PASS.
+ * This is the main SPObject tree output to ODF.  preprocess()
+ * must be called prior to this, as elements will often reference
+ * data parsed and tabled in preprocess().
+ */
+bool OdfOutput::writeTree(Writer &couts, Writer &souts,
+                          Inkscape::XML::Node *node)
 {
     //# Get the SPItem, if applicable
     SPObject *reprobj = SP_ACTIVE_DOCUMENT->getObjectByRepr(node);
@@ -531,36 +1859,42 @@ bool OdfOutput::writeTree(Writer &outs, Inkscape::XML::Node *node)
     SPItem *item = SP_ITEM(reprobj);
 
 
-    std::string nodeName = node->name();
-    std::string id       = getAttribute(node, "id");
+    Glib::ustring nodeName = node->name();
+    Glib::ustring id       = getAttribute(node, "id");
 
-    NR::Matrix tf  = sp_item_i2d_affine(item);
-    NR::Rect bbox = sp_item_bbox_desktop(item);
+    //### Get SVG-to-ODF transform
+    Geom::Matrix tf        = getODFTransform(item);
 
-    //Flip Y into document coordinates
-    double doc_height = sp_document_height(SP_ACTIVE_DOCUMENT);
-    NR::Matrix doc2dt_tf = NR::Matrix(NR::scale(1, -1));
-    doc2dt_tf = doc2dt_tf * NR::Matrix(NR::translate(0, doc_height));
-    //tf            = tf   * doc2dt_tf;
-    //bbox          = bbox * doc2dt_tf;
+    //### Get ODF bounding box params for item
+    boost::optional<Geom::Rect> bbox = getODFBoundingBox(item);
+    if (!bbox) {
+        return true;
+    }
 
-    double x      = pxToCm * bbox.min()[NR::X];
-    double y      = pxToCm * bbox.min()[NR::Y];
-    double width  = pxToCm * ( bbox.max()[NR::X] - bbox.min()[NR::X] );
-    double height = pxToCm * ( bbox.max()[NR::Y] - bbox.min()[NR::Y] );
+    double bbox_x        = bbox->min()[Geom::X];
+    double bbox_y        = bbox->min()[Geom::Y];
+    double bbox_width    = (*bbox)[Geom::X].extent();
+    double bbox_height   = (*bbox)[Geom::Y].extent();
 
+    double rotate;
+    double xskew;
+    double yskew;
+    double xscale;
+    double yscale;
+    analyzeTransform(tf, rotate, xskew, yskew, xscale, yscale);
 
     //# Do our stuff
     SPCurve *curve = NULL;
 
-    //g_message("##### %s #####", nodeName.c_str());
+
 
     if (nodeName == "svg" || nodeName == "svg:svg")
         {
         //# Iterate through the children
-        for (Inkscape::XML::Node *child = node->firstChild() ; child ; child = child->next())
+        for (Inkscape::XML::Node *child = node->firstChild() ;
+               child ; child = child->next())
             {
-            if (!writeTree(outs, child))
+            if (!writeTree(couts, souts, child))
                 return false;
             }
         return true;
@@ -568,19 +1902,41 @@ bool OdfOutput::writeTree(Writer &outs, Inkscape::XML::Node *node)
     else if (nodeName == "g" || nodeName == "svg:g")
         {
         if (id.size() > 0)
-            outs.printf("<draw:g id=\"%s\">", id.c_str());
+            couts.printf("<draw:g id=\"%s\">\n", id.c_str());
         else
-            outs.printf("<draw:g>\n");
+            couts.printf("<draw:g>\n");
         //# Iterate through the children
-        for (Inkscape::XML::Node *child = node->firstChild() ; child ; child = child->next())
+        for (Inkscape::XML::Node *child = node->firstChild() ;
+               child ; child = child->next())
             {
-            if (!writeTree(outs, child))
+            if (!writeTree(couts, souts, child))
                 return false;
             }
-        outs.printf("</draw:g>\n");
+        if (id.size() > 0)
+            couts.printf("</draw:g> <!-- id=\"%s\" -->\n", id.c_str());
+        else
+            couts.printf("</draw:g>\n");
         return true;
         }
-    else if (nodeName == "image" || nodeName == "svg:image")
+
+    //######################################
+    //# S T Y L E
+    //######################################
+    processStyle(souts, item, id);
+
+    //######################################
+    //# G R A D I E N T
+    //######################################
+    processGradient(souts, item, id, tf);
+
+
+
+
+    //######################################
+    //# I T E M    D A T A
+    //######################################
+    //g_message("##### %s #####", nodeName.c_str());
+    if (nodeName == "image" || nodeName == "svg:image")
         {
         if (!SP_IS_IMAGE(item))
             {
@@ -589,48 +1945,58 @@ bool OdfOutput::writeTree(Writer &outs, Inkscape::XML::Node *node)
             }
 
         SPImage *img   = SP_IMAGE(item);
-        double ix      = img->x.computed;
-        double iy      = img->y.computed;
-        double iwidth  = img->width.computed;
-        double iheight = img->height.computed;
-
-        NR::Rect ibbox(NR::Point(ix, iy), NR::Point(iwidth, iheight));
-        ix      = pxToCm * ibbox.min()[NR::X];
-        iy      = pxToCm * ibbox.min()[NR::Y];
-        iwidth  = pxToCm * ( ibbox.max()[NR::X] - ibbox.min()[NR::X] );
-        iheight = pxToCm * ( ibbox.max()[NR::Y] - ibbox.min()[NR::Y] );
-
-
-        std::string itemTransformString = formatTransform(item->transform);
-
-        std::string href = getAttribute(node, "xlink:href");
-        std::map<std::string, std::string>::iterator iter = imageTable.find(href);
+        double ix      = img->x.value;
+        double iy      = img->y.value;
+        double iwidth  = img->width.value;
+        double iheight = img->height.value;
+
+        Geom::Rect ibbox(Geom::Point(ix, iy), Geom::Point(ix+iwidth, iy+iheight));
+        ibbox = ibbox * tf;
+        ix      = ibbox.min()[Geom::X];
+        iy      = ibbox.min()[Geom::Y];
+        //iwidth  = ibbox.max()[Geom::X] - ibbox.min()[Geom::X];
+        //iheight = ibbox.max()[Geom::Y] - ibbox.min()[Geom::Y];
+        iwidth  = xscale * iwidth;
+        iheight = yscale * iheight;
+
+        Geom::Matrix itemTransform = getODFItemTransform(item);
+
+        Glib::ustring itemTransformString = formatTransform(itemTransform);
+
+        Glib::ustring href = getAttribute(node, "xlink:href");
+        std::map<Glib::ustring, Glib::ustring>::iterator iter = imageTable.find(href);
         if (iter == imageTable.end())
             {
             g_warning("image '%s' not in table", href.c_str());
             return false;
             }
-        std::string newName = iter->second;
+        Glib::ustring newName = iter->second;
 
-
-        outs.printf("<draw:frame ");
+        couts.printf("<draw:frame ");
         if (id.size() > 0)
-            outs.printf("id=\"%s\" ", id.c_str());
-        outs.printf("draw:style-name=\"gr1\" draw:text-style-name=\"P1\" draw:layer=\"layout\" ");
-        outs.printf("svg:x=\"%.3fcm\" svg:y=\"%.3fcm\" ",
-                                  ix, iy);
-        outs.printf("svg:width=\"%.3fcm\" svg:height=\"%.3fcm\" ",
+            couts.printf("id=\"%s\" ", id.c_str());
+        couts.printf("draw:style-name=\"gr1\" draw:text-style-name=\"P1\" draw:layer=\"layout\" ");
+        //no x or y.  make them the translate transform, last one
+        couts.printf("svg:width=\"%.3fcm\" svg:height=\"%.3fcm\" ",
                                   iwidth, iheight);
         if (itemTransformString.size() > 0)
-            outs.printf("draw:transform=\"%s\" ", itemTransformString.c_str());
+            {
+            couts.printf("draw:transform=\"%s translate(%.3fcm, %.3fcm)\" ",
+                           itemTransformString.c_str(), ix, iy);
+            }
+        else
+            {
+            couts.printf("draw:transform=\"translate(%.3fcm, %.3fcm)\" ",
+                                ix, iy);
+            }
 
-        outs.printf(">\n");
-        outs.printf("    <draw:image xlink:href=\"%s\" xlink:type=\"simple\"\n",
+        couts.printf(">\n");
+        couts.printf("    <draw:image xlink:href=\"%s\" xlink:type=\"simple\"\n",
                               newName.c_str());
-        outs.printf("        xlink:show=\"embed\" xlink:actuate=\"onLoad\">\n");
-        outs.printf("        <text:p/>\n");
-        outs.printf("    </draw:image>\n");
-        outs.printf("</draw:frame>\n");
+        couts.printf("        xlink:show=\"embed\" xlink:actuate=\"onLoad\">\n");
+        couts.printf("        <text:p/>\n");
+        couts.printf("    </draw:image>\n");
+        couts.printf("</draw:frame>\n");
         return true;
         }
     else if (SP_IS_SHAPE(item))
@@ -645,44 +2011,47 @@ bool OdfOutput::writeTree(Writer &outs, Inkscape::XML::Node *node)
 
     if (curve)
         {
-        //Inkscape::XML::Node *repr = sp_repr_new("svg:path");
-        /* Transformation */
-        //repr->setAttribute("transform", SP_OBJECT_REPR(item)->attribute("transform"));
+        //### Default <path> output
 
-        /* Rotation center */
-        //sp_repr_set_attr(repr, "inkscape:transform-center-x", SP_OBJECT_REPR(item)->attribute("inkscape:transform-center-x"));
-        //sp_repr_set_attr(repr, "inkscape:transform-center-y", SP_OBJECT_REPR(item)->attribute("inkscape:transform-center-y"));
-
-        /* Definition */
-
-        outs.printf("<draw:path ");
+        couts.printf("<draw:path ");
         if (id.size()>0)
-            outs.printf("id=\"%s\" ", id.c_str());
+            couts.printf("id=\"%s\" ", id.c_str());
+
+        std::map<Glib::ustring, Glib::ustring>::iterator siter;
+        siter = styleLookupTable.find(id);
+        if (siter != styleLookupTable.end())
+            {
+            Glib::ustring styleName = siter->second;
+            couts.printf("draw:style-name=\"%s\" ", styleName.c_str());
+            }
 
-        std::map<std::string, std::string>::iterator iter;
-        iter = styleLookupTable.find(id);
-        if (iter != styleLookupTable.end())
+        std::map<Glib::ustring, Glib::ustring>::iterator giter;
+        giter = gradientLookupTable.find(id);
+        if (giter != gradientLookupTable.end())
             {
-            std::string styleName = iter->second;
-            outs.printf("draw:style-name=\"%s\" ", styleName.c_str());
+            Glib::ustring gradientName = giter->second;
+            couts.printf("draw:fill-gradient-name=\"%s\" ",
+                 gradientName.c_str());
             }
 
-        outs.printf("draw:layer=\"layout\" svg:x=\"%.3fcm\" svg:y=\"%.3fcm\" ",
-                       x, y);
-       outs.printf("svg:width=\"%.3fcm\" svg:height=\"%.3fcm\" ",
-                      width, height);
-       outs.printf("svg:viewBox=\"0.0 0.0 %.3f %.3f\"\n",
-                      width * 1000.0, height * 1000.0);
+        couts.printf("draw:layer=\"layout\" svg:x=\"%.3fcm\" svg:y=\"%.3fcm\" ",
+                       bbox_x, bbox_y);
+        couts.printf("svg:width=\"%.3fcm\" svg:height=\"%.3fcm\" ",
+                       bbox_width, bbox_height);
+        couts.printf("svg:viewBox=\"0.0 0.0 %.3f %.3f\"\n",
+                       bbox_width * 1000.0, bbox_height * 1000.0);
 
-       outs.printf("    svg:d=\"");
-       writePath(outs, curve->bpath, tf, x, y);
-       outs.printf("\"");
+        couts.printf("    svg:d=\"");
+        int nrPoints = writePath(couts, curve->get_pathvector(),
+                             tf, bbox_x, bbox_y);
+        couts.printf("\"");
 
-       outs.printf(">\n");
-        outs.printf("</draw:path>\n");
+        couts.printf(">\n");
+        couts.printf("    <!-- %d nodes -->\n", nrPoints);
+        couts.printf("</draw:path>\n\n");
 
 
-        sp_curve_unref(curve);
+        curve->unref();
         }
 
     return true;
@@ -690,12 +2059,11 @@ bool OdfOutput::writeTree(Writer &outs, Inkscape::XML::Node *node)
 
 
 
-
-bool OdfOutput::writeContent(ZipFile &zf, Inkscape::XML::Node *node)
+/**
+ * Write the header for the content.xml file
+ */
+bool OdfOutput::writeStyleHeader(Writer &outs)
 {
-    BufferOutputStream bouts;
-    OutputStreamWriter outs(bouts);
-
     time_t tim;
     time(&tim);
 
@@ -704,14 +2072,14 @@ bool OdfOutput::writeContent(ZipFile &zf, Inkscape::XML::Node *node)
     outs.printf("\n");
     outs.printf("<!--\n");
     outs.printf("*************************************************************************\n");
-    outs.printf("  file:  content.xml\n");
+    outs.printf("  file:  styles.xml\n");
     outs.printf("  Generated by Inkscape: %s", ctime(&tim)); //ctime has its own <cr>
     outs.printf("  http://www.inkscape.org\n");
     outs.printf("*************************************************************************\n");
     outs.printf("-->\n");
     outs.printf("\n");
     outs.printf("\n");
-    outs.printf("<office:document-content\n");
+    outs.printf("<office:document-styles\n");
     outs.printf("    xmlns:office=\"urn:oasis:names:tc:opendocument:xmlns:office:1.0\"\n");
     outs.printf("    xmlns:style=\"urn:oasis:names:tc:opendocument:xmlns:style:1.0\"\n");
     outs.printf("    xmlns:text=\"urn:oasis:names:tc:opendocument:xmlns:text:1.0\"\n");
@@ -741,12 +2109,6 @@ bool OdfOutput::writeContent(ZipFile &zf, Inkscape::XML::Node *node)
     outs.printf("    office:version=\"1.0\">\n");
     outs.printf("\n");
     outs.printf("\n");
-    outs.printf("<office:scripts/>\n");
-    outs.printf("\n");
-    outs.printf("\n");
-    //AffineTransform trans = new AffineTransform();
-    //trans.scale(12.0, 12.0);
-    outs.printf("<!-- ######### CONVERSION FROM SVG STARTS ######## -->\n");
     outs.printf("<!--\n");
     outs.printf("*************************************************************************\n");
     outs.printf("  S T Y L E S\n");
@@ -756,16 +2118,121 @@ bool OdfOutput::writeContent(ZipFile &zf, Inkscape::XML::Node *node)
     outs.printf("*************************************************************************\n");
     outs.printf("-->\n");
     outs.printf("\n");
+    outs.printf("<office:styles>\n");
     outs.printf("\n");
 
-    if (!writeStyle(outs))
-        {
-        g_warning("Failed to write styles");
-        return false;
-        }
+    return true;
+}
+
+
+/**
+ * Write the footer for the style.xml file
+ */
+bool OdfOutput::writeStyleFooter(Writer &outs)
+{
+    outs.printf("\n");
+    outs.printf("</office:styles>\n");
+    outs.printf("\n");
+    outs.printf("\n");
+    outs.printf("<office:automatic-styles>\n");
+    outs.printf("<!-- ####### 'Standard' styles ####### -->\n");
+    outs.printf("<style:style style:name=\"dp1\" style:family=\"drawing-page\"/>\n");
+    outs.printf("<style:style style:name=\"gr1\" style:family=\"graphic\" style:parent-style-name=\"standard\">\n");
+    outs.printf("  <style:graphic-properties draw:stroke=\"none\" draw:fill=\"none\"\n");
+    outs.printf("       draw:textarea-horizontal-align=\"center\"\n");
+    outs.printf("       draw:textarea-vertical-align=\"middle\" draw:color-mode=\"standard\"\n");
+    outs.printf("       draw:luminance=\"0%%\" draw:contrast=\"0%%\" draw:gamma=\"100%%\" draw:red=\"0%%\"\n");
+    outs.printf("       draw:green=\"0%%\" draw:blue=\"0%%\" fo:clip=\"rect(0cm 0cm 0cm 0cm)\"\n");
+    outs.printf("       draw:image-opacity=\"100%%\" style:mirror=\"none\"/>\n");
+    outs.printf("</style:style>\n");
+    outs.printf("<style:style style:name=\"P1\" style:family=\"paragraph\">\n");
+    outs.printf("  <style:paragraph-properties fo:text-align=\"center\"/>\n");
+    outs.printf("</style:style>\n");
+    outs.printf("</office:automatic-styles>\n");
+    outs.printf("\n");
+    outs.printf("\n");
+    outs.printf("<office:master-styles>\n");
+    outs.printf("<draw:layer-set>\n");
+    outs.printf("    <draw:layer draw:name=\"layout\"/>\n");
+    outs.printf("    <draw:layer draw:name=\"background\"/>\n");
+    outs.printf("    <draw:layer draw:name=\"backgroundobjects\"/>\n");
+    outs.printf("    <draw:layer draw:name=\"controls\"/>\n");
+    outs.printf("    <draw:layer draw:name=\"measurelines\"/>\n");
+    outs.printf("</draw:layer-set>\n");
+    outs.printf("\n");
+    outs.printf("<style:master-page style:name=\"Default\"\n");
+    outs.printf("    style:page-master-name=\"PM1\" draw:style-name=\"dp1\"/>\n");
+    outs.printf("</office:master-styles>\n");
+    outs.printf("\n");
+    outs.printf("\n");
+    outs.printf("\n");
+    outs.printf("</office:document-styles>\n");
+    outs.printf("\n");
+    outs.printf("<!--\n");
+    outs.printf("*************************************************************************\n");
+    outs.printf("  E N D    O F    F I L E\n");
+    outs.printf("  Have a nice day  - ishmal\n");
+    outs.printf("*************************************************************************\n");
+    outs.printf("-->\n");
+    outs.printf("\n");
+
+    return true;
+}
+
+
 
+
+/**
+ * Write the header for the content.xml file
+ */
+bool OdfOutput::writeContentHeader(Writer &outs)
+{
+    time_t tim;
+    time(&tim);
+
+    outs.printf("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
+    outs.printf("\n");
+    outs.printf("\n");
+    outs.printf("<!--\n");
+    outs.printf("*************************************************************************\n");
+    outs.printf("  file:  content.xml\n");
+    outs.printf("  Generated by Inkscape: %s", ctime(&tim)); //ctime has its own <cr>
+    outs.printf("  http://www.inkscape.org\n");
+    outs.printf("*************************************************************************\n");
+    outs.printf("-->\n");
+    outs.printf("\n");
+    outs.printf("\n");
+    outs.printf("<office:document-content\n");
+    outs.printf("    xmlns:office=\"urn:oasis:names:tc:opendocument:xmlns:office:1.0\"\n");
+    outs.printf("    xmlns:style=\"urn:oasis:names:tc:opendocument:xmlns:style:1.0\"\n");
+    outs.printf("    xmlns:text=\"urn:oasis:names:tc:opendocument:xmlns:text:1.0\"\n");
+    outs.printf("    xmlns:table=\"urn:oasis:names:tc:opendocument:xmlns:table:1.0\"\n");
+    outs.printf("    xmlns:draw=\"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0\"\n");
+    outs.printf("    xmlns:fo=\"urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0\"\n");
+    outs.printf("    xmlns:xlink=\"http://www.w3.org/1999/xlink\"\n");
+    outs.printf("    xmlns:dc=\"http://purl.org/dc/elements/1.1/\"\n");
+    outs.printf("    xmlns:meta=\"urn:oasis:names:tc:opendocument:xmlns:meta:1.0\"\n");
+    outs.printf("    xmlns:number=\"urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0\"\n");
+    outs.printf("    xmlns:presentation=\"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0\"\n");
+    outs.printf("    xmlns:svg=\"urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0\"\n");
+    outs.printf("    xmlns:chart=\"urn:oasis:names:tc:opendocument:xmlns:chart:1.0\"\n");
+    outs.printf("    xmlns:dr3d=\"urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0\"\n");
+    outs.printf("    xmlns:math=\"http://www.w3.org/1998/Math/MathML\"\n");
+    outs.printf("    xmlns:form=\"urn:oasis:names:tc:opendocument:xmlns:form:1.0\"\n");
+    outs.printf("    xmlns:script=\"urn:oasis:names:tc:opendocument:xmlns:script:1.0\"\n");
+    outs.printf("    xmlns:ooo=\"http://openoffice.org/2004/office\"\n");
+    outs.printf("    xmlns:ooow=\"http://openoffice.org/2004/writer\"\n");
+    outs.printf("    xmlns:oooc=\"http://openoffice.org/2004/calc\"\n");
+    outs.printf("    xmlns:dom=\"http://www.w3.org/2001/xml-events\"\n");
+    outs.printf("    xmlns:xforms=\"http://www.w3.org/2002/xforms\"\n");
+    outs.printf("    xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\"\n");
+    outs.printf("    xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n");
+    outs.printf("    xmlns:smil=\"urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0\"\n");
+    outs.printf("    xmlns:anim=\"urn:oasis:names:tc:opendocument:xmlns:animation:1.0\"\n");
+    outs.printf("    office:version=\"1.0\">\n");
     outs.printf("\n");
     outs.printf("\n");
+    outs.printf("<office:scripts/>\n");
     outs.printf("\n");
     outs.printf("\n");
     outs.printf("<!--\n");
@@ -784,17 +2251,18 @@ bool OdfOutput::writeContent(ZipFile &zf, Inkscape::XML::Node *node)
     outs.printf("<draw:page draw:name=\"page1\" draw:style-name=\"dp1\"\n");
     outs.printf("        draw:master-page-name=\"Default\">\n");
     outs.printf("\n");
-    outs.printf("<draw:g draw:transform=\"scale(1,-1)\">\n");
     outs.printf("\n");
 
-    if (!writeTree(outs, node))
-        {
-        g_warning("Failed to convert SVG tree");
-        return false;
-        }
+    return true;
+}
 
+
+/**
+ * Write the footer for the content.xml file
+ */
+bool OdfOutput::writeContentFooter(Writer &outs)
+{
     outs.printf("\n");
-    outs.printf("</draw:g>\n");
     outs.printf("\n");
 
     outs.printf("</draw:page>\n");
@@ -820,29 +2288,93 @@ bool OdfOutput::writeContent(ZipFile &zf, Inkscape::XML::Node *node)
     outs.printf("\n");
     outs.printf("\n");
 
+    return true;
+}
+
 
 
-    //Make our entry
+/**
+ * Write the content.xml file.  Writes the namesspace headers, then
+ * calls writeTree().
+ */
+bool OdfOutput::writeContent(ZipFile &zf, Inkscape::XML::Node *node)
+{
+    //Content.xml stream
+    BufferOutputStream cbouts;
+    OutputStreamWriter couts(cbouts);
+
+    if (!writeContentHeader(couts))
+        return false;
+
+    //Style.xml stream
+    BufferOutputStream sbouts;
+    OutputStreamWriter souts(sbouts);
+
+    if (!writeStyleHeader(souts))
+        return false;
+
+
+    //# Descend into the tree, doing all of our conversions
+    //# to both files as the same time
+    if (!writeTree(couts, souts, node))
+        {
+        g_warning("Failed to convert SVG tree");
+        return false;
+        }
+
+
+
+    //# Finish content file
+    if (!writeContentFooter(couts))
+        return false;
+
     ZipEntry *ze = zf.newEntry("content.xml", "ODF master content file");
-    ze->setUncompressedData(bouts.getBuffer());
+    ze->setUncompressedData(cbouts.getBuffer());
+    ze->finish();
+
+
+
+    //# Finish style file
+    if (!writeStyleFooter(souts))
+        return false;
+
+    ze = zf.newEntry("styles.xml", "ODF style file");
+    ze->setUncompressedData(sbouts.getBuffer());
     ze->finish();
 
     return true;
 }
 
 
+/**
+ * Resets class to its pristine condition, ready to use again
+ */
+void
+OdfOutput::reset()
+{
+    metadata.clear();
+    styleTable.clear();
+    styleLookupTable.clear();
+    gradientTable.clear();
+    gradientLookupTable.clear();
+    imageTable.clear();
+
+
+}
 
 
 /**
  * Descends into the SVG tree, mapping things to ODF when appropriate
  */
 void
-OdfOutput::save(Inkscape::Extension::Output *mod, SPDocument *doc, gchar const *uri)
+OdfOutput::save(Inkscape::Extension::Output */*mod*/, SPDocument *doc, gchar const *uri)
 {
+    reset();
+
+    //g_message("native file:%s\n", uri);
+    documentUri = URI(uri);
+
     ZipFile zf;
-    styleTable.clear();
-    styleLookupTable.clear();
-    imageTable.clear();
     preprocess(zf, doc->rroot);
 
     if (!writeManifest(zf))
@@ -851,15 +2383,15 @@ OdfOutput::save(Inkscape::Extension::Output *mod, SPDocument *doc, gchar const *
         return;
         }
 
-    if (!writeMeta(zf))
+    if (!writeContent(zf, doc->rroot))
         {
-        g_warning("Failed to write metafile");
+        g_warning("Failed to write content");
         return;
         }
 
-    if (!writeContent(zf, doc->rroot))
+    if (!writeMeta(zf))
         {
-        g_warning("Failed to write content");
+        g_warning("Failed to write metafile");
         return;
         }
 
@@ -879,7 +2411,7 @@ void
 OdfOutput::init()
 {
     Inkscape::Extension::build_from_mem(
-        "<inkscape-extension>\n"
+        "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
             "<name>" N_("OpenDocument Drawing Output") "</name>\n"
             "<id>org.inkscape.output.odf</id>\n"
             "<output>\n"
@@ -896,7 +2428,7 @@ OdfOutput::init()
  * Make sure that we are in the database
  */
 bool
-OdfOutput::check (Inkscape::Extension::Extension *module)
+OdfOutput::check (Inkscape::Extension::Extension */*module*/)
 {
     /* We don't need a Key
     if (NULL == Inkscape::Extension::db.get(SP_MODULE_KEY_OUTPUT_POV))