update to trunk (r13528)

(bzr r13506.1.18)

22 files changed, 157 insertions, 119 deletions

diff --git a/src/display/canvas-axonomgrid.cpp b/src/display/canvas-axonomgrid.cpp
index 312a8d655..592c962a6 100644
--- a/src/display/canvas-axonomgrid.cpp
+++ b/src/display/canvas-axonomgrid.cpp
@@ -387,6 +387,9 @@ _wr.setUpdating (false);
     _rcp_gmcol->setRgba32 (empcolor);
     _rsi->setValue (empspacing);
 
+    _rsu_ox->setProgrammatically = false;
+    _rsu_oy->setProgrammatically = false;
+
     return table;
 }
 
diff --git a/src/file.cpp b/src/file.cpp
index 51e629c7d..200077de5 100644
--- a/src/file.cpp
+++ b/src/file.cpp
@@ -148,14 +148,14 @@ SPDesktop *sp_file_new(const std::string &templ)
         DocumentUndo::setUndoSensitive(doc, true);
     }
     
-    SPDesktop *desktop = SP_ACTIVE_DESKTOP;
-    if (desktop)
-        desktop->setWaitingCursor();
+    SPDesktop *olddesktop = SP_ACTIVE_DESKTOP;
+    if (olddesktop)
+        olddesktop->setWaitingCursor();
     
     SPViewWidget *dtw = sp_desktop_widget_new(sp_document_namedview(doc, NULL)); // TODO this will trigger broken link warnings, etc.
     g_return_val_if_fail(dtw != NULL, NULL);
     sp_create_window(dtw, TRUE);
-    desktop = static_cast<SPDesktop *>(dtw->view);
+    SPDesktop* desktop = static_cast<SPDesktop *>(dtw->view);
 
     doc->doUnref();
 
@@ -166,6 +166,8 @@ SPDesktop *sp_file_new(const std::string &templ)
     Inkscape::Extension::Dbus::dbus_init_desktop_interface(desktop);
 #endif
     
+    if (olddesktop)
+        olddesktop->clearWaitingCursor();
     if (desktop)
         desktop->clearWaitingCursor();
 
@@ -1087,9 +1089,9 @@ void sp_import_document(SPDesktop *desktop, SPDocument *clipdoc, bool in_place)
     Inkscape::Selection *selection = sp_desktop_selection(desktop);
     selection->setReprList(pasted_objects);
 
-    // invers apply parent transform
+    // Apply inverse of parent transform
     Geom::Affine doc2parent = SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse();
-    sp_selection_apply_affine(selection, desktop->dt2doc() * doc2parent * desktop->doc2dt(), true, false);
+    sp_selection_apply_affine(selection, desktop->dt2doc() * doc2parent * desktop->doc2dt(), true, false, false);
 
     // Update (among other things) all curves in paths, for bounds() to work
     target_document->ensureUpToDate();
@@ -1226,7 +1228,7 @@ file_import(SPDocument *in_doc, const Glib::ustring &uri,
             // c2p is identity matrix at this point unless ensureUpToDate is called
             doc->ensureUpToDate();
             Geom::Affine affine = doc->getRoot()->c2p * SP_ITEM(place_to_insert)->i2doc_affine().inverse();
-            sp_selection_apply_affine(selection, desktop->dt2doc() * affine * desktop->doc2dt(), true, false);
+            sp_selection_apply_affine(selection, desktop->dt2doc() * affine * desktop->doc2dt(), true, false, false);
 
             // move to mouse pointer
             {
diff --git a/src/ink-comboboxentry-action.cpp b/src/ink-comboboxentry-action.cpp
index ebd238edc..6579c8ff8 100644
--- a/src/ink-comboboxentry-action.cpp
+++ b/src/ink-comboboxentry-action.cpp
@@ -383,6 +383,15 @@ GtkWidget* create_tool_item( GtkAction* action )
 
     g_signal_connect( G_OBJECT(comboBoxEntry), "changed", G_CALLBACK(combo_box_changed_cb), action );
 
+    // Optionally add separator function...
+    if( ink_comboboxentry_action->separator_func != NULL ) {
+       gtk_combo_box_set_row_separator_func( ink_comboboxentry_action->combobox,
+					    GtkTreeViewRowSeparatorFunc (ink_comboboxentry_action->separator_func),
+      					    NULL, NULL );
+    }
+
+    gtk_widget_show_all (comboBoxEntry);
+
     // Optionally add formatting...
     if( ink_comboboxentry_action->cell_data_func != NULL ) {
       GtkCellRenderer *cell = gtk_cell_renderer_text_new();
@@ -393,13 +402,6 @@ GtkWidget* create_tool_item( GtkAction* action )
                                           NULL, NULL );
     }
 
-    // Optionally add separator function...
-    if( ink_comboboxentry_action->separator_func != NULL ) {
-       gtk_combo_box_set_row_separator_func( ink_comboboxentry_action->combobox,
-					    GtkTreeViewRowSeparatorFunc (ink_comboboxentry_action->separator_func),
-      					    NULL, NULL );
-    }
-
     // Optionally widen the combobox width... which widens the drop-down list in list mode.
     if( ink_comboboxentry_action->extra_width > 0 ) {
       GtkRequisition req;
diff --git a/src/inkscape-x64.rc b/src/inkscape-x64.rc
index ce286c2ca..65a2b08b9 100644
--- a/src/inkscape-x64.rc
+++ b/src/inkscape-x64.rc
@@ -3,8 +3,8 @@ APPLICATION_ICON    ICON          DISCARDABLE     "../inkscape.ico"
 1                   24            DISCARDABLE     "./inkscape-manifest-x64.xml"
 
 1 VERSIONINFO
-    FILEVERSION     0,48,0,9
-    PRODUCTVERSION  0,48,0,9
+    FILEVERSION     0,91,0,0
+    PRODUCTVERSION  0,91,0,0
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
@@ -13,11 +13,11 @@ BEGIN
             VALUE "Comments", "Published under the GNU GPL"
             VALUE "CompanyName", "inkscape.org"
             VALUE "FileDescription", "Inkscape"
-            VALUE "FileVersion", "0.48+devel"
+            VALUE "FileVersion", "0.91pre2"
             VALUE "InternalName", "Inkscape"
             VALUE "LegalCopyright", "© 2014 Inkscape"
             VALUE "ProductName", "Inkscape"
-            VALUE "ProductVersion", "0.48+devel"
+            VALUE "ProductVersion", "0.91pre2"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/inkscape.rc b/src/inkscape.rc
index 395ef39e1..689653f74 100644
--- a/src/inkscape.rc
+++ b/src/inkscape.rc
@@ -3,8 +3,8 @@ APPLICATION_ICON    ICON          DISCARDABLE     "../inkscape.ico"
 1                   24            DISCARDABLE     "./inkscape-manifest.xml"
 
 1 VERSIONINFO
-    FILEVERSION     0,48,0,9
-    PRODUCTVERSION  0,48,0,9
+    FILEVERSION     0,91,0,0
+    PRODUCTVERSION  0,91,0,0
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
@@ -13,11 +13,11 @@ BEGIN
             VALUE "Comments", "Published under the GNU GPL"
             VALUE "CompanyName", "inkscape.org"
             VALUE "FileDescription", "Inkscape"
-            VALUE "FileVersion", "0.48+devel"
+            VALUE "FileVersion", "0.91pre2"
             VALUE "InternalName", "Inkscape"
             VALUE "LegalCopyright", "© 2014 Inkscape"
             VALUE "ProductName", "Inkscape"
-            VALUE "ProductVersion", "0.48+devel"
+            VALUE "ProductVersion", "0.91pre2"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/inkview-x64.rc b/src/inkview-x64.rc
index 2de16060b..f23fe84c9 100644
--- a/src/inkview-x64.rc
+++ b/src/inkview-x64.rc
@@ -3,8 +3,8 @@ APPLICATION_ICON    ICON          DISCARDABLE     "../inkscape.ico"
 1                   24            DISCARDABLE     "./inkview-manifest-x64.xml"
 
 1 VERSIONINFO
-    FILEVERSION     0,48,0,9
-    PRODUCTVERSION  0,48,0,9
+    FILEVERSION     0,91,0,0
+    PRODUCTVERSION  0,91,0,0
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
@@ -13,11 +13,11 @@ BEGIN
             VALUE "Comments", "Published under the GNU GPL"
             VALUE "CompanyName", "inkscape.org"
             VALUE "FileDescription", "Inkview"
-            VALUE "FileVersion", "0.48+devel"
+            VALUE "FileVersion", "0.91pre2"
             VALUE "InternalName", "Inkview"
             VALUE "LegalCopyright", "© 2014 Inkscape"
             VALUE "ProductName", "Inkview"
-            VALUE "ProductVersion", "0.48+devel"
+            VALUE "ProductVersion", "0.91pre2"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/inkview.rc b/src/inkview.rc
index fd7eb50a1..43a63c725 100644
--- a/src/inkview.rc
+++ b/src/inkview.rc
@@ -3,8 +3,8 @@ APPLICATION_ICON    ICON          DISCARDABLE     "../inkscape.ico"
 1                   24            DISCARDABLE     "./inkview-manifest.xml"
 
 1 VERSIONINFO
-    FILEVERSION     0,48,0,9
-    PRODUCTVERSION  0,48,0,9
+    FILEVERSION     0,91,0,0
+    PRODUCTVERSION  0,91,0,0
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
@@ -13,11 +13,11 @@ BEGIN
             VALUE "Comments", "Published under the GNU GPL"
             VALUE "CompanyName", "inkscape.org"
             VALUE "FileDescription", "Inkview"
-            VALUE "FileVersion", "0.48+devel"
+            VALUE "FileVersion", "0.91pre2"
             VALUE "InternalName", "Inkview"
             VALUE "LegalCopyright", "© 2014 Inkscape"
             VALUE "ProductName", "Inkview"
-            VALUE "ProductVersion", "0.48+devel"
+            VALUE "ProductVersion", "0.91pre2"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/src/live_effects/parameter/parameter.cpp b/src/live_effects/parameter/parameter.cpp
index a5de2169e..ad2960cd9 100644
--- a/src/live_effects/parameter/parameter.cpp
+++ b/src/live_effects/parameter/parameter.cpp
@@ -36,13 +36,19 @@ Parameter::Parameter( const Glib::ustring& label, const Glib::ustring& tip,
 {
 }
 
-
 void
 Parameter::param_write_to_repr(const char * svgd)
 {
     param_effect->getRepr()->setAttribute(param_key.c_str(), svgd);
 }
 
+void Parameter::write_to_SVG(void)
+{
+    gchar * str = param_getSVGValue();
+    param_write_to_repr(str);
+    g_free(str);
+}
+
 /*###########################################
  *   REAL PARAM
  */
diff --git a/src/live_effects/parameter/parameter.h b/src/live_effects/parameter/parameter.h
index 785ada92e..2e6cae49f 100644
--- a/src/live_effects/parameter/parameter.h
+++ b/src/live_effects/parameter/parameter.h
@@ -49,7 +49,7 @@ public:
 
     virtual bool param_readSVGValue(const gchar * strvalue) = 0;   // returns true if new value is valid / accepted.
     virtual gchar * param_getSVGValue() const = 0;
-    void write_to_SVG() { param_write_to_repr(param_getSVGValue()); }
+    void write_to_SVG();
  
     virtual void param_set_default() = 0;
 
diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp
index f058189d3..01ce20509 100644
--- a/src/selection-chemistry.cpp
+++ b/src/selection-chemistry.cpp
@@ -1466,7 +1466,7 @@ value of set_i2d==false is only used by seltrans when it's dragging objects live
 that case, items are already in the new position, but the repr is in the old, and this function
 then simply updates the repr from item->transform.
  */
-void sp_selection_apply_affine(Inkscape::Selection *selection, Geom::Affine const &affine, bool set_i2d, bool compensate)
+void sp_selection_apply_affine(Inkscape::Selection *selection, Geom::Affine const &affine, bool set_i2d, bool compensate, bool adjust_transf_center)
 {
     if (selection->isEmpty())
         return;
@@ -1621,14 +1621,13 @@ void sp_selection_apply_affine(Inkscape::Selection *selection, Geom::Affine cons
             item->doWriteTransform(item->getRepr(), item->transform, NULL, compensate);
         }
 
-        // if we're transforming the actual object, not just updating the repr, we can transform the
-        // center by the same matrix (only necessary for non-translations)
-        if (set_i2d && item->isCenterSet() && !(affine.isTranslation() || affine.isIdentity())) {
-            // If there's a viewbox, we might have an affine with a translation component;
-            // we will only apply the scaling/skewing components, not the translations
-            // because otherwise the center will move relative to the item
-            item->setCenter(old_center * affine.withoutTranslation());
-            item->updateRepr();
+        if (adjust_transf_center) { // The transformation center should not be touched in case of pasting or importing, which is allowed by this if clause
+            // if we're moving the actual object, not just updating the repr, we can transform the
+            // center by the same matrix (only necessary for non-translations)
+            if (set_i2d && item->isCenterSet() && !(affine.isTranslation() || affine.isIdentity())) {
+                item->setCenter(old_center * affine);
+                item->updateRepr();
+            }
         }
     }
 }
diff --git a/src/selection-chemistry.h b/src/selection-chemistry.h
index d76a67a9d..01c35d65a 100644
--- a/src/selection-chemistry.h
+++ b/src/selection-chemistry.h
@@ -104,7 +104,7 @@ void sp_selection_to_next_layer( SPDesktop *desktop, bool suppressDone = false )
 void sp_selection_to_prev_layer( SPDesktop *desktop, bool suppressDone = false );
 void sp_selection_to_layer( SPDesktop *desktop, SPObject *layer, bool suppressDone = false );
 
-void sp_selection_apply_affine(Inkscape::Selection *selection, Geom::Affine const &affine, bool set_i2d = true, bool compensate = true);
+void sp_selection_apply_affine(Inkscape::Selection *selection, Geom::Affine const &affine, bool set_i2d = true, bool compensate = true, bool adjust_transf_center = true);
 void sp_selection_remove_transform (SPDesktop *desktop);
 void sp_selection_scale_absolute (Inkscape::Selection *selection, double x0, double x1, double y0, double y1);
 void sp_selection_scale_relative(Inkscape::Selection *selection, Geom::Point const &align, Geom::Scale const &scale);
diff --git a/src/snap.cpp b/src/snap.cpp
index ea6322e37..5b795b22f 100644
--- a/src/snap.cpp
+++ b/src/snap.cpp
@@ -274,7 +274,7 @@ Inkscape::SnappedPoint SnapManager::constrainedSnap(Inkscape::SnapCandidatePoint
 
 /* See the documentation for constrainedSnap() directly above for more details.
  * The difference is that multipleConstrainedSnaps() will take a list of constraints instead of a single one,
- * and will try to snap the SnapCandidatePoint to all of the provided constraints and see which one fits best
+ * and will try to snap the SnapCandidatePoint to only the closest constraint
  *  \param p Source point to be snapped
  *  \param constraints List of directions or lines along which snapping must occur
  *  \param dont_snap If true then we will only apply the constraint, without snapping
@@ -293,16 +293,11 @@ Inkscape::SnappedPoint SnapManager::multipleConstrainedSnaps(Inkscape::SnapCandi
         return no_snap;
     }
 
-    IntermSnapResults isr;
-    SnapperList const snappers = getSnappers();
-    std::vector<Geom::Point> projections;
-    bool snapping_is_futile = !someSnapperMightSnap() || dont_snap;
-
-    Inkscape::SnappedPoint result = no_snap;
-
-    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-    bool snap_mouse = prefs->getBool("/options/snapmousepointer/value", false);
+    // We haven't tried to snap yet; we will first determine which constraint is closest to where we are now,
+    // i.e. lets find out which of the constraints yields the closest projection of point p
 
+    // Project the mouse pointer on each of the constraints
+    std::vector<Geom::Point> projections;
     for (std::vector<Inkscape::Snapper::SnapConstraint>::const_iterator c = constraints.begin(); c != constraints.end(); ++c) {
         // Project the mouse pointer onto the constraint; In case we don't snap then we will
         // return the projection onto the constraint, such that the constraint is always enforced
@@ -310,55 +305,47 @@ Inkscape::SnappedPoint SnapManager::multipleConstrainedSnaps(Inkscape::SnapCandi
         projections.push_back(pp);
     }
 
-    if (snap_mouse && p.isSingleHandle() && !dont_snap) {
+    // Select the closest constraint
+    no_snap.setPoint(projections.front());
+    Inkscape::Snapper::SnapConstraint cc = constraints.front(); //closest constraint
+
+    std::vector<Inkscape::Snapper::SnapConstraint>::const_iterator c = constraints.begin();
+    std::vector<Geom::Point>::iterator pp = projections.begin();
+    for (; pp != projections.end(); ++pp) {
+        if (Geom::L2(*pp - p.getPoint()) < Geom::L2(no_snap.getPoint() - p.getPoint())) {
+            no_snap.setPoint(*pp); // Remember the projection onto the closest constraint
+            cc = *c; // Remember the closest constraint itself
+        }
+        ++c;
+    }
+
+    if (!someSnapperMightSnap() || dont_snap) {
+        return no_snap;
+    }
+
+    IntermSnapResults isr;
+    SnapperList const snappers = getSnappers();
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    bool snap_mouse = prefs->getBool("/options/snapmousepointer/value", false);
+
+    Inkscape::SnappedPoint result = no_snap;
+    if (snap_mouse && p.isSingleHandle()) {
         // Snapping the mouse pointer instead of the constrained position of the knot allows
         // to snap to things which don't intersect with the constraint line; this is basically
         // then just a freesnap with the constraint applied afterwards
         // We'll only to this if we're dragging a single handle, and for example not when transforming an object in the selector tool
         result = freeSnap(p, bbox_to_snap);
+        // Now apply the constraint afterwards
+        result.setPoint(cc.projection(result.getPoint()));
     } else {
-        // Iterate over the constraints
-        for (std::vector<Inkscape::Snapper::SnapConstraint>::const_iterator c = constraints.begin(); c != constraints.end(); ++c) {
-            // Try to snap to the constraint
-            if (!snapping_is_futile) {
-                for (SnapperList::const_iterator i = snappers.begin(); i != snappers.end(); ++i) {
-                    (*i)->constrainedSnap(isr, p, bbox_to_snap, *c, &_items_to_ignore,_unselected_nodes);
-                }
-            }
+        // Try to snap along the closest constraint
+        for (SnapperList::const_iterator i = snappers.begin(); i != snappers.end(); ++i) {
+            (*i)->constrainedSnap(isr, p, bbox_to_snap, cc, &_items_to_ignore,_unselected_nodes);
         }
         result = findBestSnap(p, isr, true);
     }
 
-    if (result.getSnapped()) {
-        if (snap_mouse) {
-            // If "snap_mouse" then we still have to apply the constraint, because so far we only tried a freeSnap
-            Geom::Point result_closest;
-            for (std::vector<Inkscape::Snapper::SnapConstraint>::const_iterator c = constraints.begin(); c != constraints.end(); ++c) {
-                // Project the mouse pointer onto the constraint; In case we don't snap then we will
-                // return the projection onto the constraint, such that the constraint is always enforced
-                Geom::Point result_p = (*c).projection(result.getPoint());
-                if (c == constraints.begin() || (Geom::L2(result_p - p.getPoint()) < Geom::L2(result_closest - p.getPoint()))) {
-                    result_closest = result_p;
-                }
-            }
-            result.setPoint(result_closest);
-        }
-        return result;
-    }
-
-    // So we didn't snap, but we still need to return a point on one of the constraints
-    // Find out which of the constraints yielded the closest projection of point p
-    for (std::vector<Geom::Point>::iterator pp = projections.begin(); pp != projections.end(); ++pp) {
-        if (pp != projections.begin()) {
-            if (Geom::L2(*pp - p.getPoint()) < Geom::L2(no_snap.getPoint() - p.getPoint())) {
-                no_snap.setPoint(*pp);
-            }
-        } else {
-            no_snap.setPoint(projections.front());
-        }
-    }
-
-    return no_snap;
+    return result.getSnapped() ? result : no_snap;
 }
 
 Inkscape::SnappedPoint SnapManager::constrainedAngularSnap(Inkscape::SnapCandidatePoint const &p,
diff --git a/src/sp-item-group.cpp b/src/sp-item-group.cpp
index 657aca692..bb52b0c55 100644
--- a/src/sp-item-group.cpp
+++ b/src/sp-item-group.cpp
@@ -660,12 +660,6 @@ void SPGroup::scaleChildItemsRec(Geom::Scale const &sc, Geom::Point const &p)
                         Geom::Translate const s(p);
                         Geom::Affine final = s.inverse() * sc * s;
                         
-                        Geom::Point old_center(0,0);
-                        if (item->isCenterSet()) {
-                            item->scaleCenter(sc.inverse()); // Convert the old relative center position to the new coordinates already now
-                            old_center = item->getCenter(); // because getCenter() will use the bbox midpoint, which is also already in the new coordinates
-                        }
-                        
                         gchar const *conn_type = NULL;
                         if (SP_IS_TEXT_TEXTPATH(item)) {
                             SP_TEXT(item)->optimizeTextpathText();
@@ -710,7 +704,7 @@ void SPGroup::scaleChildItemsRec(Geom::Scale const &sc, Geom::Point const &p)
                         }
                         
                         if (item->isCenterSet() && !(final.isTranslation() || final.isIdentity())) {
-                            item->setCenter(old_center * final);
+                            item->scaleCenter(sc); // All coordinates have been scaled, so also the center must be scaled
                             item->updateRepr();
                         }
                     }
diff --git a/src/sp-item.cpp b/src/sp-item.cpp
index 0cacc86b1..428f9555e 100644
--- a/src/sp-item.cpp
+++ b/src/sp-item.cpp
@@ -228,18 +228,25 @@ void SPItem::setExplicitlyHidden(bool val) {
 }
 
 /**
- * Sets the transform_center_x and transform_center_y properties to retain the rotation centre
- */
+ * Sets the transform_center_x and transform_center_y properties to retain the rotation center
+*/
 void SPItem::setCenter(Geom::Point const &object_centre) {
     document->ensureUpToDate();
 
+    // Copied from DocumentProperties::onDocUnitChange()
+    gdouble viewscale_w = this->document->getWidth().value("px") / this->document->getRoot()->viewBox.width();
+    gdouble viewscale_h = this->document->getHeight().value("px")/ this->document->getRoot()->viewBox.height();
+    gdouble viewscale = std::min(viewscale_h, viewscale_w);
+
     // FIXME this is seriously wrong
     Geom::OptRect bbox = desktopGeometricBounds();
     if (bbox) {
-        transform_center_x = object_centre[Geom::X] - bbox->midpoint()[Geom::X];
+        // object centre is document coordinates (i.e. in pixels), so we need to consider the viewbox
+        // to translate to user units; transform_center_x/y is in user units
+        transform_center_x = (object_centre[Geom::X] - bbox->midpoint()[Geom::X])/viewscale;
         if (Geom::are_near(transform_center_x, 0)) // rounding error
             transform_center_x = 0;
-        transform_center_y = object_centre[Geom::Y] - bbox->midpoint()[Geom::Y];
+        transform_center_y = (object_centre[Geom::Y] - bbox->midpoint()[Geom::Y])/viewscale;
         if (Geom::are_near(transform_center_y, 0)) // rounding error
             transform_center_y = 0;
     }
@@ -255,16 +262,25 @@ bool SPItem::isCenterSet() const {
     return (transform_center_x != 0 || transform_center_y != 0);
 }
 
+// Get the item's transformation center in document coordinates (i.e. in pixels)
 Geom::Point SPItem::getCenter() const {
     document->ensureUpToDate();
 
+    // Copied from DocumentProperties::onDocUnitChange()
+    gdouble viewscale_w = this->document->getWidth().value("px") / this->document->getRoot()->viewBox.width();
+    gdouble viewscale_h = this->document->getHeight().value("px")/ this->document->getRoot()->viewBox.height();
+    gdouble viewscale = std::min(viewscale_h, viewscale_w);
+
     // FIXME this is seriously wrong
     Geom::OptRect bbox = desktopGeometricBounds();
     if (bbox) {
-        return bbox->midpoint() + Geom::Point (transform_center_x, transform_center_y);
+        // transform_center_x/y are stored in user units, so we have to take the viewbox into account to translate to document coordinates
+        return bbox->midpoint() + Geom::Point (transform_center_x*viewscale, transform_center_y*viewscale);
+
     } else {
         return Geom::Point(0, 0); // something's wrong!
     }
+
 }
 
 void
diff --git a/src/sp-solid-color.cpp b/src/sp-solid-color.cpp
index 1f606d176..9f6692f98 100644
--- a/src/sp-solid-color.cpp
+++ b/src/sp-solid-color.cpp
@@ -72,7 +72,7 @@ Inkscape::XML::Node* SPSolidColor::write(Inkscape::XML::Document* xml_doc, Inksc
     return repr;
 }
 
-cairo_pattern_t* SPSolidColor::pattern_new(cairo_t * /*ct*/, Geom::OptRect const &bbox, double opacity) {
+cairo_pattern_t* SPSolidColor::pattern_new(cairo_t * /*ct*/, Geom::OptRect const & /*bbox*/, double opacity) {
 
     SPIColor *c = &(this->style->solid_color);
     cairo_pattern_t *cp = cairo_pattern_create_rgba ( c->value.color.v.c[0], c->value.color.v.c[1], c->value.color.v.c[2], SP_SCALE24_TO_FLOAT(this->style->solid_opacity.value) * opacity );
diff --git a/src/ui/dialog/document-properties.cpp b/src/ui/dialog/document-properties.cpp
index 9141b2268..4e4616724 100644
--- a/src/ui/dialog/document-properties.cpp
+++ b/src/ui/dialog/document-properties.cpp
@@ -45,6 +45,7 @@
 #include "widgets/icon.h"
 #include "xml/node-event-vector.h"
 #include "xml/repr.h"
+#include <algorithm>    // std::min
 
 #include "rdf.h"
 #include "ui/widget/entity-entry.h"
@@ -1735,9 +1736,9 @@ void DocumentProperties::onDocUnitChange()
     prefs->setBool("/options/transform/gradient", true);
     {
         ShapeEditor::blockSetItem(true);
-        gdouble viewscale = doc->getWidth().value("px")/doc->getRoot()->viewBox.width();
-        if (doc->getHeight().value("px")/doc->getRoot()->viewBox.height() < viewscale)
-            viewscale = doc->getHeight().value("px")/doc->getRoot()->viewBox.height();
+        gdouble viewscale_w = doc->getWidth().value("px")/doc->getRoot()->viewBox.width();
+        gdouble viewscale_h = doc->getHeight().value("px")/doc->getRoot()->viewBox.height();
+        gdouble viewscale = std::min(viewscale_h, viewscale_w);
         gdouble scale = Inkscape::Util::Quantity::convert(1, old_doc_unit, doc_unit);
         doc->getRoot()->scaleChildItemsRec(Geom::Scale(scale), Geom::Point(-viewscale*doc->getRoot()->viewBox.min()[Geom::X] +
                                                                             (doc->getWidth().value("px") - viewscale*doc->getRoot()->viewBox.width())/2,
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index f1a29e971..5d065dc60 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -76,7 +76,8 @@ InkscapePreferences::InkscapePreferences()
     : UI::Widget::Panel ("", "/dialogs/preferences", SP_VERB_DIALOG_DISPLAY),
       _max_dialog_width(0),
       _max_dialog_height(0),
-      _current_page(0)
+      _current_page(0),
+      _init(true)
 {
     //get the width of a spinbutton
     Inkscape::UI::Widget::SpinButton* sb = new Inkscape::UI::Widget::SpinButton;
@@ -2000,6 +2001,7 @@ bool InkscapePreferences::PresentPage(const Gtk::TreeModel::iterator& iter)
     Gtk::TreeModel::Row row = *iter;
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     int desired_page = prefs->getInt("/dialogs/preferences/page", 0);
+    _init = false;
     if (desired_page == row[_page_list_columns._col_id])
     {
         if (desired_page >= PREFS_PAGE_TOOLS && desired_page <= PREFS_PAGE_TOOLS_CONNECTOR)
@@ -2049,7 +2051,9 @@ void InkscapePreferences::on_pagelist_selection_changed()
         Gtk::TreeModel::Row row = *iter;
         _current_page = row[_page_list_columns._col_page];
         Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-        prefs->setInt("/dialogs/preferences/page", row[_page_list_columns._col_id]);
+        if (!_init) {
+            prefs->setInt("/dialogs/preferences/page", row[_page_list_columns._col_id]);
+        }
         _page_title.set_markup("<span size='large'><b>" + row[_page_list_columns._col_name] + "</b></span>");
         _page_frame.add(*_current_page);
         _current_page->show();
diff --git a/src/ui/dialog/inkscape-preferences.h b/src/ui/dialog/inkscape-preferences.h
index 1c2151605..9f37626ed 100644
--- a/src/ui/dialog/inkscape-preferences.h
+++ b/src/ui/dialog/inkscape-preferences.h
@@ -532,6 +532,7 @@ private:
     InkscapePreferences();
     InkscapePreferences(InkscapePreferences const &d);
     InkscapePreferences operator=(InkscapePreferences const &d);
+    bool _init;
 };
 
 } // namespace Dialog
diff --git a/src/ui/dialog/print.cpp b/src/ui/dialog/print.cpp
index 03ac9dc64..ed39ebb32 100644
--- a/src/ui/dialog/print.cpp
+++ b/src/ui/dialog/print.cpp
@@ -13,13 +13,16 @@
 #ifdef HAVE_CONFIG_H
 # include <config.h>
 #endif
+
 #ifdef WIN32
 #include <io.h>
 #include <windows.h>
 #endif
 
+#include <gtkmm.h>
+
+#include "preferences.h"
 #include "print.h"
-#include <gtkmm/stock.h>
 
 #include "extension/internal/cairo-render-context.h"
 #include "extension/internal/cairo-renderer.h"
@@ -44,14 +47,18 @@ static void draw_page(
                       gint               /*page_nr*/,
                       gpointer           user_data)
 {
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     struct workaround_gtkmm *junk = (struct workaround_gtkmm*)user_data;
     //printf("%s %d\n",__FUNCTION__, page_nr);
 
     if (junk->_tab->as_bitmap()) {
         // Render as exported PNG
+        prefs->setBool("/dialogs/printing/asbitmap", true);
         gdouble width = (junk->_doc)->getWidth().value("px");
         gdouble height = (junk->_doc)->getHeight().value("px");
         gdouble dpi = junk->_tab->bitmap_dpi();
+        prefs->setDouble("/dialogs/printing/dpi", dpi);
+        
         std::string tmp_png;
         std::string tmp_base = "inkscape-print-png-XXXXXX";
 
@@ -92,7 +99,7 @@ static void draw_page(
                 cairo_get_matrix(cr, &m);
                 cairo_scale(cr, Inkscape::Util::Quantity::convert(1, "in", "pt") / dpi, Inkscape::Util::Quantity::convert(1, "in", "pt") / dpi);
                 // FIXME: why is the origin offset??
-                cairo_set_source_surface(cr, png->cobj(), -16.0, -16.0);
+                cairo_set_source_surface(cr, png->cobj(), 0, 0);
                 cairo_paint(cr);
                 cairo_set_matrix(cr, &m);
             }
@@ -106,6 +113,7 @@ static void draw_page(
     }
     else {
         // Render as vectors
+        prefs->setBool("/dialogs/printing/asbitmap", false);
         Inkscape::Extension::Internal::CairoRenderer renderer;
         Inkscape::Extension::Internal::CairoRenderContext *ctx = renderer.createContext();
 
diff --git a/src/ui/widget/rendering-options.cpp b/src/ui/widget/rendering-options.cpp
index d6248df69..837387f7b 100644
--- a/src/ui/widget/rendering-options.cpp
+++ b/src/ui/widget/rendering-options.cpp
@@ -12,6 +12,9 @@
 # include <config.h>
 #endif
 
+#include <gtkmm.h>
+
+#include "preferences.h"
 #include "rendering-options.h"
 #include "util/units.h"
 #include <glibmm/i18n.h>
@@ -38,6 +41,7 @@ RenderingOptions::RenderingOptions () :
             Glib::ustring(""), Glib::ustring(""),
             false)
 {
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     // set up tooltips
     _radio_vector.set_tooltip_text(
                         _("Render using Cairo vector operations.  "
@@ -52,15 +56,21 @@ RenderingOptions::RenderingOptions () :
 
     set_border_width(2);
 
-    // default to vector operations
-    _radio_vector.set_active (true);
     Gtk::RadioButtonGroup group = _radio_vector.get_group ();
     _radio_bitmap.set_group (group);
     _radio_bitmap.signal_toggled().connect(sigc::mem_fun(*this, &RenderingOptions::_toggled));
-
+    
+    // default to vector operations
+    if (prefs->getBool("/dialogs/printing/asbitmap", false)) {
+        _radio_bitmap.set_active();
+    } else {
+        _radio_vector.set_active();
+    }
+    
     // configure default DPI
     _dpi.setRange(Inkscape::Util::Quantity::convert(1, "in", "pt"),2400.0);
-    _dpi.setValue(Inkscape::Util::Quantity::convert(1, "in", "pt"));
+    _dpi.setValue(prefs->getDouble("/dialogs/printing/dpi", 
+                                   Inkscape::Util::Quantity::convert(1, "in", "pt")));
     _dpi.setIncrements(1.0,10.0);
     _dpi.setDigits(0);
     _dpi.update();
diff --git a/src/util/units.cpp b/src/util/units.cpp
index d2053f60b..eb4a313e0 100644
--- a/src/util/units.cpp
+++ b/src/util/units.cpp
@@ -291,11 +291,15 @@ Quantity UnitTable::parseQuantity(Glib::ustring const &q) const
         std::istringstream tmp_v(match_info.fetch(0));
         tmp_v >> value;
     }
+    int start_pos, end_pos;
+    match_info.fetch_pos(0, end_pos, start_pos);
+    end_pos = q.size() - start_pos;
+    Glib::ustring u = q.substr(start_pos, end_pos);
 
     // Extract unit abbreviation
     Glib::ustring abbr;
     Glib::RefPtr<Glib::Regex> unit_regex = Glib::Regex::create("[A-z%]+");
-    if (unit_regex->match(q, match_info)) {
+    if (unit_regex->match(u, match_info)) {
         abbr = match_info.fetch(0);
     }
 
diff --git a/src/widgets/font-selector.cpp b/src/widgets/font-selector.cpp
index ccaf93e55..f00f05768 100644
--- a/src/widgets/font-selector.cpp
+++ b/src/widgets/font-selector.cpp
@@ -157,6 +157,10 @@ static void sp_font_selector_init(SPFontSelector *fsel)
         gtk_container_add(GTK_CONTAINER(f), sw);
 
         fsel->family_treeview = gtk_tree_view_new ();
+        gtk_tree_view_set_row_separator_func( GTK_TREE_VIEW(fsel->family_treeview),
+                                              GtkTreeViewRowSeparatorFunc ((gpointer)font_lister_separator_func),
+                                              NULL, NULL );
+        gtk_widget_show_all(GTK_WIDGET (fsel->family_treeview));
         GtkTreeViewColumn *column = gtk_tree_view_column_new ();
         GtkCellRenderer *cell = gtk_cell_renderer_text_new ();
         gtk_tree_view_column_pack_start (column, cell, FALSE);
@@ -166,9 +170,6 @@ static void sp_font_selector_init(SPFontSelector *fsel)
                                                  NULL, NULL );
         gtk_tree_view_append_column (GTK_TREE_VIEW(fsel->family_treeview), column);
         gtk_tree_view_set_headers_visible (GTK_TREE_VIEW(fsel->family_treeview), FALSE);
-        gtk_tree_view_set_row_separator_func( GTK_TREE_VIEW(fsel->family_treeview),
-                                              GtkTreeViewRowSeparatorFunc ((gpointer)font_lister_separator_func),
-                                              NULL, NULL );
 
         /* Muck with style, see text-toolbar.cpp */
         gtk_widget_set_name( GTK_WIDGET(fsel->family_treeview), "font_selector_family" );