Merge lp:~matthewpetroff/inkscape/gsoc-2013-unit-improvement into lp:~inkscape.dev/inkscape/trunk

[Matthew Petroff]

Implements real world document units using a viewBox, uses real world units for document size, and extends expression evaluator to toolbars

[Martin Owens (doctormo)]

This code looks good. I'm giving this a thumbs up from a code perspective.

review: Approve (code review)

[su_v (suv-lp)]

Units for rectangle tool don't match document units.

Steps to reproduce:
1) launch branch (default prefs)
2) open template 'A4 Page'
   (this document has a view box, and sets the scale to real units via height and width)
3) switch to the rectangle tool, and draw a rectangle of 10x10mm
   (enter the numbers in the controls bar of the rectangle tool)
4) remove stroke from rectangle (to allow easier comparing of the geometric size)
4) switch to the select tool, and check the size of the rectangle (default unit is 'mm'):
   the select tool claims that the rectangle has the size of 35.433 x 35.433 mm

[lp:~matthewpetroff/inkscape/gsoc-2013-unit-improvement]

12503. By Matthew Petroff on 2013-09-16

Fix bug in rectangle toolbar.

[Matthew Petroff (matthewpetroff)]

> Units for rectangle tool don't match document units.
>
> Steps to reproduce:
> 1) launch branch (default prefs)
> 2) open template 'A4 Page'
> (this document has a view box, and sets the scale to real units via height
> and width)
> 3) switch to the rectangle tool, and draw a rectangle of 10x10mm
> (enter the numbers in the controls bar of the rectangle tool)
> 4) remove stroke from rectangle (to allow easier comparing of the geometric
> size)
> 4) switch to the select tool, and check the size of the rectangle (default
> unit is 'mm'):
> the select tool claims that the rectangle has the size of 35.433 x 35.433
> mm

The rectangle toolbar was hard coded to pixels. I fixed it, so it now uses the document unit.

[lp:~matthewpetroff/inkscape/gsoc-2013-unit-improvement]

12504. By Matthew Petroff on 2013-09-20

Merge from trunk.

[su_v (suv-lp)]

On 2013-09-20 19:09 +0200, <email address hidden> wrote:
> The proposal to merge lp:~matthewpetroff/inkscape/gsoc-2013-unit-improvement into lp:inkscape has been updated.
>
> Status: Needs review => Merged

@Matthew - after the merge, building trunk r12552 with dbusapi enabled fails:

  CXX extension/dbus/document-interface.o
../../src/extension/dbus/document-interface.cpp: In function ‘gdouble document_interface_document_get_width(DocumentInterface*)’:
../../src/extension/dbus/document-interface.cpp:546: error: invalid use of incomplete type ‘struct Inkscape::Util::Quantity’
../../src/document.h:50: error: forward declaration of ‘struct Inkscape::Util::Quantity’
../../src/extension/dbus/document-interface.cpp: In function ‘gdouble document_interface_document_get_height(DocumentInterface*)’:
../../src/extension/dbus/document-interface.cpp:552: error: invalid use of incomplete type ‘struct Inkscape::Util::Quantity’
../../src/document.h:50: error: forward declaration of ‘struct Inkscape::Util::Quantity’
make[3]: *** [extension/dbus/document-interface.o] Error 1
make[2]: *** [all] Error 2
make[1]: *** [all-recursive] Error 1
make: *** [all] Error 2

Any chance you could take a look? You probably know best how to fix this ;)

Please let me know if you prefer to have a bug report filed about the build failure.

[Matthew Petroff (matthewpetroff)]

It should be fixed now. Can you test it? I've never built Inkscape with dbus enabled.

[su_v (suv-lp)]

On 2013-09-20 20:57 +0200, Matthew Petroff wrote:
> It should be fixed now. Can you test it? I've never built Inkscape with dbus enabled.

Fix confirmed - r12555 builds successfully with dbusapi enabled.

Thank you for the prompt response!

=== modified file 'share/templates/A4.svg'
--- share/templates/A4.svg	2013-08-10 13:23:01 +0000
+++ share/templates/A4.svg	2013-09-20 17:05:49 +0000
@@ -9,7 +9,8 @@
    xmlns:cc="http://web.resource.org/cc/"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    width="210mm"
-   height="297mm">
+   height="297mm"
+   viewBox="0 0 210 297">
   <defs
      id="defs3" />
   <sodipodi:namedview

=== modified file 'share/templates/A4_landscape.svg'
--- share/templates/A4_landscape.svg	2013-08-10 13:23:01 +0000
+++ share/templates/A4_landscape.svg	2013-09-20 17:05:49 +0000
@@ -9,7 +9,8 @@
    xmlns:cc="http://web.resource.org/cc/"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    width="297mm"
-   height="210mm">
+   height="210mm"
+   viewBox="0 0 297 210">
   <defs />
   <sodipodi:namedview
      inkscape:document-units="mm"

=== modified file 'share/templates/CD_cover_300dpi.svg'
--- share/templates/CD_cover_300dpi.svg	2013-08-10 13:23:01 +0000
+++ share/templates/CD_cover_300dpi.svg	2013-09-20 17:05:49 +0000
@@ -9,7 +9,8 @@
    xmlns:cc="http://web.resource.org/cc/"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    width="343pt"
-   height="340pt">
+   height="340pt"
+   viewBox="0 0 343 340">
   <defs />
   <sodipodi:namedview
      pagecolor="#ffffff"

=== modified file 'share/templates/Letter.svg'
--- share/templates/Letter.svg	2013-08-10 13:23:01 +0000
+++ share/templates/Letter.svg	2013-09-20 17:05:49 +0000
@@ -8,8 +8,9 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:cc="http://web.resource.org/cc/"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   width="612pt"
-   height="792pt">
+   width="8.5in"
+   height="11in"
+   viewBox="0 0 8.5 11">
   <defs />
   <sodipodi:namedview
      inkscape:document-units="in"

=== modified file 'share/templates/Letter_landscape.svg'
--- share/templates/Letter_landscape.svg	2013-08-10 13:23:01 +0000
+++ share/templates/Letter_landscape.svg	2013-09-20 17:05:49 +0000
@@ -8,8 +8,9 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:cc="http://web.resource.org/cc/"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
-   width="792pt"
-   height="612pt">
+   width="11in"
+   height="8.5in"
+   viewBox="0 0 11 8.5">
   <defs />
   <sodipodi:namedview
      inkscape:document-units="in"

=== modified file 'share/templates/business_card_85x54mm.svg'
--- share/templates/business_card_85x54mm.svg	2013-08-10 13:23:01 +0000
+++ share/templates/business_card_85x54mm.svg	2013-09-20 17:05:49 +0000
@@ -9,7 +9,8 @@
    xmlns:cc="http://web.resource.org/cc/"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    width="85mm"
-   height="54mm">
+   height="54mm"
+   viewBox="0 0 85 54">
   <defs
      id="defs3" />
   <sodipodi:namedview

=== modified file 'share/templates/business_card_90x50mm.svg'
--- share/templates/business_card_90x50mm.svg	2013-08-10 13:23:01 +0000
+++ share/templates/business_card_90x50mm.svg	2013-09-20 17:05:49 +0000
@@ -9,7 +9,8 @@
    xmlns:cc="http://web.resource.org/cc/"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    width="90mm"
-   height="50mm">
+   height="50mm"
+   viewBox="0 0 90 50">
   <defs
      id="defs3" />
   <sodipodi:namedview

=== modified file 'share/templates/default.be.svg'
--- share/templates/default.be.svg	2009-09-29 17:39:54 +0000
+++ share/templates/default.be.svg	2013-09-20 17:05:49 +0000
@@ -9,7 +9,8 @@
    xmlns:cc="http://web.resource.org/cc/"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    width="210mm"
-   height="297mm">
+   height="297mm"
+   viewBox="0 0 210 297">
   <defs />
   <sodipodi:namedview
      id="base"

=== modified file 'share/templates/default_mm.svg'
--- share/templates/default_mm.svg	2006-01-16 02:36:01 +0000
+++ share/templates/default_mm.svg	2013-09-20 17:05:49 +0000
@@ -9,7 +9,8 @@
    xmlns:cc="http://web.resource.org/cc/"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    width="210mm"
-   height="297mm">
+   height="297mm"
+   viewBox="0 0 210 297">
   <defs />
   <sodipodi:namedview
      id="base"

=== modified file 'share/templates/default_pt.svg'
--- share/templates/default_pt.svg	2006-01-16 02:36:01 +0000
+++ share/templates/default_pt.svg	2013-09-20 17:05:49 +0000
@@ -9,7 +9,8 @@
    xmlns:cc="http://web.resource.org/cc/"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    width="210mm"
-   height="297mm">
+   height="297mm"
+   viewBox="0 0 595.27558 841.88974">
   <defs />
   <sodipodi:namedview
      id="base"

=== modified file 'share/ui/Makefile.am'
--- share/ui/Makefile.am	2006-01-16 02:36:01 +0000
+++ share/ui/Makefile.am	2013-09-20 17:05:49 +0000
@@ -5,7 +5,6 @@
     keybindings.rc \
     menus-bars.xml \
     toolbox.xml \
-    units.txt \
     units.xml
 
 EXTRA_DIST = $(ui_DATA)

=== removed file 'share/ui/units.txt'
--- share/ui/units.txt	2012-03-22 19:19:09 +0000
+++ share/ui/units.txt	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-# Simple unit configuration file
-#
-# This is a space-delimited list of unit definitions.
-
-# name        name_plural  abbr type           factor   PRI description
-# ---------------------------------------------------------------------------
-  %           %            %    DIMENSIONLESS  1.00     Y   Percentage
-  pixel       pixels       px   LINEAR         1.00     Y   CSS Pixels (90/inch)
-  point       points       pt   LINEAR         1.25     N   PostScript points (72/inch)
-  pica        picas        pc   LINEAR         15.0     N   12 points
-  inch        inches       in   LINEAR         90.0     N   Inches (90 px/in)
-  millimeter  millimeters  mm   LINEAR         3.543307 N   Millimeters (25.4 mm/in)
-  centimeter  centimeters  cm   LINEAR         35.43307 N   Centimeters (10 mm/cm)
-  meter       meters       m    LINEAR         3543.307 N   Meters (100 cm/m)
-  foot        feet         ft   LINEAR         1080     N   Feet (12 in/ft)
-  degree      degrees      °    RADIAL         1.00     Y   Degrees
-  radian      radians      rad  RADIAL         57.296   N   Radians (57.296 deg/rad)
-  font-height font-heights em   FONT_HEIGHT    1.00     Y   Font height
-  x-height    x-heights    ex   FONT_HEIGHT    0.50     N   Height of letter 'x'
-  half-em     half-ems     en   FONT_HEIGHT    0.50     N   Half of font height

=== modified file 'src/arc-context.cpp'
--- src/arc-context.cpp	2013-08-30 21:35:42 +0000
+++ src/arc-context.cpp	2013-09-20 17:05:49 +0000
@@ -451,6 +451,7 @@
         }
 
         this->arc->updateRepr();
+        this->arc->doWriteTransform(this->arc->getRepr(), this->arc->transform, NULL, true);
 
         desktop->canvas->endForcedFullRedraws();
 

=== modified file 'src/connector-context.cpp'
--- src/connector-context.cpp	2013-07-31 19:11:20 +0000
+++ src/connector-context.cpp	2013-09-20 17:05:49 +0000
@@ -998,6 +998,8 @@
             cc->newconn->updateRepr();
         }
 
+        cc->newconn->doWriteTransform(cc->newconn->getRepr(), cc->newconn->transform, NULL, true);
+
         // Only set the selection after we are finished with creating the attributes of
         // the connector.  Otherwise, the selection change may alter the defaults for
         // values like curvature in the connector context, preventing subsequent lookup

=== modified file 'src/desktop.cpp'
--- src/desktop.cpp	2013-09-19 04:26:02 +0000
+++ src/desktop.cpp	2013-09-20 17:05:49 +0000
@@ -242,7 +242,7 @@
     // display rect and zoom are now handled in sp_desktop_widget_realize()
 
     Geom::Rect const d(Geom::Point(0.0, 0.0),
-                       Geom::Point(document->getWidth(), document->getHeight()));
+                       Geom::Point(document->getWidth().value("px"), document->getHeight().value("px")));
 
     SP_CTRLRECT(page)->setRectangle(d);
     SP_CTRLRECT(page_border)->setRectangle(d);
@@ -259,7 +259,7 @@
 
 
     /* Connect event for page resize */
-    _doc2dt[5] = document->getHeight();
+    _doc2dt[5] = document->getHeight().value("px");
     sp_canvas_item_affine_absolute (SP_CANVAS_ITEM (drawing), _doc2dt);
 
     _modified_connection = namedview->connectModified(sigc::bind<2>(sigc::ptr_fun(&_namedview_modified), this));
@@ -1108,7 +1108,7 @@
 SPDesktop::zoom_page()
 {
     Geom::Rect d(Geom::Point(0, 0),
-                 Geom::Point(doc()->getWidth(), doc()->getHeight()));
+                 Geom::Point(doc()->getWidth().value("px"), doc()->getHeight().value("px")));
 
     if (d.minExtent() < 1.0) {
         return;
@@ -1125,12 +1125,12 @@
 {
     Geom::Rect const a = get_display_area();
 
-    if (doc()->getWidth() < 1.0) {
+    if (doc()->getWidth().value("px") < 1.0) {
         return;
     }
 
     Geom::Rect d(Geom::Point(0, a.midpoint()[Geom::Y]),
-                 Geom::Point(doc()->getWidth(), a.midpoint()[Geom::Y]));
+                 Geom::Point(doc()->getWidth().value("px"), a.midpoint()[Geom::Y]));
 
     set_display_area(d, 10);
 }

=== modified file 'src/document.cpp'
--- src/document.cpp	2013-09-16 17:32:58 +0000
+++ src/document.cpp	2013-09-20 17:05:49 +0000
@@ -548,16 +548,20 @@
     return NULL;
 }
 
-gdouble SPDocument::getWidth() const
+Inkscape::Util::Quantity SPDocument::getWidth() const
 {
-    g_return_val_if_fail(this->priv != NULL, 0.0);
-    g_return_val_if_fail(this->root != NULL, 0.0);
+    g_return_val_if_fail(this->priv != NULL, Inkscape::Util::Quantity(0.0, Inkscape::Util::Unit()));
+    g_return_val_if_fail(this->root != NULL, Inkscape::Util::Quantity(0.0, Inkscape::Util::Unit()));
 
-    gdouble result = root->width.computed;
+    gdouble result = root->width.value;
+    SVGLength::Unit u = root->width.unit;
     if (root->width.unit == SVGLength::PERCENT && root->viewBox_set) {
         result = root->viewBox.width();
     }
-    return result;
+    if (u == SVGLength::NONE) {
+        u = SVGLength::PX;
+    }
+    return Inkscape::Util::Quantity(result, unit_table.getUnit(u));
 }
 
 void SPDocument::setWidth(const Inkscape::Util::Quantity &width)
@@ -584,16 +588,20 @@
     root->updateRepr();
 }
 
-gdouble SPDocument::getHeight() const
+Inkscape::Util::Quantity SPDocument::getHeight() const
 {
-    g_return_val_if_fail(this->priv != NULL, 0.0);
-    g_return_val_if_fail(this->root != NULL, 0.0);
+    g_return_val_if_fail(this->priv != NULL, Inkscape::Util::Quantity(0.0, Inkscape::Util::Unit()));
+    g_return_val_if_fail(this->root != NULL, Inkscape::Util::Quantity(0.0, Inkscape::Util::Unit()));
 
-    gdouble result = root->height.computed;
+    gdouble result = root->height.value;
+    SVGLength::Unit u = root->height.unit;
     if (root->height.unit == SVGLength::PERCENT && root->viewBox_set) {
         result = root->viewBox.height();
     }
-    return result;
+    if (u == SVGLength::NONE) {
+        u = SVGLength::PX;
+    }
+    return Inkscape::Util::Quantity(result, unit_table.getUnit(u));
 }
 
 void SPDocument::setHeight(const Inkscape::Util::Quantity &height)
@@ -620,9 +628,16 @@
     root->updateRepr();
 }
 
+void SPDocument::setViewBox(const Geom::Rect &viewBox)
+{
+    root->viewBox_set = true;
+    root->viewBox = viewBox;
+    root->updateRepr();
+}
+
 Geom::Point SPDocument::getDimensions() const
 {
-    return Geom::Point(getWidth(), getHeight());
+    return Geom::Point(getWidth().value("px"), getHeight().value("px"));
 }
 
 Geom::OptRect SPDocument::preferredBounds() const
@@ -644,7 +659,7 @@
     double const w = rect.width();
     double const h = rect.height();
 
-    double const old_height = getHeight();
+    double const old_height = getHeight().value("px");
     Inkscape::Util::Unit const px = unit_table.getUnit("px");
     
     /* in px */
@@ -979,7 +994,7 @@
     if (root->viewBox_set) { // if set, take from viewBox
         ctx->viewport = root->viewBox;
     } else { // as a last resort, set size to A4
-        ctx->viewport = Geom::Rect::from_xywh(0, 0, 210 * Inkscape::Util::Quantity::convert(1, "mm", "px"), 297 * Inkscape::Util::Quantity::convert(1, "mm", "px"));
+        ctx->viewport = Geom::Rect::from_xywh(0, 0, Inkscape::Util::Quantity::convert(210, "mm", "px"), Inkscape::Util::Quantity::convert(297, "mm", "px"));
     }
     ctx->i2vp = Geom::identity();
 }

=== modified file 'src/document.h'
--- src/document.h	2013-08-30 21:35:42 +0000
+++ src/document.h	2013-09-20 17:05:49 +0000
@@ -227,12 +227,13 @@
 
     SPDocument *doRef();
     SPDocument *doUnref();
-    gdouble getWidth() const;
-    gdouble getHeight() const;
+    Inkscape::Util::Quantity getWidth() const;
+    Inkscape::Util::Quantity getHeight() const;
     Geom::Point getDimensions() const;
     Geom::OptRect preferredBounds() const;
     void setWidth(const Inkscape::Util::Quantity &width);
     void setHeight(const Inkscape::Util::Quantity &height);
+    void setViewBox(const Geom::Rect &viewBox);
     void requestModified();
     gint ensureUpToDate();
     bool addResource(const gchar *key, SPObject *object);

=== modified file 'src/draw-context.cpp'
--- src/draw-context.cpp	2013-08-04 13:09:03 +0000
+++ src/draw-context.cpp	2013-09-20 17:05:49 +0000
@@ -599,6 +599,7 @@
             dc->selection->set(repr);
             Inkscape::GC::release(repr);
             item->transform = SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse();
+            item->doWriteTransform(item->getRepr(), item->transform, NULL, true);
             item->updateRepr();
         }
 

=== modified file 'src/dyna-draw-context.cpp'
--- src/dyna-draw-context.cpp	2013-07-31 19:11:20 +0000
+++ src/dyna-draw-context.cpp	2013-09-20 17:05:49 +0000
@@ -958,6 +958,10 @@
                 sp_desktop_selection(desktop)->set(this->repr);
             }
         }
+
+        SPItem *item=SP_ITEM(desktop->doc()->getObjectByRepr(this->repr));
+        item->doWriteTransform(item->getRepr(), item->transform, NULL, true);
+
     } else {
         if (this->repr) {
             sp_repr_unparent(this->repr);

=== modified file 'src/ege-adjustment-action.cpp'
--- src/ege-adjustment-action.cpp	2013-01-26 19:33:04 +0000
+++ src/ege-adjustment-action.cpp	2013-09-20 17:05:49 +0000
@@ -115,6 +115,7 @@
     gchar* appearance;
     gchar* iconId;
     Inkscape::IconSize iconSize;
+    Inkscape::UI::Widget::UnitTracker *unitTracker;
 };
 
 #define EGE_ADJUSTMENT_ACTION_GET_PRIVATE( o ) ( G_TYPE_INSTANCE_GET_PRIVATE( (o), EGE_ADJUSTMENT_ACTION_TYPE, EgeAdjustmentActionPrivate ) )
@@ -128,7 +129,8 @@
     PROP_TOOL_POST,
     PROP_APPEARANCE,
     PROP_ICON_ID,
-    PROP_ICON_SIZE
+    PROP_ICON_SIZE,
+    PROP_UNIT_TRACKER
 };
 
 enum {
@@ -234,6 +236,13 @@
                                                            (int)Inkscape::ICON_SIZE_SMALL_TOOLBAR,
                                                            (GParamFlags)(G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT) ) );
 
+        g_object_class_install_property( objClass,
+                                         PROP_UNIT_TRACKER,
+                                         g_param_spec_pointer( "unit_tracker",
+                                                               "Unit Tracker",
+                                                               "The widget that keeps track of the unit",
+                                                               (GParamFlags)(G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT) ) );
+
         g_type_class_add_private( klass, sizeof(EgeAdjustmentActionClass) );
     }
 }
@@ -263,6 +272,7 @@
     action->private_data->appearance = 0;
     action->private_data->iconId = 0;
     action->private_data->iconSize = Inkscape::ICON_SIZE_SMALL_TOOLBAR;
+    action->private_data->unitTracker = NULL;
 }
 
 static void ege_adjustment_action_finalize( GObject* object )
@@ -292,7 +302,8 @@
                                                 const gchar *tooltip,
                                                 const gchar *stock_id,
                                                 gdouble climb_rate,
-                                                guint digits )
+                                                guint digits,
+                                                Inkscape::UI::Widget::UnitTracker *unit_tracker )
 {
     GObject* obj = (GObject*)g_object_new( EGE_ADJUSTMENT_ACTION_TYPE,
                                            "name", name,
@@ -302,6 +313,7 @@
                                            "adjustment", adjustment,
                                            "climb-rate", climb_rate,
                                            "digits", digits,
+                                           "unit_tracker", unit_tracker,
                                            NULL );
 
     EgeAdjustmentAction* action = EGE_ADJUSTMENT_ACTION( obj );
@@ -349,6 +361,10 @@
             g_value_set_int( value, action->private_data->iconSize );
             break;
 
+        case PROP_UNIT_TRACKER:
+            g_value_set_pointer( value, action->private_data->unitTracker );
+            break;
+
         default:
             G_OBJECT_WARN_INVALID_PROPERTY_ID( obj, propId, pspec );
     }
@@ -450,6 +466,12 @@
         }
         break;
 
+        case PROP_UNIT_TRACKER:
+        {
+            action->private_data->unitTracker = (Inkscape::UI::Widget::UnitTracker*)g_value_get_pointer( value );
+        }
+        break;
+
         default:
             G_OBJECT_WARN_INVALID_PROPERTY_ID( obj, propId, pspec );
     }
@@ -812,7 +834,7 @@
             gtk_scale_button_set_icons( GTK_SCALE_BUTTON(spinbutton), floogles );
         } else {
             if ( gFactoryCb ) {
-                spinbutton = gFactoryCb( act->private_data->adj, act->private_data->climbRate, act->private_data->digits );
+                spinbutton = gFactoryCb( act->private_data->adj, act->private_data->climbRate, act->private_data->digits, act->private_data->unitTracker );
             } else {
                 spinbutton = gtk_spin_button_new( act->private_data->adj, act->private_data->climbRate, act->private_data->digits );
             }

=== modified file 'src/ege-adjustment-action.h'
--- src/ege-adjustment-action.h	2011-06-03 10:44:52 +0000
+++ src/ege-adjustment-action.h	2013-09-20 17:05:49 +0000
@@ -63,6 +63,14 @@
 typedef struct _EgeAdjustmentActionClass EgeAdjustmentActionClass;
 typedef struct _EgeAdjustmentActionPrivate EgeAdjustmentActionPrivate;
 
+namespace Inkscape {
+    namespace UI {
+        namespace Widget {
+            class UnitTracker;
+        }
+    }
+}
+
 /**
  * Instance structure of EgeAdjustmentAction.
  */
@@ -95,7 +103,7 @@
  */
 
 /** Callback type for widgets creation factory */
-typedef GtkWidget* (*EgeCreateAdjWidgetCB)( GtkAdjustment *adjustment, gdouble climb_rate, guint digits );
+typedef GtkWidget* (*EgeCreateAdjWidgetCB)( GtkAdjustment *adjustment, gdouble climb_rate, guint digits, Inkscape::UI::Widget::UnitTracker *unit_tracker );
 
 /**
  * Sets a factory callback to be used to create the specific widget.
@@ -117,6 +125,7 @@
  * @param stock_id Icon id to use.
  * @param climb_rate Used for created widgets.
  * @param digits Used for created widgets.
+ * @param unit_tracker Used to store unit.
  */
 EgeAdjustmentAction* ege_adjustment_action_new( GtkAdjustment* adjustment,
                                                 const gchar *name,
@@ -124,7 +133,8 @@
                                                 const gchar *tooltip,
                                                 const gchar *stock_id,
                                                 gdouble climb_rate,
-                                                guint digits
+                                                guint digits,
+                                                Inkscape::UI::Widget::UnitTracker *unit_tracker
                                                 );
 /**
  * Returns a pointer to the GtkAdjustment represented by the given

=== modified file 'src/extension/internal/cairo-renderer-pdf-out.cpp'
--- src/extension/internal/cairo-renderer-pdf-out.cpp	2013-08-26 20:03:43 +0000
+++ src/extension/internal/cairo-renderer-pdf-out.cpp	2013-09-20 17:05:49 +0000
@@ -197,7 +197,7 @@
 
     float new_bleedmargin_px = 0.;
     try {
-        new_bleedmargin_px = mod->get_param_float("bleed") * Inkscape::Util::Quantity::convert(1, "mm", "px");
+        new_bleedmargin_px = Inkscape::Util::Quantity::convert(mod->get_param_float("bleed"), "mm", "px");
     }
     catch(...) {
         g_warning("Parameter <bleed> might not exist");

=== modified file 'src/extension/internal/cairo-renderer.cpp'
--- src/extension/internal/cairo-renderer.cpp	2013-09-19 17:03:35 +0000
+++ src/extension/internal/cairo-renderer.cpp	2013-09-20 17:05:49 +0000
@@ -463,8 +463,8 @@
     }
 
     // The width and height of the bitmap in pixels
-    unsigned width =  ceil(bbox->width() * (res / Inkscape::Util::Quantity::convert(1, "in", "px")));
-    unsigned height = ceil(bbox->height() * (res / Inkscape::Util::Quantity::convert(1, "in", "px")));
+    unsigned width =  ceil(bbox->width() * Inkscape::Util::Quantity::convert(res, "px", "in"));
+    unsigned height = ceil(bbox->height() * Inkscape::Util::Quantity::convert(res, "px", "in"));
 
     if (width == 0 || height == 0) return;
 
@@ -638,9 +638,9 @@
             Geom::Affine tp( Geom::Translate( bleedmargin_px, bleedmargin_px ) );
             ctx->transform(tp);
         } else {
-            double high = doc->getHeight();
+            double high = doc->getHeight().value("px");
             if (ctx->_vector_based_target)
-                high *= Inkscape::Util::Quantity::convert(1, "px", "pt");
+                high = Inkscape::Util::Quantity::convert(high, "px", "pt");
 
             // this transform translates the export drawing to a virtual page (0,0)-(width,height)
             Geom::Affine tp(Geom::Translate(-d.left() * (ctx->_vector_based_target ? Inkscape::Util::Quantity::convert(1, "pt", "px") : 1.0),

=== modified file 'src/extension/internal/emf-inout.cpp'
--- src/extension/internal/emf-inout.cpp	2013-09-01 23:39:00 +0000
+++ src/extension/internal/emf-inout.cpp	2013-09-20 17:05:49 +0000
@@ -1799,8 +1799,8 @@
             d->MMX = d->MM100InX / 100.0;
             d->MMY = d->MM100InY / 100.0;
 
-            d->PixelsOutX = d->MMX * Inkscape::Util::Quantity::convert(1, "mm", "px");
-            d->PixelsOutY = d->MMY * Inkscape::Util::Quantity::convert(1, "mm", "px");
+            d->PixelsOutX = Inkscape::Util::Quantity::convert(d->MMX, "mm", "px");
+            d->PixelsOutY = Inkscape::Util::Quantity::convert(d->MMY, "mm", "px");
 
             // Upper left corner, from header rclBounds, in device units, usually both 0, but not always
             d->ulCornerInX = pEmr->rclBounds.left;

=== modified file 'src/extension/internal/emf-print.cpp'
--- src/extension/internal/emf-print.cpp	2013-09-19 00:57:10 +0000
+++ src/extension/internal/emf-print.cpp	2013-09-20 17:05:49 +0000
@@ -138,8 +138,8 @@
 
 
     // width and height in px
-    _width  = doc->getWidth();
-    _height = doc->getHeight();
+    _width  = doc->getWidth().value("px");
+    _height = doc->getHeight().value("px");
 
     // initialize a few global variables
     hbrush = hbrushOld = hpen = 0;
@@ -243,7 +243,7 @@
             g_error("Fatal programming error in PrintEmf::begin at textcomment_set 1");
         }
 
-        snprintf(buff, sizeof(buff) - 1, "Drawing=%.1lfx%.1lfpx, %.1lfx%.1lfmm", _width, _height, dwInchesX * Inkscape::Util::Quantity::convert(1, "in", "mm"), dwInchesY * Inkscape::Util::Quantity::convert(1, "in", "mm"));
+        snprintf(buff, sizeof(buff) - 1, "Drawing=%.1lfx%.1lfpx, %.1lfx%.1lfmm", _width, _height, Inkscape::Util::Quantity::convert(dwInchesX, "in", "mm"), Inkscape::Util::Quantity::convert(dwInchesY, "in", "mm"));
         rec = textcomment_set(buff);
         if (!rec || emf_append((PU_ENHMETARECORD)rec, et, U_REC_FREE)) {
             g_error("Fatal programming error in PrintEmf::begin at textcomment_set 1");

=== modified file 'src/extension/internal/grid.cpp'
--- src/extension/internal/grid.cpp	2013-06-07 03:18:19 +0000
+++ src/extension/internal/grid.cpp	2013-09-20 17:05:49 +0000
@@ -35,6 +35,7 @@
 #include "extension/effect.h"
 #include "extension/system.h"
 
+#include "util/units.h"
 
 #include "grid.h"
 
@@ -97,14 +98,14 @@
         /* get page size */
         SPDocument * doc = document->doc();
         bounding_area = Geom::Rect(  Geom::Point(0,0),
-                                     Geom::Point(doc->getWidth(), doc->getHeight())  );
+                                     Geom::Point(doc->getWidth().value("px"), doc->getHeight().value("px"))  );
     } else {
         Geom::OptRect bounds = selection->visualBounds();
         if (bounds) {
             bounding_area = *bounds;
         }
 
-        gdouble doc_height  =  (document->doc())->getHeight();
+        gdouble doc_height  =  (document->doc())->getHeight().value("px");
         Geom::Rect temprec = Geom::Rect(Geom::Point(bounding_area.min()[Geom::X], doc_height - bounding_area.min()[Geom::Y]),
                                     Geom::Point(bounding_area.max()[Geom::X], doc_height - bounding_area.max()[Geom::Y]));
 

=== modified file 'src/extension/internal/latex-pstricks.cpp'
--- src/extension/internal/latex-pstricks.cpp	2013-07-31 22:33:03 +0000
+++ src/extension/internal/latex-pstricks.cpp	2013-09-20 17:05:49 +0000
@@ -117,8 +117,8 @@
     }
 
     // width and height in pt
-    _width = doc->getWidth() * Inkscape::Util::Quantity::convert(1, "px", "pt");
-    _height = doc->getHeight() * Inkscape::Util::Quantity::convert(1, "px", "pt");
+    _width = doc->getWidth().value("pt");
+    _height = doc->getHeight().value("pt");
 
     if (res >= 0) {
 
@@ -128,10 +128,10 @@
         os << "\\psset{xunit=.5pt,yunit=.5pt,runit=.5pt}\n";
         // from now on we can output px, but they will be treated as pt
     
-        os << "\\begin{pspicture}(" << doc->getWidth() << "," << doc->getHeight() << ")\n";
+        os << "\\begin{pspicture}(" << doc->getWidth().value("px") << "," << doc->getHeight().value("px") << ")\n";
     }
 
-    m_tr_stack.push( Geom::Scale(1, -1) * Geom::Translate(0, doc->getHeight()));  /// @fixme hardcoded doc2dt transform
+    m_tr_stack.push( Geom::Scale(1, -1) * Geom::Translate(0, doc->getHeight().value("px")));  /// @fixme hardcoded doc2dt transform
 
     return fprintf(_stream, "%s", os.str().c_str());
 }

=== modified file 'src/extension/internal/latex-text-renderer.cpp'
--- src/extension/internal/latex-text-renderer.cpp	2013-09-14 11:09:15 +0000
+++ src/extension/internal/latex-text-renderer.cpp	2013-09-20 17:05:49 +0000
@@ -633,7 +633,7 @@
     }
 
     // flip y-axis
-    push_transform( Geom::Scale(1,-1) * Geom::Translate(0, doc->getHeight()) ); /// @fixme hardcoded desktop transform!
+    push_transform( Geom::Scale(1,-1) * Geom::Translate(0, doc->getHeight().value("px")) ); /// @fixme hardcoded desktop transform!
 
     // write the info to LaTeX
     Inkscape::SVGOStringStream os;
@@ -642,7 +642,7 @@
     // scaling of the image when including it in LaTeX
 
     os << "  \\ifx\\svgwidth\\undefined%\n";
-    os << "    \\setlength{\\unitlength}{" << d.width() * Inkscape::Util::Quantity::convert(1, "px", "pt") << "bp}%\n"; // note: 'bp' is the Postscript pt unit in LaTeX, see LP bug #792384
+    os << "    \\setlength{\\unitlength}{" << Inkscape::Util::Quantity::convert(d.width(), "px", "pt") << "bp}%\n"; // note: 'bp' is the Postscript pt unit in LaTeX, see LP bug #792384
     os << "    \\ifx\\svgscale\\undefined%\n";
     os << "      \\relax%\n";
     os << "    \\else%\n";

=== modified file 'src/extension/internal/odf.cpp'
--- src/extension/internal/odf.cpp	2013-08-03 01:03:43 +0000
+++ src/extension/internal/odf.cpp	2013-09-20 17:05:49 +0000
@@ -75,6 +75,7 @@
 #include "sp-flowtext.h"
 #include "svg/svg.h"
 #include "text-editing.h"
+#include "util/units.h"
 
 
 //# DOM-specific includes
@@ -945,7 +946,7 @@
     //### Get SVG-to-ODF transform
     Geom::Affine tf (item->i2dt_affine());
     //Flip Y into document coordinates
-    double doc_height    = SP_ACTIVE_DOCUMENT->getHeight();
+    double doc_height    = SP_ACTIVE_DOCUMENT->getHeight().value("px");
     Geom::Affine doc2dt_tf = Geom::Affine(Geom::Scale(1.0, -1.0));                    /// @fixme hardcoded desktop transform
     doc2dt_tf            = doc2dt_tf * Geom::Affine(Geom::Translate(0, doc_height));
     tf                   = tf * doc2dt_tf;

=== modified file 'src/extension/internal/pdfinput/pdf-parser.cpp'
--- src/extension/internal/pdfinput/pdf-parser.cpp	2013-08-06 18:54:40 +0000
+++ src/extension/internal/pdfinput/pdf-parser.cpp	2013-09-20 17:05:49 +0000
@@ -279,14 +279,14 @@
   ignoreUndef = 0;
   operatorHistory = NULL;
   builder = builderA;
-  builder->setDocumentSize(state->getPageWidth()*Inkscape::Util::Quantity::convert(1, "pt", "px"),
-                           state->getPageHeight()*Inkscape::Util::Quantity::convert(1, "pt", "px"));
+  builder->setDocumentSize(Inkscape::Util::Quantity::convert(state->getPageWidth(), "pt", "px"),
+                           Inkscape::Util::Quantity::convert(state->getPageHeight(), "pt", "px"));
 
   double *ctm = state->getCTM();
   double scaledCTM[6];
   for (int i = 0; i < 6; ++i) {
     baseMatrix[i] = ctm[i];
-    scaledCTM[i] = Inkscape::Util::Quantity::convert(1, "pt", "px") * ctm[i];
+    scaledCTM[i] = Inkscape::Util::Quantity::convert(ctm[i], "pt", "px");
   }
   saveState();
   builder->setTransform((double*)&scaledCTM);

=== modified file 'src/extension/internal/pdfinput/svg-builder.cpp'
--- src/extension/internal/pdfinput/svg-builder.cpp	2013-08-06 18:54:40 +0000
+++ src/extension/internal/pdfinput/svg-builder.cpp	2013-09-20 17:05:49 +0000
@@ -793,7 +793,7 @@
         Geom::Affine pat_matrix(matrix[0], matrix[1], matrix[2], matrix[3],
                               matrix[4], matrix[5]);
         if ( !for_shading && _is_top_level ) {
-            Geom::Affine flip(1.0, 0.0, 0.0, -1.0, 0.0, _height * Inkscape::Util::Quantity::convert(1, "px", "pt"));
+            Geom::Affine flip(1.0, 0.0, 0.0, -1.0, 0.0, Inkscape::Util::Quantity::convert(_height, "px", "pt"));
             pat_matrix *= flip;
         }
         gchar *transform_text = sp_svg_transform_write(pat_matrix);

=== modified file 'src/extension/internal/wmf-inout.cpp'
--- src/extension/internal/wmf-inout.cpp	2013-09-01 23:39:00 +0000
+++ src/extension/internal/wmf-inout.cpp	2013-09-20 17:05:49 +0000
@@ -1742,8 +1742,8 @@
         tmp_outdef << "  version=\"1.0\"\n";
 
         tmp_outdef <<
-            "  width=\"" << d->PixelsOutX/ Inkscape::Util::Quantity::convert(1, "mm", "px") << "mm\"\n" <<
-            "  height=\"" << d->PixelsOutY/ Inkscape::Util::Quantity::convert(1, "mm", "px")  << "mm\">\n";
+            "  width=\"" << Inkscape::Util::Quantity::convert(d->PixelsOutX, "px", "mm") << "mm\"\n" <<
+            "  height=\"" << Inkscape::Util::Quantity::convert(d->PixelsOutY, "px", "mm")  << "mm\">\n";
         *(d->outdef) += tmp_outdef.str().c_str();
         *(d->outdef) += "<defs>";                           // temporary end of header
 

=== modified file 'src/extension/internal/wmf-print.cpp'
--- src/extension/internal/wmf-print.cpp	2013-09-19 00:57:10 +0000
+++ src/extension/internal/wmf-print.cpp	2013-09-20 17:05:49 +0000
@@ -138,8 +138,8 @@
 
     // WMF header the only things that can be set are the page size in inches (w,h) and the dpi
     // width and height in px
-    _width  = doc->getWidth();
-    _height = doc->getHeight();
+    _width  = doc->getWidth().value("px");
+    _height = doc->getHeight().value("px");
 
     // initialize a few global variables
     hbrush = hpen = 0;

=== modified file 'src/file.cpp'
--- src/file.cpp	2013-08-14 18:52:42 +0000
+++ src/file.cpp	2013-09-20 17:05:49 +0000
@@ -149,7 +149,7 @@
             // If the current desktop is empty, open the document there
         doc->ensureUpToDate(); // TODO this will trigger broken link warnings, etc.
         desktop->change_document(doc);
-        doc->emitResizedSignal(doc->getWidth(), doc->getHeight());
+        doc->emitResizedSignal(doc->getWidth().value("px"), doc->getHeight().value("px"));
     } else {
             // create a whole new desktop and window
         SPViewWidget *dtw = sp_desktop_widget_new(sp_document_namedview(doc, NULL)); // TODO this will trigger broken link warnings, etc.
@@ -291,7 +291,7 @@
             // If the current desktop is empty, open the document there
             doc->ensureUpToDate(); // TODO this will trigger broken link warnings, etc.
             desktop->change_document(doc);
-            doc->emitResizedSignal(doc->getWidth(), doc->getHeight());
+            doc->emitResizedSignal(doc->getWidth().value("px"), doc->getHeight().value("px"));
         } else {
             // create a whole new desktop and window
             SPViewWidget *dtw = sp_desktop_widget_new(sp_document_namedview(doc, NULL)); // TODO this will trigger broken link warnings, etc.

=== modified file 'src/flood-context.cpp'
--- src/flood-context.cpp	2013-08-30 21:35:42 +0000
+++ src/flood-context.cpp	2013-09-20 17:05:49 +0000
@@ -764,7 +764,7 @@
     unsigned int height = (int)ceil(screen.height() * zoom_scale * padding);
 
     Geom::Point origin(screen.min()[Geom::X],
-                       document->getHeight() - screen.height() - screen.min()[Geom::Y]);
+                       document->getHeight().value("px") - screen.height() - screen.min()[Geom::Y]);
                     
     origin[Geom::X] += (screen.width() * ((1 - padding) / 2));
     origin[Geom::Y] += (screen.height() * ((1 - padding) / 2));
@@ -874,7 +874,7 @@
     }
 
     for (unsigned int i = 0; i < fill_points.size(); i++) {
-        Geom::Point pw = Geom::Point(fill_points[i][Geom::X] / zoom_scale, document->getHeight() + (fill_points[i][Geom::Y] / zoom_scale)) * affine;
+        Geom::Point pw = Geom::Point(fill_points[i][Geom::X] / zoom_scale, document->getHeight().value("px") + (fill_points[i][Geom::Y] / zoom_scale)) * affine;
 
         pw[Geom::X] = (int)MIN(width - 1, MAX(0, pw[Geom::X]));
         pw[Geom::Y] = (int)MIN(height - 1, MAX(0, pw[Geom::Y]));

=== modified file 'src/helper/pixbuf-ops.cpp'
--- src/helper/pixbuf-ops.cpp	2013-09-19 00:57:10 +0000
+++ src/helper/pixbuf-ops.cpp	2013-09-20 17:05:49 +0000
@@ -115,12 +115,12 @@
     double padding = 1.0;
 
     Geom::Point origin(screen.min()[Geom::X],
-                  doc->getHeight() - screen[Geom::Y].extent() - screen.min()[Geom::Y]);
+                  doc->getHeight().value("px") - screen[Geom::Y].extent() - screen.min()[Geom::Y]);
 
     origin[Geom::X] = origin[Geom::X] + (screen[Geom::X].extent() * ((1 - padding) / 2));
     origin[Geom::Y] = origin[Geom::Y] + (screen[Geom::Y].extent() * ((1 - padding) / 2));
 
-    Geom::Scale scale( (xdpi / Inkscape::Util::Quantity::convert(1, "in", "px")),   (ydpi / Inkscape::Util::Quantity::convert(1, "in", "px")));
+    Geom::Scale scale(Inkscape::Util::Quantity::convert(xdpi, "px", "in"), Inkscape::Util::Quantity::convert(ydpi, "px", "in"));
     Geom::Affine affine = scale * Geom::Translate(-origin * scale);
 
     /* Create ArenaItems and set transform */

=== modified file 'src/helper/png-write.cpp'
--- src/helper/png-write.cpp	2012-05-24 05:49:41 +0000
+++ src/helper/png-write.cpp	2013-09-20 17:05:49 +0000
@@ -34,6 +34,7 @@
 #include "preferences.h"
 #include "rdf.h"
 #include "display/cairo-utils.h"
+#include "util/units.h"
 
 /* This is an example of how to use libpng to read and write PNG files.
  * The file libpng.txt is much more verbose then this.  If you have not
@@ -415,7 +416,7 @@
     doc->ensureUpToDate();
 
     /* Calculate translation by transforming to document coordinates (flipping Y)*/
-    Geom::Point translation = Geom::Point(-area[Geom::X][0], area[Geom::Y][1] - doc->getHeight());
+    Geom::Point translation = Geom::Point(-area[Geom::X][0], area[Geom::Y][1] - doc->getHeight().value("px"));
 
     /*  This calculation is only valid when assumed that (x0,y0)= area.corner(0) and (x1,y1) = area.corner(2)
      * 1) a[0] * x0 + a[2] * y1 + a[4] = 0.0

=== modified file 'src/inkview.cpp'
--- src/inkview.cpp	2013-03-25 17:42:31 +0000
+++ src/inkview.cpp	2013-09-20 17:05:49 +0000
@@ -54,6 +54,7 @@
 #include "document.h"
 #include "svg-view.h"
 #include "svg-view-widget.h"
+#include "util/units.h"
 
 #ifdef WITH_INKJAR
 #include "io/inkjar.h"
@@ -308,8 +309,8 @@
     w = gtk_window_new (GTK_WINDOW_TOPLEVEL);
     gtk_window_set_title( GTK_WINDOW(w), ss.doc->getName() );
     gtk_window_set_default_size (GTK_WINDOW (w),
-				 MIN ((int)(ss.doc)->getWidth (), (int)gdk_screen_width () - 64),
-				 MIN ((int)(ss.doc)->getHeight (), (int)gdk_screen_height () - 64));
+				 MIN ((int)(ss.doc)->getWidth().value("px"), (int)gdk_screen_width() - 64),
+				 MIN ((int)(ss.doc)->getHeight().value("px"), (int)gdk_screen_height() - 64));
     ss.window = w;
 
     g_signal_connect (G_OBJECT (w), "delete_event", (GCallback) sp_svgview_main_delete, &ss);
@@ -318,7 +319,7 @@
     (ss.doc)->ensureUpToDate();
     ss.view = sp_svg_view_widget_new (ss.doc);
     (ss.doc)->doUnref ();
-    SP_SVG_VIEW_WIDGET(ss.view)->setResize( false, ss.doc->getWidth(), ss.doc->getHeight() );
+    SP_SVG_VIEW_WIDGET(ss.view)->setResize( false, ss.doc->getWidth().value("px"), ss.doc->getHeight().value("px") );
     gtk_widget_show (ss.view);
     gtk_container_add (GTK_CONTAINER (w), ss.view);
 

=== modified file 'src/lpe-tool-context.cpp'
--- src/lpe-tool-context.cpp	2013-08-30 21:35:42 +0000
+++ src/lpe-tool-context.cpp	2013-09-20 17:05:49 +0000
@@ -330,8 +330,8 @@
 
 void
 lpetool_get_limiting_bbox_corners(SPDocument *document, Geom::Point &A, Geom::Point &B) {
-    Geom::Coord w = document->getWidth();
-    Geom::Coord h = document->getHeight();
+    Geom::Coord w = document->getWidth().value("px");
+    Geom::Coord h = document->getHeight().value("px");
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
 
     double ulx = prefs->getDouble("/tools/lpetool/bbox_upperleftx", 0);

=== modified file 'src/main.cpp'
--- src/main.cpp	2013-08-30 21:35:42 +0000
+++ src/main.cpp	2013-09-20 17:05:49 +0000
@@ -1535,7 +1535,7 @@
             g_warning("Export width %lu out of range (1 - %lu). Nothing exported.", width, (unsigned long int)PNG_UINT_31_MAX);
             return 1;
         }
-        dpi = (gdouble) width * Inkscape::Util::Quantity::convert(1, "in", "px") / area.width();
+        dpi = (gdouble) Inkscape::Util::Quantity::convert(width, "in", "px") / area.width();
     }
 
     if (sp_export_height) {
@@ -1545,15 +1545,15 @@
             g_warning("Export height %lu out of range (1 - %lu). Nothing exported.", height, (unsigned long int)PNG_UINT_31_MAX);
             return 1;
         }
-        dpi = (gdouble) height * Inkscape::Util::Quantity::convert(1, "in", "px") / area.height();
+        dpi = (gdouble) Inkscape::Util::Quantity::convert(height, "in", "px") / area.height();
     }
 
     if (!sp_export_width) {
-        width = (unsigned long int) (area.width() * dpi / Inkscape::Util::Quantity::convert(1, "in", "px") + 0.5);
+        width = (unsigned long int) (Inkscape::Util::Quantity::convert(area.width(), "px", "in") * dpi + 0.5);
     }
 
     if (!sp_export_height) {
-        height = (unsigned long int) (area.height() * dpi / Inkscape::Util::Quantity::convert(1, "in", "px") + 0.5);
+        height = (unsigned long int) (Inkscape::Util::Quantity::convert(area.height(), "px", "in") * dpi + 0.5);
     }
 
     guint32 bgcolor = 0x00000000;

=== modified file 'src/object-snapper.cpp'
--- src/object-snapper.cpp	2013-08-03 21:30:12 +0000
+++ src/object-snapper.cpp	2013-09-20 17:05:49 +0000
@@ -770,7 +770,7 @@
 
 Geom::PathVector* Inkscape::ObjectSnapper::_getBorderPathv() const
 {
-    Geom::Rect const border_rect = Geom::Rect(Geom::Point(0,0), Geom::Point((_snapmanager->getDocument())->getWidth(),(_snapmanager->getDocument())->getHeight()));
+    Geom::Rect const border_rect = Geom::Rect(Geom::Point(0,0), Geom::Point((_snapmanager->getDocument())->getWidth().value("px"),(_snapmanager->getDocument())->getHeight().value("px")));
     return _getPathvFromRect(border_rect);
 }
 
@@ -787,8 +787,8 @@
 
 void Inkscape::ObjectSnapper::_getBorderNodes(std::vector<SnapCandidatePoint> *points) const
 {
-    Geom::Coord w = (_snapmanager->getDocument())->getWidth();
-    Geom::Coord h = (_snapmanager->getDocument())->getHeight();
+    Geom::Coord w = (_snapmanager->getDocument())->getWidth().value("px");
+    Geom::Coord h = (_snapmanager->getDocument())->getHeight().value("px");
     points->push_back(SnapCandidatePoint(Geom::Point(0,0), SNAPSOURCE_UNDEFINED, SNAPTARGET_PAGE_CORNER));
     points->push_back(SnapCandidatePoint(Geom::Point(0,h), SNAPSOURCE_UNDEFINED, SNAPTARGET_PAGE_CORNER));
     points->push_back(SnapCandidatePoint(Geom::Point(w,h), SNAPSOURCE_UNDEFINED, SNAPTARGET_PAGE_CORNER));

=== modified file 'src/persp3d.cpp'
--- src/persp3d.cpp	2013-07-31 20:51:23 +0000
+++ src/persp3d.cpp	2013-09-20 17:05:49 +0000
@@ -24,6 +24,7 @@
 #include "desktop-handles.h"
 #include <glibmm/i18n.h>
 #include "verbs.h"
+#include "util/units.h"
 
 using Inkscape::DocumentUndo;
 
@@ -168,10 +169,10 @@
     repr = xml_doc->createElement("inkscape:perspective");
     repr->setAttribute("sodipodi:type", "inkscape:persp3d");
 
-    Proj::Pt2 proj_vp_x = Proj::Pt2 (0.0, document->getHeight()/2, 1.0);
+    Proj::Pt2 proj_vp_x = Proj::Pt2 (0.0, document->getHeight().value("px")/2, 1.0);
     Proj::Pt2 proj_vp_y = Proj::Pt2 (0.0, 1000.0, 0.0);
-    Proj::Pt2 proj_vp_z = Proj::Pt2 (document->getWidth(), document->getHeight()/2, 1.0);
-    Proj::Pt2 proj_origin = Proj::Pt2 (document->getWidth()/2, document->getHeight()/3, 1.0);
+    Proj::Pt2 proj_vp_z = Proj::Pt2 (document->getWidth().value("px"), document->getHeight().value("px")/2, 1.0);
+    Proj::Pt2 proj_origin = Proj::Pt2 (document->getWidth().value("px")/2, document->getHeight().value("px")/3, 1.0);
 
     if (dup) {
         proj_vp_x = dup->tmat.column (Proj::X);

=== modified file 'src/rect-context.cpp'
--- src/rect-context.cpp	2013-08-30 21:35:42 +0000
+++ src/rect-context.cpp	2013-09-20 17:05:49 +0000
@@ -478,6 +478,7 @@
         }
 
         this->rect->updateRepr();
+        this->rect->doWriteTransform(this->rect->getRepr(), this->rect->transform, NULL, true);
 
         this->desktop->canvas->endForcedFullRedraws();
 

=== modified file 'src/selection-chemistry.cpp'
--- src/selection-chemistry.cpp	2013-09-19 02:05:00 +0000
+++ src/selection-chemistry.cpp	2013-09-20 17:05:49 +0000
@@ -2809,7 +2809,7 @@
     }
 
     // calculate the transform to be applied to objects to move them to 0,0
-    Geom::Point move_p = Geom::Point(0, doc->getHeight()) - *c;
+    Geom::Point move_p = Geom::Point(0, doc->getHeight().value("px")) - *c;
     move_p[Geom::Y] = -move_p[Geom::Y];
     Geom::Affine move = Geom::Affine(Geom::Translate(move_p));
 
@@ -3093,7 +3093,7 @@
     }
 
     // calculate the transform to be applied to objects to move them to 0,0
-    Geom::Point move_p = Geom::Point(0, doc->getHeight()) - (r->min() + Geom::Point(0, r->dimensions()[Geom::Y]));
+    Geom::Point move_p = Geom::Point(0, doc->getHeight().value("px")) - (r->min() + Geom::Point(0, r->dimensions()[Geom::Y]));
     move_p[Geom::Y] = -move_p[Geom::Y];
     Geom::Affine move = Geom::Affine(Geom::Translate(move_p));
 
@@ -3398,7 +3398,7 @@
         res = prefs_res;
     } else if (0 < prefs_min) {
         // If minsize is given, look up minimum bitmap size (default 250 pixels) and calculate resolution from it
-        res = Inkscape::Util::Quantity::convert(1, "in", "px") * prefs_min / MIN(bbox->width(), bbox->height());
+        res = Inkscape::Util::Quantity::convert(prefs_min, "in", "px") / MIN(bbox->width(), bbox->height());
     } else {
         float hint_xdpi = 0, hint_ydpi = 0;
         Glib::ustring hint_filename;
@@ -3419,8 +3419,8 @@
     }
 
     // The width and height of the bitmap in pixels
-    unsigned width = (unsigned) floor(bbox->width() * res / Inkscape::Util::Quantity::convert(1, "in", "px"));
-    unsigned height =(unsigned) floor(bbox->height() * res / Inkscape::Util::Quantity::convert(1, "in", "px"));
+    unsigned width = (unsigned) floor(bbox->width() * Inkscape::Util::Quantity::convert(res, "px", "in"));
+    unsigned height =(unsigned) floor(bbox->height() * Inkscape::Util::Quantity::convert(res, "px", "in"));
 
     // Find out if we have to run an external filter
     gchar const *run = NULL;

=== modified file 'src/shape-editor.cpp'
--- src/shape-editor.cpp	2013-08-03 21:39:12 +0000
+++ src/shape-editor.cpp	2013-09-20 17:05:49 +0000
@@ -35,6 +35,8 @@
 
 using Inkscape::createKnotHolder;
 
+bool ShapeEditor::_blockSetItem = false;
+
 ShapeEditor::ShapeEditor(SPDesktop *dt) {
     this->desktop = dt;
     this->knotholder = NULL;
@@ -169,6 +171,10 @@
 
 
 void ShapeEditor::set_item(SPItem *item, SubType type, bool keep_knotholder) {
+    if (_blockSetItem) {
+        return;
+    }
+
     // this happens (and should only happen) when for an LPEItem having both knotholder and
     // nodepath the knotholder is adapted; in this case we don't want to delete the knotholder
     // since this freezes the handles

=== modified file 'src/shape-editor.h'
--- src/shape-editor.h	2011-10-05 07:06:08 +0000
+++ src/shape-editor.h	2013-09-20 17:05:49 +0000
@@ -65,11 +65,14 @@
     void shapeeditor_event_attr_changed(gchar const *name);
 
     bool knot_mouseover();
+    
+    static void blockSetItem(bool b) {_blockSetItem = b;}
 
 private:
     bool has_knotholder ();
     void reset_item (SubType type, bool keep_knotholder = true);
     const SPItem *get_item (SubType type);
+    static bool _blockSetItem;
 
     SPDesktop *desktop;
     KnotHolder *knotholder;

=== modified file 'src/sp-ellipse.cpp'
--- src/sp-ellipse.cpp	2013-09-20 04:45:16 +0000
+++ src/sp-ellipse.cpp	2013-09-20 17:05:49 +0000
@@ -318,6 +318,59 @@
     }
 }
 
+Geom::Affine SPGenericEllipse::set_transform(Geom::Affine const &xform)
+{
+    /* Calculate ellipse start in parent coords. */
+    Geom::Point pos( Geom::Point(this->cx.computed, this->cy.computed) * xform );
+
+    /* This function takes care of translation and scaling, we return whatever parts we can't
+       handle. */
+    Geom::Affine ret(Geom::Affine(xform).withoutTranslation());
+    gdouble const sw = hypot(ret[0], ret[1]);
+    gdouble const sh = hypot(ret[2], ret[3]);
+    if (sw > 1e-9) {
+        ret[0] /= sw;
+        ret[1] /= sw;
+    } else {
+        ret[0] = 1.0;
+        ret[1] = 0.0;
+    }
+    if (sh > 1e-9) {
+        ret[2] /= sh;
+        ret[3] /= sh;
+    } else {
+        ret[2] = 0.0;
+        ret[3] = 1.0;
+    }
+
+    if (this->rx._set) {
+        this->rx = this->rx.computed * sw;
+    }
+    if (this->ry._set) {
+        this->ry = this->ry.computed * sh;
+    }
+
+    /* Find start in item coords */
+    pos = pos * ret.inverse();
+    this->cx = pos[Geom::X];
+    this->cy = pos[Geom::Y];
+
+    this->set_shape();
+
+    // Adjust stroke width
+    this->adjust_stroke(sqrt(fabs(sw * sh)));
+
+    // Adjust pattern fill
+    this->adjust_pattern(xform * ret.inverse());
+
+    // Adjust gradient fill
+    this->adjust_gradient(xform * ret.inverse());
+
+    this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG);
+
+    return ret;
+}
+
 void
 sp_genericellipse_normalize(SPGenericEllipse *ellipse)
 {

=== modified file 'src/sp-ellipse.h'
--- src/sp-ellipse.h	2013-09-20 04:45:16 +0000
+++ src/sp-ellipse.h	2013-09-20 17:05:49 +0000
@@ -39,6 +39,7 @@
 
 	virtual void snappoints(std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape::SnapPreferences const *snapprefs);
 	virtual void set_shape();
+	virtual Geom::Affine set_transform(Geom::Affine const& xform);
 
 	virtual void update_patheffect(bool write);
 };

=== modified file 'src/sp-flowtext.cpp'
--- src/sp-flowtext.cpp	2013-09-20 04:45:16 +0000
+++ src/sp-flowtext.cpp	2013-09-20 17:05:49 +0000
@@ -28,6 +28,7 @@
 #include "text-tag-attributes.h"
 #include "text-chemistry.h"
 #include "text-editing.h"
+#include "sp-text.h"
 
 #include "livarot/Shape.h"
 
@@ -648,6 +649,44 @@
     return ft_item;
 }
 
+Geom::Affine SPFlowtext::set_transform (Geom::Affine const &xform)
+{
+    if ((this->_optimizeScaledText && !xform.withoutTranslation().isNonzeroUniformScale())
+        || (!this->_optimizeScaledText && !xform.isNonzeroUniformScale())) {
+        this->_optimizeScaledText = false;
+        return xform;
+    }
+    this->_optimizeScaledText = false;
+    
+    SPText *text = reinterpret_cast<SPText *>(this);
+    
+    double const ex = xform.descrim();
+    if (ex == 0) {
+        return xform;
+    }
+
+    Geom::Affine ret(xform);
+    ret[0] /= ex;
+    ret[1] /= ex;
+    ret[2] /= ex;
+    ret[3] /= ex;
+
+    // Adjust font size
+    text->_adjustFontsizeRecursive (this, ex);
+
+    // Adjust stroke width
+    this->adjust_stroke_width_recursive (ex);
+
+    // Adjust pattern fill
+    this->adjust_pattern(xform * ret.inverse());
+
+    // Adjust gradient fill
+    this->adjust_gradient(xform * ret.inverse());
+
+    this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG | SP_TEXT_LAYOUT_MODIFIED_FLAG);
+
+    return ret;
+}
 
 /*
   Local Variables:

=== modified file 'src/sp-flowtext.h'
--- src/sp-flowtext.h	2013-09-20 04:45:16 +0000
+++ src/sp-flowtext.h	2013-09-20 17:05:49 +0000
@@ -43,6 +43,12 @@
 
     double par_indent;
 
+    bool _optimizeScaledText;
+
+    /** Optimize scaled flow text on next set_transform. */
+    void optimizeScaledText()
+        {_optimizeScaledText = true;}
+
 private:
     /** Recursively walks the xml tree adding tags and their contents. */
     void _buildLayoutInput(SPObject *root, Shape const *exclusion_shape, std::list<Shape> *shapes, SPObject **pending_line_break_object);
@@ -58,6 +64,7 @@
 	virtual void remove_child(Inkscape::XML::Node* child);
 
 	virtual void set(unsigned int key, const gchar* value);
+	virtual Geom::Affine set_transform(Geom::Affine const& xform);
 
 	virtual void update(SPCtx* ctx, unsigned int flags);
 	virtual void modified(unsigned int flags);

=== modified file 'src/sp-guide.cpp'
--- src/sp-guide.cpp	2013-08-30 21:35:42 +0000
+++ src/sp-guide.cpp	2013-09-20 17:05:49 +0000
@@ -287,7 +287,7 @@
     std::list<std::pair<Geom::Point, Geom::Point> > pts;
 
     Geom::Point A(0, 0);
-    Geom::Point C(doc->getWidth(), doc->getHeight());
+    Geom::Point C(doc->getWidth().value("px"), doc->getHeight().value("px"));
     Geom::Point B(C[Geom::X], 0);
     Geom::Point D(0, C[Geom::Y]);
 

=== modified file 'src/sp-item-group.cpp'
--- src/sp-item-group.cpp	2013-09-20 04:45:16 +0000
+++ src/sp-item-group.cpp	2013-09-20 17:05:49 +0000
@@ -50,6 +50,9 @@
 #include "sp-switch.h"
 #include "sp-defs.h"
 #include "verbs.h"
+#include "layer-model.h"
+#include "sp-textpath.h"
+#include "sp-flowtext.h"
 
 using Inkscape::DocumentUndo;
 
@@ -644,6 +647,81 @@
     }
 }
 
+// Recursively scale child items around a point
+void SPGroup::scaleChildItemsRec(Geom::Scale const &sc, Geom::Point const &p)
+{
+    if ( hasChildren() ) {
+        for (SPObject *o = firstChild() ; o ; o = o->getNext() ) {
+            if ( SP_IS_ITEM(o) ) {
+                if (SP_IS_GROUP(o) && !SP_IS_BOX3D(o)) {
+                    SP_GROUP(o)->scaleChildItemsRec(sc, p);
+                } else {
+                    SPItem *item = SP_ITEM(o);
+                    Geom::OptRect bbox = item->desktopVisualBounds();
+                    if (bbox) {
+                        // Scale item
+                        Geom::Translate const s(p);
+                        Geom::Affine final = s.inverse() * sc * s;
+                        
+                        Geom::Point old_center(0,0);
+                        if (item->isCenterSet()) {
+                            old_center = item->getCenter();
+                        }
+                        
+                        gchar const *conn_type = NULL;
+                        if (SP_IS_TEXT_TEXTPATH(item)) {
+                            SP_TEXT(item)->optimizeTextpathText();
+                        } else if (SP_IS_FLOWTEXT(item)) {
+                            SP_FLOWTEXT(item)->optimizeScaledText();
+                        } else if (SP_IS_BOX3D(item)) {
+                            // Force recalculation from perspective
+                            box3d_position_set(SP_BOX3D(item));
+                        } else if (item->getAttribute("inkscape:connector-type") != NULL
+                            && (item->getAttribute("inkscape:connection-start") == NULL
+                                || item->getAttribute("inkscape:connection-end") == NULL)) {
+                            // Remove and store connector type for transform if disconnected
+                            conn_type = item->getAttribute("inkscape:connector-type");
+                            item->removeAttribute("inkscape:connector-type");
+                        }
+                        
+                        if (SP_IS_PERSP3D(item)) {
+                            persp3d_apply_affine_transformation(SP_PERSP3D(item), final);
+                        } else if ((SP_IS_TEXT_TEXTPATH(item) || SP_IS_FLOWTEXT(item)) && !item->transform.isIdentity()) {
+                            // Save and reset current transform
+                            Geom::Affine tmp(item->transform);
+                            item->transform = Geom::Affine();
+                            // Apply scale
+                            item->set_i2d_affine(item->i2dt_affine() * sc);
+                            item->doWriteTransform(item->getRepr(), item->transform, NULL, true);
+                            // Scale translation and restore original transform
+                            tmp[4] *= sc[0];
+                            tmp[5] *= sc[1];
+                            item->doWriteTransform(item->getRepr(), tmp, NULL, true);
+                        } else if (SP_IS_USE(item)) {
+                            // calculate the matrix we need to apply to the clone
+                            // to cancel its induced transform from its original
+                            Geom::Affine move = final.inverse() * item->transform * final;
+                            item->doWriteTransform(item->getRepr(), move, &move, true);
+                        } else {
+                            item->set_i2d_affine(item->i2dt_affine() * final);
+                            item->doWriteTransform(item->getRepr(), item->transform, NULL, true);
+                        }
+                        
+                        if (conn_type != NULL) {
+                            item->setAttribute("inkscape:connector-type", conn_type);
+                        }
+                        
+                        if (item->isCenterSet() && !(final.isTranslation() || final.isIdentity())) {
+                            item->setCenter(old_center * final);
+                            item->updateRepr();
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
 gint SPGroup::getItemCount() {
     gint len = 0;
     for (SPObject *o = this->firstChild() ; o ; o = o->getNext() ) {

=== modified file 'src/sp-item-group.h'
--- src/sp-item-group.h	2013-09-20 04:45:16 +0000
+++ src/sp-item-group.h	2013-09-20 17:05:49 +0000
@@ -52,6 +52,7 @@
     LayerMode layerDisplayMode(unsigned int display_key) const;
     void setLayerDisplayMode(unsigned int display_key, LayerMode mode);
     void translateChildItems(Geom::Translate const &tr);
+    void scaleChildItemsRec(Geom::Scale const &sc, Geom::Point const &p);
 
     gint getItemCount();
     void _showChildren (Inkscape::Drawing &drawing, Inkscape::DrawingItem *ai, unsigned int key, unsigned int flags);

=== modified file 'src/sp-item.cpp'
--- src/sp-item.cpp	2013-09-20 04:45:16 +0000
+++ src/sp-item.cpp	2013-09-20 17:05:49 +0000
@@ -73,6 +73,8 @@
 #include "live_effects/effect.h"
 #include "live_effects/lpeobject-reference.h"
 
+#include "util/units.h"
+
 #define noSP_ITEM_DEBUG_IDLE
 
 
@@ -818,7 +820,7 @@
 Geom::OptRect SPItem::desktopVisualBounds() const
 {
     /// @fixme hardcoded desktop transform
-    Geom::Affine m = Geom::Scale(1, -1) * Geom::Translate(0, document->getHeight());
+    Geom::Affine m = Geom::Scale(1, -1) * Geom::Translate(0, document->getHeight().value("px"));
     Geom::OptRect ret = documentVisualBounds();
     if (ret) *ret *= m;
     return ret;
@@ -1500,7 +1502,7 @@
         // TODO temp code to prevent crashing on command-line launch:
         ret = i2doc_affine()
             * Geom::Scale(1, -1)
-            * Geom::Translate(0, document->getHeight());
+            * Geom::Translate(0, document->getHeight().value("px"));
     }
     return ret;
 }

=== modified file 'src/sp-root.h'
--- src/sp-root.h	2013-09-15 00:43:49 +0000
+++ src/sp-root.h	2013-09-20 17:05:49 +0000
@@ -41,7 +41,7 @@
     SVGLength height;
 
     /* viewBox; */
-    unsigned int viewBox_set : 1;
+    bool viewBox_set : true;
     Geom::Rect viewBox;
 
     /* preserveAspectRatio */

=== modified file 'src/sp-spiral.cpp'
--- src/sp-spiral.cpp	2013-09-20 04:45:16 +0000
+++ src/sp-spiral.cpp	2013-09-20 17:05:49 +0000
@@ -28,7 +28,6 @@
 
 #include "sp-spiral.h"
 
-
 #include "sp-factory.h"
 
 namespace {
@@ -435,6 +434,58 @@
 }
 
 /**
+ * Set spiral transform
+ */
+Geom::Affine SPSpiral::set_transform(Geom::Affine const &xform)
+{
+    // Only set transform with proportional scaling
+    if (!xform.withoutTranslation().isUniformScale()) {
+        return xform;
+    }
+
+    /* Calculate spiral start in parent coords. */
+    Geom::Point pos( Geom::Point(this->cx, this->cy) * xform );
+
+    /* This function takes care of translation and scaling, we return whatever parts we can't
+       handle. */
+    Geom::Affine ret(Geom::Affine(xform).withoutTranslation());
+    gdouble const s = hypot(ret[0], ret[1]);
+    if (s > 1e-9) {
+        ret[0] /= s;
+        ret[1] /= s;
+        ret[2] /= s;
+        ret[3] /= s;
+    } else {
+        ret[0] = 1.0;
+        ret[1] = 0.0;
+        ret[2] = 0.0;
+        ret[3] = 1.0;
+    }
+
+    this->rad *= s;
+
+    /* Find start in item coords */
+    pos = pos * ret.inverse();
+    this->cx = pos[Geom::X];
+    this->cy = pos[Geom::Y];
+
+    this->set_shape();
+
+    // Adjust stroke width
+    this->adjust_stroke(s);
+
+    // Adjust pattern fill
+    this->adjust_pattern(xform * ret.inverse());
+
+    // Adjust gradient fill
+    this->adjust_gradient(xform * ret.inverse());
+
+    this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG);
+
+    return ret;
+}
+
+/**
  * Return one of the points on the spiral.
  *
  * \param t specifies how far along the spiral.

=== modified file 'src/sp-spiral.h'
--- src/sp-spiral.h	2013-09-20 04:45:16 +0000
+++ src/sp-spiral.h	2013-09-20 17:05:49 +0000
@@ -53,6 +53,7 @@
 
 	/* Lowlevel interface */
 	void setPosition(gdouble cx, gdouble cy, gdouble exp, gdouble revo, gdouble rad, gdouble arg, gdouble t0);
+	virtual Geom::Affine set_transform(Geom::Affine const& xform);
 
 	Geom::Point getXY(gdouble t) const;
 

=== modified file 'src/sp-star.cpp'
--- src/sp-star.cpp	2013-09-20 04:45:16 +0000
+++ src/sp-star.cpp	2013-09-20 17:05:49 +0000
@@ -514,6 +514,55 @@
     }
 }
 
+Geom::Affine SPStar::set_transform(Geom::Affine const &xform)
+{
+    // Only set transform with proportional scaling
+    if (!xform.withoutTranslation().isUniformScale()) {
+        return xform;
+    }
+
+    /* Calculate star start in parent coords. */
+    Geom::Point pos( this->center * xform );
+
+    /* This function takes care of translation and scaling, we return whatever parts we can't
+       handle. */
+    Geom::Affine ret(Geom::Affine(xform).withoutTranslation());
+    gdouble const s = hypot(ret[0], ret[1]);
+    if (s > 1e-9) {
+        ret[0] /= s;
+        ret[1] /= s;
+        ret[2] /= s;
+        ret[3] /= s;
+    } else {
+        ret[0] = 1.0;
+        ret[1] = 0.0;
+        ret[2] = 0.0;
+        ret[3] = 1.0;
+    }
+
+    this->r[0] *= s;
+    this->r[1] *= s;
+
+    /* Find start in item coords */
+    pos = pos * ret.inverse();
+    this->center = pos;
+
+    this->set_shape();
+
+    // Adjust stroke width
+    this->adjust_stroke(s);
+
+    // Adjust pattern fill
+    this->adjust_pattern(xform * ret.inverse());
+
+    // Adjust gradient fill
+    this->adjust_gradient(xform * ret.inverse());
+
+    this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG);
+
+    return ret;
+}
+
 /**
  * sp_star_get_xy: Get X-Y value as item coordinate system
  * @star: star item

=== modified file 'src/sp-star.h'
--- src/sp-star.h	2013-09-20 04:45:16 +0000
+++ src/sp-star.h	2013-09-20 17:05:49 +0000
@@ -56,6 +56,7 @@
 
 	virtual void update_patheffect(bool write);
 	virtual void set_shape();
+	virtual Geom::Affine set_transform(Geom::Affine const& xform);
 };
 
 void sp_star_position_set (SPStar *star, gint sides, Geom::Point center, gdouble r1, gdouble r2, gdouble arg1, gdouble arg2, bool isflat, double rounded, double randomized);

=== modified file 'src/sp-text.cpp'
--- src/sp-text.cpp	2013-09-20 04:45:16 +0000
+++ src/sp-text.cpp	2013-09-20 17:05:49 +0000
@@ -377,8 +377,13 @@
 
 Geom::Affine SPText::set_transform(Geom::Affine const &xform) {
     // we cannot optimize textpath because changing its fontsize will break its match to the path
-    if (SP_IS_TEXT_TEXTPATH (this))
-        return xform;
+    if (SP_IS_TEXT_TEXTPATH (this)) {
+        if (!this->_optimizeTextpathText) {
+            return xform;
+        } else {
+            this->_optimizeTextpathText = false;
+        }
+    }
 
     /* This function takes care of scaling & translation only, we return whatever parts we can't
        handle. */

=== modified file 'src/sp-text.h'
--- src/sp-text.h	2013-09-20 04:45:16 +0000
+++ src/sp-text.h	2013-09-20 17:05:49 +0000
@@ -58,6 +58,8 @@
     /** discards the drawing objects representing this text. */
     void _clearFlow(Inkscape::DrawingGroup *in_arena);
 
+    bool _optimizeTextpathText;
+
 private:
     /** Recursively walks the xml tree adding tags and their contents. The
     non-trivial code does two things: firstly, it manages the positioning
@@ -67,6 +69,10 @@
     unsigned _buildLayoutInput(SPObject *root, Inkscape::Text::Layout::OptionalTextTagAttrs const &parent_optional_attrs, unsigned parent_attrs_offset, bool in_textpath);
 
 public:
+    /** Optimize textpath text on next set_transform. */
+    void optimizeTextpathText()
+        {_optimizeTextpathText = true;}
+
 	virtual void build(SPDocument* doc, Inkscape::XML::Node* repr);
 	virtual void release();
 	virtual void child_added(Inkscape::XML::Node* child, Inkscape::XML::Node* ref);

=== modified file 'src/spiral-context.cpp'
--- src/spiral-context.cpp	2013-08-30 21:35:42 +0000
+++ src/spiral-context.cpp	2013-09-20 17:05:49 +0000
@@ -417,6 +417,7 @@
 
         spiral->set_shape();
         spiral->updateRepr(SP_OBJECT_WRITE_EXT);
+        spiral->doWriteTransform(spiral->getRepr(), spiral->transform, NULL, true);
 
         this->desktop->canvas->endForcedFullRedraws();
 

=== modified file 'src/star-context.cpp'
--- src/star-context.cpp	2013-08-30 21:35:42 +0000
+++ src/star-context.cpp	2013-09-20 17:05:49 +0000
@@ -443,6 +443,7 @@
         this->star->setCenter(this->center);
         this->star->set_shape();
         this->star->updateRepr(SP_OBJECT_WRITE_EXT);
+        this->star->doWriteTransform(this->star->getRepr(), this->star->transform, NULL, true);
 
         desktop->canvas->endForcedFullRedraws();
 

=== modified file 'src/style.cpp'
--- src/style.cpp	2013-09-18 19:16:05 +0000
+++ src/style.cpp	2013-09-20 17:05:49 +0000
@@ -2523,11 +2523,11 @@
 
         case SP_CSS_UNIT_NONE: unit_size = size; break;
         case SP_CSS_UNIT_PX: unit_size = size; break;
-        case SP_CSS_UNIT_PT: unit_size = size * Inkscape::Util::Quantity::convert(1, "px", "pt");  break;
-        case SP_CSS_UNIT_PC: unit_size = size * (Inkscape::Util::Quantity::convert(1, "px", "pt") / Inkscape::Util::Quantity::convert(1, "pc", "pt"));  break;
-        case SP_CSS_UNIT_MM: unit_size = size * Inkscape::Util::Quantity::convert(1, "px", "mm");  break;
-        case SP_CSS_UNIT_CM: unit_size = size * Inkscape::Util::Quantity::convert(1, "px", "cm");  break;
-        case SP_CSS_UNIT_IN: unit_size = size * Inkscape::Util::Quantity::convert(1, "px", "in");  break;
+        case SP_CSS_UNIT_PT: unit_size = Inkscape::Util::Quantity::convert(size, "px", "pt");  break;
+        case SP_CSS_UNIT_PC: unit_size = Inkscape::Util::Quantity::convert(size, "px", "pc");  break;
+        case SP_CSS_UNIT_MM: unit_size = Inkscape::Util::Quantity::convert(size, "px", "mm");  break;
+        case SP_CSS_UNIT_CM: unit_size = Inkscape::Util::Quantity::convert(size, "px", "cm");  break;
+        case SP_CSS_UNIT_IN: unit_size = Inkscape::Util::Quantity::convert(size, "px", "in");  break;
         case SP_CSS_UNIT_EM: unit_size = size / SP_CSS_FONT_SIZE_DEFAULT; break;
         case SP_CSS_UNIT_EX: unit_size = size * 2.0 / SP_CSS_FONT_SIZE_DEFAULT ; break;
         case SP_CSS_UNIT_PERCENT: unit_size = size * 100.0 / SP_CSS_FONT_SIZE_DEFAULT; break;
@@ -3530,19 +3530,19 @@
             } else if (!strcmp(e, "pt")) {
                 /* Userspace / DEVICESCALE */
                 val->unit = SP_CSS_UNIT_PT;
-                val->computed = value * Inkscape::Util::Quantity::convert(1, "pt", "px");
+                val->computed = Inkscape::Util::Quantity::convert(value, "pt", "px");
             } else if (!strcmp(e, "pc")) {
                 val->unit = SP_CSS_UNIT_PC;
-                val->computed = value * Inkscape::Util::Quantity::convert(1, "pc", "px");
+                val->computed = Inkscape::Util::Quantity::convert(value, "pc", "px");
             } else if (!strcmp(e, "mm")) {
                 val->unit = SP_CSS_UNIT_MM;
-                val->computed = value * Inkscape::Util::Quantity::convert(1, "mm", "px");
+                val->computed = Inkscape::Util::Quantity::convert(value, "mm", "px");
             } else if (!strcmp(e, "cm")) {
                 val->unit = SP_CSS_UNIT_CM;
-                val->computed = value * Inkscape::Util::Quantity::convert(1, "cm", "px");
+                val->computed = Inkscape::Util::Quantity::convert(value, "cm", "px");
             } else if (!strcmp(e, "in")) {
                 val->unit = SP_CSS_UNIT_IN;
-                val->computed = value * Inkscape::Util::Quantity::convert(1, "in", "px");
+                val->computed = Inkscape::Util::Quantity::convert(value, "in", "px");
             } else if (!strcmp(e, "em")) {
                 /* EM square */
                 val->unit = SP_CSS_UNIT_EM;
@@ -4204,23 +4204,23 @@
                     return g_strlcpy(p, os.str().c_str(), len);
                     break;
                 case SP_CSS_UNIT_PT:
-                    os << key << ":" << val->computed * Inkscape::Util::Quantity::convert(1, "px", "pt") << "pt;";
+                    os << key << ":" << Inkscape::Util::Quantity::convert(val->computed, "px", "pt") << "pt;";
                     return g_strlcpy(p, os.str().c_str(), len);
                     break;
                 case SP_CSS_UNIT_PC:
-                    os << key << ":" << val->computed * Inkscape::Util::Quantity::convert(1, "px", "pt") / 12.0 << "pc;";
+                    os << key << ":" << Inkscape::Util::Quantity::convert(val->computed, "px", "pc") << "pc;";
                     return g_strlcpy(p, os.str().c_str(), len);
                     break;
                 case SP_CSS_UNIT_MM:
-                    os << key << ":" << val->computed * Inkscape::Util::Quantity::convert(1, "px", "mm") << "mm;";
+                    os << key << ":" << Inkscape::Util::Quantity::convert(val->computed, "px", "mm") << "mm;";
                     return g_strlcpy(p, os.str().c_str(), len);
                     break;
                 case SP_CSS_UNIT_CM:
-                    os << key << ":" << val->computed * Inkscape::Util::Quantity::convert(1, "px", "cm") << "cm;";
+                    os << key << ":" << Inkscape::Util::Quantity::convert(val->computed, "px", "cm") << "cm;";
                     return g_strlcpy(p, os.str().c_str(), len);
                     break;
                 case SP_CSS_UNIT_IN:
-                    os << key << ":" << val->computed * Inkscape::Util::Quantity::convert(1, "px", "in") << "in;";
+                    os << key << ":" << Inkscape::Util::Quantity::convert(val->computed, "px", "in") << "in;";
                     return g_strlcpy(p, os.str().c_str(), len);
                     break;
                 case SP_CSS_UNIT_EM:

=== modified file 'src/svg-view-widget.cpp'
--- src/svg-view-widget.cpp	2012-06-09 20:37:17 +0000
+++ src/svg-view-widget.cpp	2013-09-20 17:05:49 +0000
@@ -21,6 +21,7 @@
 #include "document.h"
 #include "svg-view.h"
 #include "svg-view-widget.h"
+#include "util/units.h"
 
 static void sp_svg_view_widget_class_init (SPSVGSPViewWidgetClass *klass);
 static void sp_svg_view_widget_init (SPSVGSPViewWidget *widget);
@@ -175,8 +176,8 @@
 		gdouble width, height;
 
 		svgv = static_cast<SPSVGView*> (v);
-		width = (v->doc())->getWidth () * svgv->_hscale;
-		height = (v->doc())->getHeight () * svgv->_vscale;
+		width = (v->doc())->getWidth().value("px") * svgv->_hscale;
+		height = (v->doc())->getHeight().value("px") * svgv->_vscale;
 
 		if (width <= vw->maxwidth) {
 			hpol = GTK_POLICY_NEVER;

=== modified file 'src/svg-view.cpp'
--- src/svg-view.cpp	2012-04-09 17:19:31 +0000
+++ src/svg-view.cpp	2013-09-20 17:05:49 +0000
@@ -20,6 +20,7 @@
 #include "sp-item.h"
 #include "svg-view.h"
 #include "sp-root.h"
+#include "util/units.h"
 
 SPSVGView::SPSVGView(SPCanvasGroup *parent)
 {
@@ -71,16 +72,16 @@
     if (!doc()) {
         return;
     }
-    if (doc()->getWidth () < 1e-9) {
+    if (doc()->getWidth().value("px") < 1e-9) {
         return;
     }
-    if (doc()->getHeight () < 1e-9) {
+    if (doc()->getHeight().value("px") < 1e-9) {
         return;
     }
 
     if (_rescale) {
-        _hscale = _width / doc()->getWidth ();
-        _vscale = _height / doc()->getHeight ();
+        _hscale = _width / doc()->getWidth().value("px");
+        _vscale = _height / doc()->getHeight().value("px");
         if (_keepaspect) {
             if (_hscale > _vscale) {
                 _hscale = _vscale;
@@ -95,8 +96,8 @@
     }
 
     if (event) {
-        emitResized (doc()->getWidth () * _hscale,
-                doc()->getHeight () * _vscale);
+        emitResized (doc()->getWidth().value("px") * _hscale,
+                doc()->getHeight().value("px") * _vscale);
     }
 }
 

=== modified file 'src/text-context.cpp'
--- src/text-context.cpp	2013-08-30 21:35:42 +0000
+++ src/text-context.cpp	2013-09-20 17:05:49 +0000
@@ -441,6 +441,7 @@
     text_item->transform = SP_ITEM(ec->desktop->currentLayer())->i2doc_affine().inverse();
 
     text_item->updateRepr();
+    text_item->doWriteTransform(text_item->getRepr(), text_item->transform, NULL, true);
     DocumentUndo::done(sp_desktop_document(ec->desktop), SP_VERB_CONTEXT_TEXT,
 		       _("Create text"));
 }

=== modified file 'src/ui/clipboard.cpp'
--- src/ui/clipboard.cpp	2013-09-14 11:09:15 +0000
+++ src/ui/clipboard.cpp	2013-09-20 17:05:49 +0000
@@ -1087,8 +1087,8 @@
             Geom::Point origin (_clipboardSPDoc->getRoot()->x.computed, _clipboardSPDoc->getRoot()->y.computed);
             Geom::Rect area = Geom::Rect(origin, origin + _clipboardSPDoc->getDimensions());
 
-            unsigned long int width = (unsigned long int) (area.width() * dpi / Inkscape::Util::Quantity::convert(1, "in", "px") + 0.5);
-            unsigned long int height = (unsigned long int) (area.height() * dpi / Inkscape::Util::Quantity::convert(1, "in", "px") + 0.5);
+            unsigned long int width = (unsigned long int) (Inkscape::Util::Quantity::convert(area.width(), "px", "in") * dpi + 0.5);
+            unsigned long int height = (unsigned long int) (Inkscape::Util::Quantity::convert(area.height(), "in", "px") * dpi + 0.5);
 
             // read from namedview
             Inkscape::XML::Node *nv = sp_repr_lookup_name (_clipboardSPDoc->rroot, "sodipodi:namedview");

=== modified file 'src/ui/dialog/aboutbox.cpp'
--- src/ui/dialog/aboutbox.cpp	2013-06-17 22:53:50 +0000
+++ src/ui/dialog/aboutbox.cpp	2013-09-20 17:05:49 +0000
@@ -34,6 +34,7 @@
 #include "svg-view-widget.h"
 #include "sp-text.h"
 #include "text-editing.h"
+#include "util/units.h"
 
 #include "inkscape-version.h"
 
@@ -175,8 +176,8 @@
 
     GtkWidget *v=sp_svg_view_widget_new(doc);
 
-    double width=doc->getWidth();
-    double height=doc->getHeight();
+    double width=doc->getWidth().value("px");
+    double height=doc->getHeight().value("px");
     
     doc->doUnref();
 

=== modified file 'src/ui/dialog/document-properties.cpp'
--- src/ui/dialog/document-properties.cpp	2013-08-30 21:35:42 +0000
+++ src/ui/dialog/document-properties.cpp	2013-09-20 17:05:49 +0000
@@ -31,9 +31,12 @@
 #include "inkscape.h"
 #include "io/sys.h"
 #include "preferences.h"
+#include "shape-editor.h"
 #include "sp-namedview.h"
 #include "sp-root.h"
 #include "sp-script.h"
+#include "svg/stringstream.h"
+#include "tools-switch.h"
 #include "ui/widget/color-picker.h"
 #include "ui/widget/scalar-unit.h"
 #include "ui/dialog/filedialog.h"
@@ -53,6 +56,8 @@
 #include <gtkmm/stock.h>
 #include <gtkmm/table.h>
 
+#include <2geom/transforms.h>
+
 using std::pair;
 
 namespace Inkscape {
@@ -168,6 +173,9 @@
     signalDocumentReplaced().connect(sigc::mem_fun(*this, &DocumentProperties::_handleDocumentReplaced));
     signalActivateDesktop().connect(sigc::mem_fun(*this, &DocumentProperties::_handleActivateDesktop));
     signalDeactiveDesktop().connect(sigc::mem_fun(*this, &DocumentProperties::_handleDeactivateDesktop));
+    
+    _rum_deflt._changed_connection.block();
+    _rum_deflt.getUnitMenu()->signal_changed().connect(sigc::mem_fun(*this, &DocumentProperties::onDocUnitChange));
 }
 
 void DocumentProperties::init()
@@ -1432,9 +1440,17 @@
     if (nv->doc_units)
         _rum_deflt.setUnit (nv->doc_units->abbr);
 
-    double const doc_w_px = sp_desktop_document(dt)->getWidth();
-    double const doc_h_px = sp_desktop_document(dt)->getHeight();
-    _page_sizer.setDim (doc_w_px, doc_h_px);
+    double const doc_w = sp_desktop_document(dt)->getRoot()->width.value;
+    Glib::ustring doc_w_unit = unit_table.getUnit(sp_desktop_document(dt)->getRoot()->width.unit).abbr;
+    if (doc_w_unit == "") {
+        doc_w_unit = "px";
+    }
+    double const doc_h = sp_desktop_document(dt)->getRoot()->height.value;
+    Glib::ustring doc_h_unit = unit_table.getUnit(sp_desktop_document(dt)->getRoot()->height.unit).abbr;
+    if (doc_h_unit == "") {
+        doc_h_unit = "px";
+    }
+    _page_sizer.setDim(Inkscape::Util::Quantity(doc_w, doc_w_unit), Inkscape::Util::Quantity(doc_h, doc_h_unit));
     _page_sizer.updateFitMarginsUI(nv->getRepr());
 
     //-----------------------------------------------------------guide page
@@ -1617,6 +1633,47 @@
     }
 }
 
+/** Callback for document unit change. */
+void DocumentProperties::onDocUnitChange()
+{
+    SPDocument *doc = SP_ACTIVE_DOCUMENT;
+    Inkscape::XML::Node *repr = sp_desktop_namedview(getDesktop())->getRepr();
+    Inkscape::Util::Unit old_doc_unit = unit_table.getUnit("px");
+    if(repr->attribute("inkscape:document-units")) {
+        old_doc_unit = unit_table.getUnit(repr->attribute("inkscape:document-units"));
+    }
+    Inkscape::Util::Unit doc_unit = _rum_deflt.getUnit();
+    
+    // Don't execute when change is being undone
+    if (!DocumentUndo::getUndoSensitive(doc)) {
+        return;
+    }
+    
+    // Set document unit
+    Inkscape::SVGOStringStream os;
+    os << doc_unit.abbr;
+    repr->setAttribute("inkscape:document-units", os.str().c_str());
+    
+    // Set viewBox
+    Inkscape::Util::Quantity width = doc->getWidth();
+    Inkscape::Util::Quantity height = doc->getHeight();
+    doc->setViewBox(Geom::Rect::from_xywh(0, 0, width.value(doc_unit), height.value(doc_unit)));
+    
+    // TODO: Fix bug in nodes tool instead of switching away from it
+    if (tools_active(getDesktop()) == TOOLS_NODES) {
+        tools_switch(getDesktop(), TOOLS_SELECT);
+    }
+    
+    // Scale and translate objects
+    gdouble scale = Inkscape::Util::Quantity::convert(1, old_doc_unit, doc_unit);
+    ShapeEditor::blockSetItem(true);
+    doc->getRoot()->scaleChildItemsRec(Geom::Scale(scale), Geom::Point(0, doc->getHeight().value("px")));
+    ShapeEditor::blockSetItem(false);
+    
+    doc->setModifiedSinceSave();
+    
+    DocumentUndo::done(doc, SP_VERB_NONE, _("Changed document unit"));
+}
 
 } // namespace Dialog
 } // namespace UI

=== modified file 'src/ui/dialog/document-properties.h'
--- src/ui/dialog/document-properties.h	2013-03-12 12:20:04 +0000
+++ src/ui/dialog/document-properties.h	2013-09-20 17:05:49 +0000
@@ -216,6 +216,9 @@
     // callback methods for buttons on grids page.
     void onNewGrid();
     void onRemoveGrid();
+    
+    // callback for document unit change
+    void onDocUnitChange();
 };
 
 } // namespace Dialog

=== modified file 'src/ui/dialog/export.cpp'
--- src/ui/dialog/export.cpp	2013-09-01 16:46:33 +0000
+++ src/ui/dialog/export.cpp	2013-09-20 17:05:49 +0000
@@ -762,7 +762,7 @@
                 }
             case SELECTION_PAGE:
                 bbox = Geom::Rect(Geom::Point(0.0, 0.0),
-                                  Geom::Point(doc->getWidth(), doc->getHeight()));
+                                  Geom::Point(doc->getWidth().value("px"), doc->getHeight().value("px")));
 
                 // std::cout << "Using selection: PAGE" << std::endl;
                 key = SELECTION_PAGE;
@@ -1475,8 +1475,8 @@
                 doc = sp_desktop_document (SP_ACTIVE_DESKTOP);
 
                 Geom::Point x(0.0, 0.0);
-                Geom::Point y(doc->getWidth(),
-                              doc->getHeight());
+                Geom::Point y(doc->getWidth().value("px"),
+                              doc->getHeight().value("px"));
                 Geom::Rect bbox(x, y);
 
                 if (bbox_equal(bbox,current_bbox)) {

=== modified file 'src/ui/dialog/print.cpp'
--- src/ui/dialog/print.cpp	2013-07-31 22:33:03 +0000
+++ src/ui/dialog/print.cpp	2013-09-20 17:05:49 +0000
@@ -49,8 +49,8 @@
 
     if (junk->_tab->as_bitmap()) {
         // Render as exported PNG
-        gdouble width = (junk->_doc)->getWidth();
-        gdouble height = (junk->_doc)->getHeight();
+        gdouble width = (junk->_doc)->getWidth().value("px");
+        gdouble height = (junk->_doc)->getHeight().value("px");
         gdouble dpi = junk->_tab->bitmap_dpi();
         std::string tmp_png;
         std::string tmp_base = "inkscape-print-png-XXXXXX";
@@ -72,8 +72,8 @@
 
             sp_export_png_file(junk->_doc, tmp_png.c_str(), 0.0, 0.0,
                 width, height,
-                (unsigned long)(width * dpi / Inkscape::Util::Quantity::convert(1, "in", "px")),
-                (unsigned long)(height * dpi / Inkscape::Util::Quantity::convert(1, "in", "px")),
+                (unsigned long)(Inkscape::Util::Quantity::convert(width, "px", "in") * dpi),
+                (unsigned long)(Inkscape::Util::Quantity::convert(height, "px", "in") * dpi),
                 dpi, dpi, bgcolor, NULL, NULL, true, NULL);
 
             // This doesn't seem to work:
@@ -195,8 +195,8 @@
     // set up paper size to match the document size
     gtk_print_operation_set_unit (_printop, GTK_UNIT_POINTS);
     GtkPageSetup *page_setup = gtk_page_setup_new();
-    gdouble doc_width = _doc->getWidth() * Inkscape::Util::Quantity::convert(1, "px", "pt");
-    gdouble doc_height = _doc->getHeight() * Inkscape::Util::Quantity::convert(1, "px", "pt");
+    gdouble doc_width = _doc->getWidth().value("pt");
+    gdouble doc_height = _doc->getHeight().value("pt");
     GtkPaperSize *paper_size;
     if (doc_width > doc_height) {
         gtk_page_setup_set_orientation (page_setup, GTK_PAGE_ORIENTATION_LANDSCAPE);

=== modified file 'src/ui/dialog/text-edit.cpp'
--- src/ui/dialog/text-edit.cpp	2013-07-31 22:33:03 +0000
+++ src/ui/dialog/text-edit.cpp	2013-09-20 17:05:49 +0000
@@ -401,7 +401,7 @@
 
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     int unit = prefs->getInt("/options/font/unitType", SP_CSS_UNIT_PT);
-    double pt_size = sp_style_css_size_units_to_px(sp_font_selector_get_size(fsel), unit) * Inkscape::Util::Quantity::convert(1, "px", "pt");
+    double pt_size = Inkscape::Util::Quantity::convert(sp_style_css_size_units_to_px(sp_font_selector_get_size(fsel), unit), "px", "pt");
 
     // Pango font size is in 1024ths of a point
     // C++11: Glib::ustring size = std::to_string( pt_size * PANGO_SCALE );

=== modified file 'src/ui/widget/page-sizer.cpp'
--- src/ui/widget/page-sizer.cpp	2013-08-06 18:44:23 +0000
+++ src/ui/widget/page-sizer.cpp	2013-09-20 17:05:49 +0000
@@ -442,6 +442,7 @@
     _portrait_connection = _portraitButton.signal_toggled().connect (sigc::mem_fun (*this, &PageSizer::on_portrait));
     _changedw_connection = _dimensionWidth.signal_value_changed().connect (sigc::mem_fun (*this, &PageSizer::on_value_changed));
     _changedh_connection = _dimensionHeight.signal_value_changed().connect (sigc::mem_fun (*this, &PageSizer::on_value_changed));
+    _changedu_connection = _dimensionUnits.getUnitMenu()->signal_changed().connect (sigc::mem_fun (*this, &PageSizer::on_units_changed));
     _fitPageButton.signal_clicked().connect(sigc::mem_fun(*this, &PageSizer::fire_fit_canvas_to_selection_or_drawing));
 
     show_all_children();
@@ -454,11 +455,11 @@
  * 'changeList' is true, then adjust the paperSizeList to show the closest
  * standard page size.
  *
- * \param w, h given in px
+ * \param w, h
  * \param changeList whether to modify the paper size list
  */
 void
-PageSizer::setDim (double w, double h, bool changeList)
+PageSizer::setDim (Inkscape::Util::Quantity w, Inkscape::Util::Quantity h, bool changeList)
 {
     static bool _called = false;
     if (_called) {
@@ -475,12 +476,12 @@
 
     if (SP_ACTIVE_DESKTOP && !_widgetRegistry->isUpdating()) {
         SPDocument *doc = sp_desktop_document(SP_ACTIVE_DESKTOP);
-        double const old_height = doc->getHeight();
-        doc->setWidth (Inkscape::Util::Quantity(w, "px"));
-        doc->setHeight (Inkscape::Util::Quantity(h, "px"));
+        Inkscape::Util::Quantity const old_height = doc->getHeight();
+        doc->setWidth (w);
+        doc->setHeight (h);
         // The origin for the user is in the lower left corner; this point should remain stationary when
         // changing the page size. The SVG's origin however is in the upper left corner, so we must compensate for this
-        Geom::Translate const vert_offset(Geom::Point(0, (old_height - h)));
+        Geom::Translate const vert_offset(Geom::Point(0, (old_height.value("px") - h.value("px"))));
         doc->getRoot()->translateChildItems(vert_offset);
         DocumentUndo::done(doc, SP_VERB_NONE, _("Set page size"));
     }
@@ -503,9 +504,10 @@
             _paperSizeListSelection->select(row);
         }
 
-    Unit const& unit = _dimensionUnits.getUnit();
-    _dimensionWidth.setValue (w / unit.factor);
-    _dimensionHeight.setValue (h / unit.factor);
+    _dimensionWidth.setUnit(w.unit->abbr);
+    _dimensionWidth.setValue (w.quantity);
+    _dimensionHeight.setUnit(h.unit->abbr);
+    _dimensionHeight.setValue (h.quantity);
 
     _paper_size_list_connection.unblock();
     _landscape_connection.unblock();
@@ -547,12 +549,12 @@
  * paperSizeListStore->children().end() if no such paper exists.
  */
 Gtk::ListStore::iterator
-PageSizer::find_paper_size (double w, double h) const
+PageSizer::find_paper_size (Inkscape::Util::Quantity w, Inkscape::Util::Quantity h) const
 {
-    double smaller = w;
-    double larger  = h;
+    double smaller = w.quantity;
+    double larger  = h.quantity;
     if ( h < w ) {
-        smaller = h; larger = w;
+        smaller = h.quantity; larger = w.quantity;
     }
 
     g_return_val_if_fail(smaller <= larger, _paperSizeListStore->children().end());
@@ -562,8 +564,8 @@
          iter != _paperSizeTable.end() ; ++iter) {
         PaperSize paper = iter->second;
         Inkscape::Util::Unit const &i_unit = paper.unit;
-        double smallX = Inkscape::Util::Quantity::convert(paper.smaller, i_unit, "px");
-        double largeX = Inkscape::Util::Quantity::convert(paper.larger, i_unit, "px");
+        double smallX = Inkscape::Util::Quantity::convert(paper.smaller, i_unit, *w.unit);
+        double largeX = Inkscape::Util::Quantity::convert(paper.larger, i_unit, *w.unit);
 
         g_return_val_if_fail(smallX <= largeX, _paperSizeListStore->children().end());
 
@@ -643,8 +645,8 @@
         return;
     }
     PaperSize paper = piter->second;
-    double w = paper.smaller;
-    double h = paper.larger;
+    Inkscape::Util::Quantity w = Inkscape::Util::Quantity(paper.smaller, paper.unit);
+    Inkscape::Util::Quantity h = Inkscape::Util::Quantity(paper.larger, paper.unit);
 
     if (std::find(lscape_papers.begin(), lscape_papers.end(), paper.name.c_str()) != lscape_papers.end()) {
         // enforce landscape mode if this is desired for the given page format
@@ -654,9 +656,6 @@
         _landscape = _landscapeButton.get_active();
     }
 
-    w = Inkscape::Util::Quantity::convert(w, paper.unit, "px");
-    h = Inkscape::Util::Quantity::convert(h, paper.unit, "px");
-
     if (_landscape)
         setDim (h, w, false);
     else
@@ -673,8 +672,8 @@
 {
     if (!_portraitButton.get_active())
         return;
-    double w = _dimensionWidth.getValue ("px");
-    double h = _dimensionHeight.getValue ("px");
+    Inkscape::Util::Quantity w = Inkscape::Util::Quantity(_dimensionWidth.getValue(""), _dimensionWidth.getUnit());
+    Inkscape::Util::Quantity h = Inkscape::Util::Quantity(_dimensionHeight.getValue(""), _dimensionHeight.getUnit());
     if (h < w) {
         setDim (h, w);
     }
@@ -689,8 +688,8 @@
 {
     if (!_landscapeButton.get_active())
         return;
-    double w = _dimensionWidth.getValue ("px");
-    double h = _dimensionHeight.getValue ("px");
+    Inkscape::Util::Quantity w = Inkscape::Util::Quantity(_dimensionWidth.getValue(""), _dimensionWidth.getUnit());
+    Inkscape::Util::Quantity h = Inkscape::Util::Quantity(_dimensionHeight.getValue(""), _dimensionHeight.getUnit());
     if (w < h) {
         setDim (h, w);
     }
@@ -703,11 +702,18 @@
 PageSizer::on_value_changed()
 {
     if (_widgetRegistry->isUpdating()) return;
-
-    setDim (_dimensionWidth.getValue("px"),
-            _dimensionHeight.getValue("px"));
-}
-
+    if (_unit != _dimensionUnits.getUnit().abbr) return;
+    setDim (Inkscape::Util::Quantity(_dimensionWidth.getValue(""), _dimensionUnits.getUnit()),
+            Inkscape::Util::Quantity(_dimensionHeight.getValue(""), _dimensionUnits.getUnit()));
+}
+void
+PageSizer::on_units_changed()
+{
+    if (_widgetRegistry->isUpdating()) return;
+    _unit = _dimensionUnits.getUnit().abbr;
+    setDim (Inkscape::Util::Quantity(_dimensionWidth.getValue(""), _dimensionUnits.getUnit()),
+            Inkscape::Util::Quantity(_dimensionHeight.getValue(""), _dimensionUnits.getUnit()));
+}
 
 } // namespace Widget
 } // namespace UI

=== modified file 'src/ui/widget/page-sizer.h'
--- src/ui/widget/page-sizer.h	2013-08-04 22:01:18 +0000
+++ src/ui/widget/page-sizer.h	2013-09-20 17:05:49 +0000
@@ -161,7 +161,7 @@
      * Set the page size to the given dimensions.  If 'changeList' is
      * true, then reset the paper size list to the closest match
      */
-    void setDim (double w, double h, bool changeList=true);
+    void setDim (Inkscape::Util::Quantity w, Inkscape::Util::Quantity h, bool changeList=true);
     
     /**
      * Updates the scalar widgets for the fit margins.  (Just changes the value
@@ -179,7 +179,7 @@
     /**
      *	Find the closest standard paper size in the table, to the
      */
-    Gtk::ListStore::iterator find_paper_size (double w, double h) const;
+    Gtk::ListStore::iterator find_paper_size (Inkscape::Util::Quantity w, Inkscape::Util::Quantity h) const;
  
     void fire_fit_canvas_to_selection_or_drawing();
     
@@ -252,13 +252,17 @@
 
     //callback
     void on_value_changed();
+    void on_units_changed();
     sigc::connection    _changedw_connection;
     sigc::connection    _changedh_connection;
+    sigc::connection    _changedu_connection;
 
     Registry            *_widgetRegistry;
 
     //### state - whether we are currently landscape or portrait
     bool                 _landscape;
+    
+    Glib::ustring       _unit;
 
 };
 

=== modified file 'src/ui/widget/spinbutton.cpp'
--- src/ui/widget/spinbutton.cpp	2012-07-05 21:39:08 +0000
+++ src/ui/widget/spinbutton.cpp	2013-09-20 17:05:49 +0000
@@ -14,6 +14,7 @@
 #include "spinbutton.h"
 
 #include "unit-menu.h"
+#include "unit-tracker.h"
 #include "util/expression-evaluator.h"
 #include "event-context.h"
 
@@ -32,16 +33,23 @@
 int SpinButton::on_input(double* newvalue)
 {
     try {
-        Inkscape::Util::GimpEevlQuantity result;
-        if (_unit_menu) {
-            Unit unit = _unit_menu->getUnit();
-            result = Inkscape::Util::gimp_eevl_evaluate (get_text().c_str(), &unit);
+        Inkscape::Util::EvaluatorQuantity result;
+        if (_unit_menu || _unit_tracker) {
+            Unit unit;
+            if (_unit_menu) {
+                unit = _unit_menu->getUnit();
+            } else {
+                unit = _unit_tracker->getActiveUnit();
+            }
+            Inkscape::Util::ExpressionEvaluator eval = Inkscape::Util::ExpressionEvaluator(get_text().c_str(), &unit);
+            result = eval.evaluate();
             // check if output dimension corresponds to input unit
             if (result.dimension != (unit.isAbsolute() ? 1 : 0) ) {
                 throw Inkscape::Util::EvaluatorException("Input dimensions do not match with parameter dimensions.","");
             }
         } else {
-            result = Inkscape::Util::gimp_eevl_evaluate (get_text().c_str(), NULL);
+            Inkscape::Util::ExpressionEvaluator eval = Inkscape::Util::ExpressionEvaluator(get_text().c_str(), NULL);
+            result = eval.evaluate();
         }
 
         *newvalue = result.value;

=== modified file 'src/ui/widget/spinbutton.h'
--- src/ui/widget/spinbutton.h	2013-06-07 03:18:19 +0000
+++ src/ui/widget/spinbutton.h	2013-09-20 17:05:49 +0000
@@ -25,6 +25,7 @@
 namespace Widget {
 
 class UnitMenu;
+class UnitTracker;
 
 /**
  * SpinButton widget, that allows entry of simple math expressions (also units, when linked with UnitMenu),
@@ -50,14 +51,18 @@
       _unit_menu(NULL)
   {
       connect_signals();
+      _unit_tracker = NULL;
   };
 
   virtual ~SpinButton() {};
 
   void setUnitMenu(UnitMenu* unit_menu) { _unit_menu = unit_menu; };
+  
+  void addUnitTracker(UnitTracker* ut) { _unit_tracker = ut; };
 
 protected:
   UnitMenu *_unit_menu; /// Linked unit menu for unit conversion in entered expressions.
+  UnitTracker *_unit_tracker; // Linked unit tracker for unit conversion in entered expressions.
 
   void connect_signals();
 

=== modified file 'src/util/expression-evaluator.cpp'
--- src/util/expression-evaluator.cpp	2013-08-04 22:01:18 +0000
+++ src/util/expression-evaluator.cpp	2013-09-20 17:05:49 +0000
@@ -6,6 +6,7 @@
  * Copyright (C) 2008 Martin Nordholts <[e-mail]>
  * Modified for Inkscape by Johan Engelen
  * Copyright (C) 2011 Johan Engelen
+ * Copyright (C) 2013 Matthew Petroff
  *
  * This library is free software: you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -27,6 +28,7 @@
 #include "util/expression-evaluator.h"
 #include "util/units.h"
 
+#include <math.h>
 #include <string.h>
 
 using Inkscape::Util::unit_table;
@@ -34,495 +36,353 @@
 namespace Inkscape {
 namespace Util {
 
-enum
-{
-  GIMP_EEVL_TOKEN_NUM        = 30000,
-  GIMP_EEVL_TOKEN_IDENTIFIER = 30001,
-
-  GIMP_EEVL_TOKEN_ANY        = 40000,
-
-  GIMP_EEVL_TOKEN_END        = 50000
-};
-
-typedef int GimpEevlTokenType;
-
-
-typedef struct
-{
-  GimpEevlTokenType type;
-
-  union
-  {
-    gdouble fl;
-
-    struct
-    {
-      const gchar *c;
-      gint         size;
-    };
-
-  } value;
-
-} GimpEevlToken;
-
-typedef struct
-{
-  const gchar             *string;
-  GimpEevlUnitResolverProc unit_resolver_proc;
-  Unit                    *unit;
-
-  GimpEevlToken            current_token;
-  const gchar             *start_of_current_token;
-} GimpEevl;
-
-/** Unit Resolver...
- */
-static bool unitresolverproc  (const gchar* identifier, GimpEevlQuantity *result, Unit* unit)
-{
-    if (!unit) {
-        result->value = 1;
-        result->dimension = 1;
-        return true;
-    }else if (!identifier) {
-        result->value = 1;
-        result->dimension = unit->isAbsolute() ? 1 : 0;
-        return true;
-    } else if (unit_table.hasUnit(identifier)) {
-        Unit identifier_unit = unit_table.getUnit(identifier);
-
-        // Catch the case of zero or negative unit factors (error!)
-        if (identifier_unit.factor < 0.0000001) {
-            return false;
-        }
-
-        result->value = unit->factor / identifier_unit.factor;
-        result->dimension = identifier_unit.isAbsolute() ? 1 : 0;
-        return true;
-    } else {
-        return false;
-    }
-}
-
-static void             gimp_eevl_init                     (GimpEevl                 *eva,
-                                                            const gchar              *string,
-                                                            GimpEevlUnitResolverProc  unit_resolver_proc,
-                                                            Unit                     *unit);
-static GimpEevlQuantity gimp_eevl_complete                 (GimpEevl                 *eva);
-static GimpEevlQuantity gimp_eevl_expression               (GimpEevl                 *eva);
-static GimpEevlQuantity gimp_eevl_term                     (GimpEevl                 *eva);
-static GimpEevlQuantity gimp_eevl_signed_factor            (GimpEevl                 *eva);
-static GimpEevlQuantity gimp_eevl_factor                   (GimpEevl                 *eva);
-static gboolean         gimp_eevl_accept                   (GimpEevl                 *eva,
-                                                            GimpEevlTokenType         token_type,
-                                                            GimpEevlToken            *consumed_token);
-static void             gimp_eevl_lex                      (GimpEevl                 *eva);
-static void             gimp_eevl_lex_accept_count          (GimpEevl                 *eva,
-                                                            gint                      count,
-                                                            GimpEevlTokenType         token_type);
-static void             gimp_eevl_lex_accept_to             (GimpEevl                 *eva,
-                                                            gchar                    *to,
-                                                            GimpEevlTokenType         token_type);
-static void             gimp_eevl_move_past_whitespace     (GimpEevl                 *eva);
-static gboolean         gimp_eevl_unit_identifier_start    (gunichar                  c);
-static gboolean         gimp_eevl_unit_identifier_continue (gunichar                  c);
-static gint             gimp_eevl_unit_identifier_size     (const gchar              *s,
-                                                            gint                      start);
-static void             gimp_eevl_expect                   (GimpEevl                 *eva,
-                                                            GimpEevlTokenType         token_type,
-                                                            GimpEevlToken            *value);
-static void             gimp_eevl_error                    (GimpEevl                 *eva,
-                                                            const char               *msg);
-
+EvaluatorQuantity::EvaluatorQuantity(double value, unsigned int dimension) :
+    value(value),
+    dimension(dimension)
+{
+}
+
+EvaluatorToken::EvaluatorToken()
+{
+    type = 0;
+    value.fl = 0;
+}
+
+ExpressionEvaluator::ExpressionEvaluator(const char *string, Unit *unit) :
+    string(string),
+    unit(unit)
+{
+    current_token.type  = TOKEN_END;
+    
+    // Preload symbol
+    parseNextToken();
+}
 
 /**
  * Evaluates the given arithmetic expression, along with an optional dimension
  * analysis, and basic unit conversions.
  *
- * @param string              The NULL-terminated string to be evaluated.
- * @param unit_resolver_proc  Unit resolver callback.
- *
  * All units conversions factors are relative to some implicit
- * base-unit (which in GIMP is inches). This is also the unit of the
- * returned value.
+ * base-unit. This is also the unit of the returned value.
  *
- * Returns: A #GimpEevlQuantity with a value given in the base unit along with
- * the order of the dimension (i.e. if the base unit is inches, a dimension
- * order of two menas in^2).
+ * Returns: An EvaluatorQuantity with a value given in the base unit along with
+ * the order of the dimension (e.g. if the base unit is inches, a dimension
+ * order of two means in^2).
  *
  * @return Result of evaluation.
  * @throws Inkscape::Util::EvaluatorException There was a parse error.
  **/
-GimpEevlQuantity
-gimp_eevl_evaluate (const gchar* string, Unit* unit)
+EvaluatorQuantity ExpressionEvaluator::evaluate()
 {
-    if (! g_utf8_validate (string, -1, NULL)) {
+    if (!g_utf8_validate(string, -1, NULL)) {
         throw EvaluatorException("Invalid UTF8 string", NULL);
     }
-
-    GimpEevl eva;
-    gimp_eevl_init (&eva, string, unitresolverproc, unit);
-
-    return gimp_eevl_complete(&eva);
-}
-
-static void
-gimp_eevl_init (GimpEevl                  *eva,
-                const gchar               *string,
-                GimpEevlUnitResolverProc   unit_resolver_proc,
-                Unit                      *unit)
-{
-  eva->string              = string;
-  eva->unit_resolver_proc  = unit_resolver_proc;
-  eva->unit                = unit;
-
-  eva->current_token.type  = GIMP_EEVL_TOKEN_END;
-
-  /* Preload symbol... */
-  gimp_eevl_lex (eva);
-}
-
-static GimpEevlQuantity
-gimp_eevl_complete (GimpEevl *eva)
-{
-  GimpEevlQuantity result = {0, 0};
-  GimpEevlQuantity default_unit_factor;
-
-  /* Empty expression evaluates to 0 */
-  if (gimp_eevl_accept (eva, GIMP_EEVL_TOKEN_END, NULL))
-    return result;
-
-  result = gimp_eevl_expression (eva);
-
-  /* There should be nothing left to parse by now */
-  gimp_eevl_expect (eva, GIMP_EEVL_TOKEN_END, 0);
-
-  eva->unit_resolver_proc (NULL, &default_unit_factor, eva->unit);
-
-  /* Entire expression is dimensionless, apply default unit if
-   * applicable
-   */
-  if (result.dimension == 0 && default_unit_factor.dimension != 0)
-    {
-      result.value     /= default_unit_factor.value;
-      result.dimension  = default_unit_factor.dimension;
-    }
-  return result;
-}
-
-static GimpEevlQuantity
-gimp_eevl_expression (GimpEevl *eva)
-{
-  gboolean         subtract;
-  GimpEevlQuantity evaluated_terms;
-
-  evaluated_terms = gimp_eevl_term (eva);
-
-  /* continue evaluating terms, chained with + or -. */
-  for (subtract = FALSE;
-       gimp_eevl_accept (eva, '+', NULL) ||
-       (subtract = gimp_eevl_accept (eva, '-', NULL));
-       subtract = FALSE)
-    {
-      GimpEevlQuantity new_term = gimp_eevl_term (eva);
-
-      /* If dimensions missmatch, attempt default unit assignent */
-      if (new_term.dimension != evaluated_terms.dimension)
-        {
-          GimpEevlQuantity default_unit_factor;
-
-          eva->unit_resolver_proc (NULL,
-                                   &default_unit_factor,
-                                   eva->unit);
-
-          if (new_term.dimension == 0 &&
-              evaluated_terms.dimension == default_unit_factor.dimension)
-            {
-              new_term.value     /= default_unit_factor.value;
-              new_term.dimension  = default_unit_factor.dimension;
-            }
-          else if (evaluated_terms.dimension == 0 &&
-                   new_term.dimension == default_unit_factor.dimension)
-            {
-              evaluated_terms.value     /= default_unit_factor.value;
-              evaluated_terms.dimension  = default_unit_factor.dimension;
-            }
-          else
-            {
-              gimp_eevl_error (eva, "Dimension missmatch during addition");
-            }
-        }
-
-      evaluated_terms.value += (subtract ? -new_term.value : new_term.value);
-    }
-
-  return evaluated_terms;
-}
-
-static GimpEevlQuantity
-gimp_eevl_term (GimpEevl *eva)
-{
-  gboolean         division;
-  GimpEevlQuantity evaluated_signed_factors;
-
-  evaluated_signed_factors = gimp_eevl_signed_factor (eva);
-
-  for (division = FALSE;
-       gimp_eevl_accept (eva, '*', NULL) ||
-       (division = gimp_eevl_accept (eva, '/', NULL));
-       division = FALSE)
-    {
-      GimpEevlQuantity new_signed_factor = gimp_eevl_signed_factor (eva);
-
-      if (division)
-        {
-          evaluated_signed_factors.value     /= new_signed_factor.value;
-          evaluated_signed_factors.dimension -= new_signed_factor.dimension;
-
-        }
-      else
-        {
-          evaluated_signed_factors.value     *= new_signed_factor.value;
-          evaluated_signed_factors.dimension += new_signed_factor.dimension;
-        }
-    }
-
-  return evaluated_signed_factors;
-}
-
-static GimpEevlQuantity
-gimp_eevl_signed_factor (GimpEevl *eva)
-{
-  GimpEevlQuantity result;
-  gboolean         negate = FALSE;
-
-  if (! gimp_eevl_accept (eva, '+', NULL))
-    negate = gimp_eevl_accept (eva, '-', NULL);
-
-  result = gimp_eevl_factor (eva);
-
-  if (negate) result.value = -result.value;
-
-  return result;
-}
-
-static GimpEevlQuantity
-gimp_eevl_factor (GimpEevl *eva)
-{
-  GimpEevlQuantity evaluated_factor = { 0, 0 };
-  GimpEevlToken    consumed_token;
-
-  if (gimp_eevl_accept (eva,
-                        GIMP_EEVL_TOKEN_NUM,
-                        &consumed_token))
-    {
-      evaluated_factor.value = consumed_token.value.fl;
-    }
-  else if (gimp_eevl_accept (eva, '(', NULL))
-    {
-      evaluated_factor = gimp_eevl_expression (eva);
-      gimp_eevl_expect (eva, ')', 0);
-    }
-  else
-    {
-      gimp_eevl_error (eva, "Expected number or '('");
-    }
-
-  if (eva->current_token.type == GIMP_EEVL_TOKEN_IDENTIFIER)
-    {
-      gchar            *identifier;
-      GimpEevlQuantity  result;
-
-      gimp_eevl_accept (eva,
-                        GIMP_EEVL_TOKEN_ANY,
-                        &consumed_token);
-
-      identifier = g_newa (gchar, consumed_token.value.size + 1);
-
-      strncpy (identifier, consumed_token.value.c, consumed_token.value.size);
-      identifier[consumed_token.value.size] = '\0';
-
-      if (eva->unit_resolver_proc (identifier,
-                                   &result,
-                                   eva->unit))
-        {
-          evaluated_factor.value      /= result.value;
-          evaluated_factor.dimension  += result.dimension;
-        }
-      else
-        {
-          gimp_eevl_error (eva, "Unit was not resolved");
-        }
-    }
-
-  return evaluated_factor;
-}
-
-static gboolean
-gimp_eevl_accept (GimpEevl          *eva,
-                  GimpEevlTokenType  token_type,
-                  GimpEevlToken     *consumed_token)
-{
-  gboolean existed = FALSE;
-
-  if (token_type == eva->current_token.type ||
-      token_type == GIMP_EEVL_TOKEN_ANY)
-    {
-      existed = TRUE;
-
-      if (consumed_token)
-        *consumed_token = eva->current_token;
-
-      /* Parse next token */
-      gimp_eevl_lex (eva);
-    }
-
-  return existed;
-}
-
-static void
-gimp_eevl_lex (GimpEevl *eva)
-{
-  const gchar *s;
-
-  gimp_eevl_move_past_whitespace (eva);
-  s = eva->string;
-  eva->start_of_current_token = s;
-
-  if (! s || s[0] == '\0')
-    {
-      /* We're all done */
-      eva->current_token.type = GIMP_EEVL_TOKEN_END;
-    }
-  else if (s[0] == '+' || s[0] == '-')
-    {
-      /* Snatch these before the g_strtod() does, othewise they might
-       * be used in a numeric conversion.
-       */
-      gimp_eevl_lex_accept_count (eva, 1, s[0]);
-    }
-  else
-    
-    {
-      /* Attempt to parse a numeric value */
-      gchar  *endptr = NULL;
-      gdouble value      = g_strtod (s, &endptr);
-
-      if (endptr && endptr != s)
-        {
-          /* A numeric could be parsed, use it */
-          eva->current_token.value.fl = value;
-
-          gimp_eevl_lex_accept_to (eva, endptr, GIMP_EEVL_TOKEN_NUM);
-        }
-      else if (gimp_eevl_unit_identifier_start (s[0]))
-        {
-          /* Unit identifier */
-          eva->current_token.value.c    = s;
-          eva->current_token.value.size = gimp_eevl_unit_identifier_size (s, 0);
-
-          gimp_eevl_lex_accept_count (eva,
-                                      eva->current_token.value.size,
-                                      GIMP_EEVL_TOKEN_IDENTIFIER);
-        }
-      else
-        {
-          /* Everything else is a single character token */
-          gimp_eevl_lex_accept_count (eva, 1, s[0]);
-        }
-    }
-}
-
-static void
-gimp_eevl_lex_accept_count (GimpEevl          *eva,
-                            gint               count,
-                            GimpEevlTokenType  token_type)
-{
-  eva->current_token.type  = token_type;
-  eva->string             += count;
-}
-
-static void
-gimp_eevl_lex_accept_to (GimpEevl          *eva,
-                         gchar             *to,
-                         GimpEevlTokenType  token_type)
-{
-  eva->current_token.type = token_type;
-  eva->string             = to;
-}
-
-static void
-gimp_eevl_move_past_whitespace (GimpEevl *eva)
-{
-  if (! eva->string)
-    return;
-
-  while (g_ascii_isspace (*eva->string))
-    eva->string++;
-}
-
-static gboolean
-gimp_eevl_unit_identifier_start (gunichar c)
-{
-  return (g_unichar_isalpha (c) ||
-          c == (gunichar) '%'   ||
-          c == (gunichar) '\'');
-}
-
-static gboolean
-gimp_eevl_unit_identifier_continue (gunichar c)
-{
-  return (gimp_eevl_unit_identifier_start (c) ||
-          g_unichar_isdigit (c));
+    
+    EvaluatorQuantity result = EvaluatorQuantity();
+    EvaluatorQuantity default_unit_factor;
+    
+    // Empty expression evaluates to 0
+    if (acceptToken(TOKEN_END, NULL)) {
+        return result;
+    }
+    
+    result = evaluateExpression();
+    
+    // There should be nothing left to parse by now
+    isExpected(TOKEN_END, 0);
+    
+    resolveUnit(NULL, &default_unit_factor, unit);
+    
+    // Entire expression is dimensionless, apply default unit if applicable
+    if ( result.dimension == 0 && default_unit_factor.dimension != 0 ) {
+        result.value     /= default_unit_factor.value;
+        result.dimension  = default_unit_factor.dimension;
+    }
+    return result;
+}
+
+EvaluatorQuantity ExpressionEvaluator::evaluateExpression()
+{
+    bool subtract;
+    EvaluatorQuantity evaluated_terms;
+    
+    evaluated_terms = evaluateTerm();
+    
+    // Continue evaluating terms, chained with + or -.
+    for (subtract = FALSE;
+        acceptToken('+', NULL) || (subtract = acceptToken('-', NULL));
+        subtract = FALSE)
+    {
+        EvaluatorQuantity new_term = evaluateTerm();
+        
+        // If dimensions mismatch, attempt default unit assignent
+        if ( new_term.dimension != evaluated_terms.dimension ) {
+            EvaluatorQuantity default_unit_factor;
+            
+            resolveUnit(NULL, &default_unit_factor, unit);
+            
+            if ( new_term.dimension == 0
+                && evaluated_terms.dimension == default_unit_factor.dimension )
+            {
+                new_term.value     /= default_unit_factor.value;
+                new_term.dimension  = default_unit_factor.dimension;
+            } else if ( evaluated_terms.dimension == 0
+                && new_term.dimension == default_unit_factor.dimension )
+            {
+                evaluated_terms.value     /= default_unit_factor.value;
+                evaluated_terms.dimension  = default_unit_factor.dimension;
+            } else {
+                throwError("Dimension mismatch during addition");
+            }
+        }
+        
+        evaluated_terms.value += (subtract ? -new_term.value : new_term.value);
+    }
+    
+    return evaluated_terms;
+}
+
+EvaluatorQuantity ExpressionEvaluator::evaluateTerm()
+{
+    bool division;
+    EvaluatorQuantity evaluated_exp_terms = evaluateExpTerm();
+    
+    for ( division = false;
+        acceptToken('*', NULL) || (division = acceptToken('/', NULL));
+        division = false )
+    {
+        EvaluatorQuantity new_exp_term = evaluateExpTerm();
+        
+        if (division) {
+            evaluated_exp_terms.value     /= new_exp_term.value;
+            evaluated_exp_terms.dimension -= new_exp_term.dimension;
+        } else {
+            evaluated_exp_terms.value     *= new_exp_term.value;
+            evaluated_exp_terms.dimension += new_exp_term.dimension;
+        }
+    }
+    
+    return evaluated_exp_terms;
+}
+
+EvaluatorQuantity ExpressionEvaluator::evaluateExpTerm()
+{
+    EvaluatorQuantity evaluated_signed_factors = evaluateSignedFactor();
+    
+    while(acceptToken('^', NULL)) {
+        EvaluatorQuantity new_signed_factor = evaluateSignedFactor();
+        
+        if (new_signed_factor.dimension == 0) {
+            evaluated_signed_factors.value = pow(evaluated_signed_factors.value,
+                                                 new_signed_factor.value);
+            evaluated_signed_factors.dimension *= new_signed_factor.value;
+        } else {
+            throwError("Unit in exponent");
+        }
+    }
+    
+    return evaluated_signed_factors;
+}
+
+EvaluatorQuantity ExpressionEvaluator::evaluateSignedFactor()
+{
+    EvaluatorQuantity result;
+    bool negate = FALSE;
+    
+    if (!acceptToken('+', NULL)) {
+        negate = acceptToken ('-', NULL);
+    }
+    
+    result = evaluateFactor();
+    
+    if (negate) {
+        result.value = -result.value;
+    }
+    
+    return result;
+}
+
+EvaluatorQuantity ExpressionEvaluator::evaluateFactor()
+{
+    EvaluatorQuantity evaluated_factor = EvaluatorQuantity();
+    EvaluatorToken consumed_token = EvaluatorToken();
+    
+    if (acceptToken(TOKEN_NUM, &consumed_token)) {
+        evaluated_factor.value = consumed_token.value.fl;
+    } else if (acceptToken('(', NULL)) {
+        evaluated_factor = evaluateExpression();
+        isExpected(')', 0);
+    } else {
+        throwError("Expected number or '('");
+    }
+    
+    if ( current_token.type == TOKEN_IDENTIFIER ) {
+        char *identifier;
+        EvaluatorQuantity result;
+        
+        acceptToken(TOKEN_ANY, &consumed_token);
+        
+        identifier = g_newa(char, consumed_token.value.size + 1);
+        
+        strncpy(identifier, consumed_token.value.c, consumed_token.value.size);
+        identifier[consumed_token.value.size] = '\0';
+        
+        if (resolveUnit(identifier, &result, unit)) {
+            evaluated_factor.value      /= result.value;
+            evaluated_factor.dimension  += result.dimension;
+        } else {
+            throwError("Unit was not resolved");
+        }
+    }
+    
+    return evaluated_factor;
+}
+
+bool ExpressionEvaluator::acceptToken(TokenType token_type,
+                                      EvaluatorToken *consumed_token)
+{
+    bool existed = FALSE;
+    
+    if ( token_type == current_token.type || token_type == TOKEN_ANY ) {
+        existed = TRUE;
+        
+        if (consumed_token) {
+            *consumed_token = current_token;
+        }
+        
+        // Parse next token
+        parseNextToken();
+    }
+    
+    return existed;
+}
+
+void ExpressionEvaluator::parseNextToken()
+{
+    const char *s;
+    
+    movePastWhiteSpace();
+    s = string;
+    start_of_current_token = s;
+    
+    if ( !s || s[0] == '\0' ) {
+        // We're all done
+        current_token.type = TOKEN_END;
+    } else if ( s[0] == '+' || s[0] == '-' ) {
+        // Snatch these before the g_strtod() does, othewise they might
+        // be used in a numeric conversion.
+        acceptTokenCount(1, s[0]);
+    } else {
+        // Attempt to parse a numeric value
+        char *endptr = NULL;
+        gdouble value = g_strtod(s, &endptr);
+        
+        if ( endptr && endptr != s ) {
+            // A numeric could be parsed, use it
+            current_token.value.fl = value;
+            
+            current_token.type = TOKEN_NUM;
+            string             = endptr;
+        } else if (isUnitIdentifierStart(s[0])) {
+            // Unit identifier
+            current_token.value.c = s;
+            current_token.value.size = getIdentifierSize(s, 0);
+            
+            acceptTokenCount(current_token.value.size, TOKEN_IDENTIFIER);
+        } else {
+            // Everything else is a single character token
+            acceptTokenCount(1, s[0]);
+        }
+    }
+}
+
+void ExpressionEvaluator::acceptTokenCount (int count, TokenType token_type)
+{
+    current_token.type  = token_type;
+    string             += count;
+}
+
+void ExpressionEvaluator::isExpected(TokenType token_type,
+                                     EvaluatorToken *value)
+{
+    if (!acceptToken(token_type, value)) {
+        throwError("Unexpected token");
+    }
+}
+
+void ExpressionEvaluator::movePastWhiteSpace()
+{
+    if (!string) {
+        return;
+    }
+    
+    while (g_ascii_isspace(*string)) {
+        string++;
+    }
+}
+
+bool ExpressionEvaluator::isUnitIdentifierStart(gunichar c)
+{
+    return (g_unichar_isalpha (c)
+        || c == (gunichar) '%'
+        || c == (gunichar) '\'');
 }
 
 /**
- * gimp_eevl_unit_identifier_size:
+ * getIdentifierSize:
  * @s:
  * @start:
  *
  * Returns: Size of identifier in bytes (not including NULL
  * terminator).
  **/
-static gint
-gimp_eevl_unit_identifier_size (const gchar *string,
-                                gint         start_offset)
+int ExpressionEvaluator::getIdentifierSize(const char *string, int start_offset)
 {
-  const gchar *start  = g_utf8_offset_to_pointer (string, start_offset);
-  const gchar *s      = start;
-  gunichar     c      = g_utf8_get_char (s);
-  gint         length = 0;
-
-  if (gimp_eevl_unit_identifier_start (c))
-    {
-      s = g_utf8_next_char (s);
-      c = g_utf8_get_char (s);
-      length++;
-
-      while (gimp_eevl_unit_identifier_continue (c))
-        {
-          s = g_utf8_next_char (s);
-          c = g_utf8_get_char (s);
-          length++;
+    const char *start  = g_utf8_offset_to_pointer(string, start_offset);
+    const char *s      = start;
+    gunichar    c      = g_utf8_get_char(s);
+    int         length = 0;
+    
+    if (isUnitIdentifierStart(c)) {
+        s = g_utf8_next_char (s);
+        c = g_utf8_get_char (s);
+        length++;
+        
+        while ( isUnitIdentifierStart (c) || g_unichar_isdigit (c) ) {
+            s = g_utf8_next_char(s);
+            c = g_utf8_get_char(s);
+            length++;
         }
     }
-  
-  return g_utf8_offset_to_pointer (start, length) - start;
-}
-
-static void
-gimp_eevl_expect (GimpEevl          *eva,
-                  GimpEevlTokenType  token_type,
-                  GimpEevlToken     *value)
-{
-  if (! gimp_eevl_accept (eva, token_type, value))
-    gimp_eevl_error (eva, "Unexpected token");
-}
-
-static void
-gimp_eevl_error (GimpEevl *eva,
-                 const char    *msg)
-{
-  throw EvaluatorException(msg, eva->start_of_current_token);
+    
+    return g_utf8_offset_to_pointer(start, length) - start;
+}
+
+bool ExpressionEvaluator::resolveUnit (const char* identifier,
+                                       EvaluatorQuantity *result,
+                                       Unit* unit)
+{
+    if (!unit) {
+        result->value = 1;
+        result->dimension = 1;
+        return true;
+    }else if (!identifier) {
+        result->value = 1;
+        result->dimension = unit->isAbsolute() ? 1 : 0;
+        return true;
+    } else if (unit_table.hasUnit(identifier)) {
+        Unit identifier_unit = unit_table.getUnit(identifier);
+        result->value = Quantity::convert(1, *unit, identifier_unit);
+        result->dimension = identifier_unit.isAbsolute() ? 1 : 0;
+        return true;
+    } else {
+        return false;
+    }
+}
+
+void ExpressionEvaluator::throwError(const char *msg)
+{
+    throw EvaluatorException(msg, start_of_current_token);
 }
 
 } // namespace Util

=== modified file 'src/util/expression-evaluator.h'
--- src/util/expression-evaluator.h	2011-10-27 04:55:51 +0000
+++ src/util/expression-evaluator.h	2013-09-20 17:05:49 +0000
@@ -6,6 +6,7 @@
  * Copyright (C) 2008-2009 Martin Nordholts <[e-mail]>
  * Modified for Inkscape by Johan Engelen
  * Copyright (C) 2011 Johan Engelen
+ * Copyright (C) 2013 Matthew Petroff
  *
  * This library is free software: you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -22,8 +23,8 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SEEN_GIMP_EEVL_H
-#define SEEN_GIMP_EEVL_H
+#ifndef INKSCAPE_UTIL_EXPRESSION_EVALUATOR_H
+#define INKSCAPE_UTIL_EXPRESSION_EVALUATOR_H
 
 #include "util/units.h"
 
@@ -33,7 +34,7 @@
 
 /**
  * @file
- * Introducing eevl eva, the evaluator. A straightforward recursive
+ * Expression evaluator: A straightforward recursive
  * descent parser, no fuss, no new dependencies. The lexer is hand
  * coded, tedious, not extremely fast but works. It evaluates the
  * expression as it goes along, and does not create a parse tree or
@@ -43,8 +44,8 @@
  *
  * It relies on external unit resolving through a callback and does
  * elementary dimensionality constraint check (e.g. "2 mm + 3 px * 4
- * in" is an error, as L + L^2 is a missmatch). It uses g_strtod() for numeric
- * conversions and it's non-destructive in terms of the paramters, and
+ * in" is an error, as L + L^2 is a mismatch). It uses g_strtod() for numeric
+ * conversions and it's non-destructive in terms of the parameters, and
  * it's reentrant.
  *
  * EBNF:
@@ -52,7 +53,9 @@
  *   expression    ::= term { ('+' | '-') term }*  |
  *                     <empty string> ;
  *
- *   term          ::= signed factor { ( '*' | '/' ) signed factor }* ;
+ *   term          ::= exponent { ( '*' | '/' ) exponent }* ;
+ *
+ *   exponent      ::= signed factor { '^' signed factor }* ;
  *
  *   signed factor ::= ( '+' | '-' )? factor ;
  *
@@ -79,37 +82,104 @@
 class Unit;
 
 /**
-* GimpEevlQuantity:
-* @value: In reference units.
-* @dimension: in has a dimension of 1, in^2 has a dimension of 2 etc
-*/
-typedef struct
+ * EvaluatorQuantity:
+ * @param value         In reference units.
+ * @param dimension     mm has a dimension of 1, mm^2 has a dimension of 2, etc.
+ */
+class EvaluatorQuantity
 {
+public:
+    EvaluatorQuantity(double value = 0, unsigned int dimension = 0);
+    
     double value;
-    gint dimension;
-} GimpEevlQuantity;
-
-typedef bool (* GimpEevlUnitResolverProc) (const gchar      *identifier,
-                                               GimpEevlQuantity *result,
-                                               Unit* unit);
-
-GimpEevlQuantity gimp_eevl_evaluate (const gchar* string, Unit* unit = NULL);
+    unsigned int dimension;
+};
+
+/**
+ * TokenType
+ */
+enum {
+  TOKEN_NUM        = 30000,
+  TOKEN_IDENTIFIER = 30001,
+  TOKEN_ANY        = 40000,
+  TOKEN_END        = 50000
+};
+typedef int TokenType;
+
+/**
+ * EvaluatorToken
+ */
+class EvaluatorToken
+{
+public:
+    EvaluatorToken();
+    
+    TokenType type;
+    
+    union {
+        double fl;
+        struct {
+            const char *c;
+            int size;
+        };
+    } value;
+};
+
+/**
+ * ExpressionEvaluator
+ * @param string    NULL terminated input string to evaluate
+ * @param unit      Unit output should be in
+ */
+class ExpressionEvaluator
+{
+public:
+    ExpressionEvaluator(const char *string, Unit *unit = NULL);
+    
+    EvaluatorQuantity evaluate();
+
+private:
+    const char *string;
+    Unit *unit;
+    
+    EvaluatorToken current_token;
+    const char *start_of_current_token;
+    
+    EvaluatorQuantity evaluateExpression();
+    EvaluatorQuantity evaluateTerm();
+    EvaluatorQuantity evaluateExpTerm();
+    EvaluatorQuantity evaluateSignedFactor();
+    EvaluatorQuantity evaluateFactor();
+    
+    bool acceptToken(TokenType token_type, EvaluatorToken *consumed_token);
+    void parseNextToken();
+    void acceptTokenCount(int count, TokenType token_type);
+    void isExpected(TokenType token_type, EvaluatorToken *value);
+    
+    void movePastWhiteSpace();
+    
+    static bool isUnitIdentifierStart(gunichar c);
+    static int getIdentifierSize(const char *s, int start);
+    
+    static bool resolveUnit(const char *identifier, EvaluatorQuantity *result, Unit *unit);
+    
+    void throwError(const char *msg);
+};
 
 /**
  * Special exception class for the expression evaluator.
  */
 class EvaluatorException : public std::exception {
 public:
-    EvaluatorException(const char * message, const char *at_position) {
+    EvaluatorException(const char *message, const char *at_position) {
         std::ostringstream os;
-        const char* token = at_position ? at_position : "<End of input>";
+        const char *token = at_position ? at_position : "<End of input>";
         os << "Expression evaluator error: " << message << " at '" << token << "'";
         msgstr = os.str();
     }
 
     virtual ~EvaluatorException() throw() {} // necessary to destroy the string object!!!
 
-    virtual const char* what() const throw () {
+    virtual const char *what() const throw () {
         return msgstr.c_str();
     }
 protected:
@@ -119,4 +189,4 @@
 }
 }
 
-#endif // SEEN_GIMP_EEVL_H
+#endif // INKSCAPE_UTIL_EXPRESSION_EVALUATOR_H

=== modified file 'src/util/units.cpp'
--- src/util/units.cpp	2013-09-01 17:34:44 +0000
+++ src/util/units.cpp	2013-09-20 17:05:49 +0000
@@ -114,6 +114,7 @@
     abbr(abbr),
     description(description)
 {
+    g_return_if_fail(factor <= 0);
 }
 
 void Unit::clear()
@@ -166,25 +167,25 @@
 int Unit::svgUnit() const
 {
     if (!abbr.compare("px"))
-        return 1;
+        return SVGLength::PX;
     if (!abbr.compare("pt"))
-        return 2;
+        return SVGLength::PT;
     if (!abbr.compare("pc"))
-        return 3;
+        return SVGLength::PC;
     if (!abbr.compare("mm"))
-        return 4;
+        return SVGLength::MM;
     if (!abbr.compare("cm"))
-        return 5;
+        return SVGLength::CM;
     if (!abbr.compare("in"))
-        return 6;
+        return SVGLength::INCH;
     if (!abbr.compare("ft"))
-        return 7;
+        return SVGLength::FOOT;
     if (!abbr.compare("em"))
-        return 8;
+        return SVGLength::EM;
     if (!abbr.compare("ex"))
-        return 9;
+        return SVGLength::EX;
     if (!abbr.compare("%"))
-        return 10;
+        return SVGLength::PERCENT;
     return 0;
 }
 
@@ -220,6 +221,36 @@
         return Unit();
     }
 }
+Unit UnitTable::getUnit(SVGLength::Unit const u) const
+{
+    Glib::ustring u_str;
+    switch(u) {
+        case SVGLength::PX:
+            u_str = "px"; break;
+        case SVGLength::PT:
+            u_str = "pt"; break;
+        case SVGLength::PC:
+            u_str = "pc"; break;
+        case SVGLength::MM:
+            u_str = "mm"; break;
+        case SVGLength::CM:
+            u_str = "cm"; break;
+        case SVGLength::INCH:
+            u_str = "in"; break;
+        case SVGLength::FOOT:
+            u_str = "ft"; break;
+        case SVGLength::EM:
+            u_str = "em"; break;
+        case SVGLength::EX:
+            u_str = "ex"; break;
+        case SVGLength::PERCENT:
+            u_str = "%"; break;
+        default:
+            u_str = "";
+    }
+    
+    return getUnit(u_str);
+}
 
 Quantity UnitTable::getQuantity(Glib::ustring const& q) const
 {
@@ -421,6 +452,27 @@
     return convert(from_dist, unit_table.getUnit(from), unit_table.getUnit(to));
 }
 
+bool operator< (const Quantity &ql, const Quantity &qr)
+{
+    if (ql.unit->type != qr.unit->type) {
+        g_warning("Incompatible units");
+        return false;
+    }
+    return ql.quantity < qr.value(*ql.unit);
+}
+bool operator> (const Quantity &ql, const Quantity &qr)
+{
+    if (ql.unit->type != qr.unit->type) {
+        g_warning("Incompatible units");
+        return false;
+    }
+    return ql.quantity > qr.value(*ql.unit);
+}
+bool operator!= (const Quantity &q1, const Quantity &q2)
+{
+    return (*q1.unit != *q2.unit) || (q1.quantity != q2.quantity);
+}
+
 } // namespace Util
 } // namespace Inkscape
 

=== modified file 'src/util/units.h'
--- src/util/units.h	2013-08-04 22:01:18 +0000
+++ src/util/units.h	2013-09-20 17:05:49 +0000
@@ -1,5 +1,6 @@
 /*
  * Inkscape Units
+ * These classes are used for defining different unit systems.
  *
  * Authors:
  *   Matthew Petroff <[e-mail]>
@@ -9,25 +10,12 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-/*
-This is a rough draft of a global 'units' thingee, to allow dialogs and
-the ruler to share info about unit systems...  Dunno if this is the
-right kind of object though, so we may have to redo this or shift things
-around later when it becomes clearer what we need.
-
-This object is used for defining different unit systems.
-
-This is intended to eventually replace inkscape/helper/units.*.
-
-Need to review the Units support that's in Gtkmm already...
-
-*/
-
 #ifndef INKSCAPE_UTIL_UNITS_H
 #define INKSCAPE_UTIL_UNITS_H
 
 #include <map>
 #include <glibmm/ustring.h>
+#include "svg/svg-length.h"
 
 namespace Inkscape {
 namespace Util {
@@ -112,6 +100,11 @@
     static double convert(const double from_dist, const Glib::ustring from, const Unit &to);
     static double convert(const double from_dist, const Unit &from, const Glib::ustring to);
     static double convert(const double from_dist, const Glib::ustring from, const Glib::ustring to);
+    
+    /** Comparison operators. */
+    friend bool operator< (const Quantity &ql, const Quantity &qr);
+    friend bool operator> (const Quantity &ql, const Quantity &qr);
+    friend bool operator!= (const Quantity &q1, const Quantity &q2);
 };
 
 class UnitTable {
@@ -132,6 +125,9 @@
     /** Retrieve a given unit based on its string identifier */
     Unit    getUnit(Glib::ustring const &name) const;
     
+    /** Retrieve a given unit based on its SVGLength unit */
+    Unit    getUnit(SVGLength::Unit const u) const;
+    
     /** Retrieve a quantity based on its string identifier */
     Quantity getQuantity(Glib::ustring const &q) const;
 

=== modified file 'src/widgets/calligraphy-toolbar.cpp'
--- src/widgets/calligraphy-toolbar.cpp	2013-07-19 18:19:03 +0000
+++ src/widgets/calligraphy-toolbar.cpp	2013-09-20 17:05:49 +0000
@@ -450,7 +450,7 @@
                                                               GTK_WIDGET(desktop->canvas), holder, TRUE, "altx-calligraphy",
                                                               1, 100, 1.0, 10.0,
                                                               labels, values, G_N_ELEMENTS(labels),
-                                                              sp_ddc_width_value_changed,  1, 0 );
+                                                              sp_ddc_width_value_changed, NULL /*unit tracker*/, 1, 0 );
         ege_adjustment_action_set_appearance( eact, TOOLBAR_SLIDER_HINT );
         gtk_action_group_add_action( mainActions, GTK_ACTION(eact) );
         gtk_action_set_sensitive( GTK_ACTION(eact), TRUE );
@@ -467,7 +467,7 @@
                                                               GTK_WIDGET(desktop->canvas), holder, FALSE, NULL,
                                                               -100, 100, 1, 10.0,
                                                               labels, values, G_N_ELEMENTS(labels),
-                                                              sp_ddc_velthin_value_changed, 1, 0);
+                                                              sp_ddc_velthin_value_changed, NULL /*unit tracker*/, 1, 0);
         gtk_action_group_add_action( mainActions, GTK_ACTION(eact) );
         gtk_action_set_sensitive( GTK_ACTION(eact), TRUE );
         }
@@ -483,7 +483,7 @@
                                                               GTK_WIDGET(desktop->canvas), holder, TRUE, "calligraphy-angle",
                                                               -90.0, 90.0, 1.0, 10.0,
                                                               labels, values, G_N_ELEMENTS(labels),
-                                                              sp_ddc_angle_value_changed, 1, 0 );
+                                                              sp_ddc_angle_value_changed, NULL /*unit tracker*/, 1, 0 );
         gtk_action_group_add_action( mainActions, GTK_ACTION(eact) );
         g_object_set_data( holder, "angle_action", eact );
         gtk_action_set_sensitive( GTK_ACTION(eact), TRUE );
@@ -501,7 +501,7 @@
                                                               GTK_WIDGET(desktop->canvas), holder, FALSE, NULL,
                                                               0.0, 100, 1.0, 10.0,
                                                               labels, values, G_N_ELEMENTS(labels),
-                                                              sp_ddc_flatness_value_changed, 1, 0);
+                                                              sp_ddc_flatness_value_changed, NULL /*unit tracker*/, 1, 0);
         gtk_action_group_add_action( mainActions, GTK_ACTION(eact) );
         gtk_action_set_sensitive( GTK_ACTION(eact), TRUE );
         }
@@ -518,7 +518,7 @@
                                                               GTK_WIDGET(desktop->canvas), holder, FALSE, NULL,
                                                               0.0, 5.0, 0.01, 0.1,
                                                               labels, values, G_N_ELEMENTS(labels),
-                                                              sp_ddc_cap_rounding_value_changed, 0.01, 2 );
+                                                              sp_ddc_cap_rounding_value_changed, NULL /*unit tracker*/, 0.01, 2 );
         gtk_action_group_add_action( mainActions, GTK_ACTION(eact) );
         gtk_action_set_sensitive( GTK_ACTION(eact), TRUE );
         }
@@ -534,7 +534,7 @@
                                                               GTK_WIDGET(desktop->canvas), holder, FALSE, NULL,
                                                               0.0, 100, 1, 10.0,
                                                               labels, values, G_N_ELEMENTS(labels),
-                                                              sp_ddc_tremor_value_changed, 1, 0);
+                                                              sp_ddc_tremor_value_changed, NULL /*unit tracker*/, 1, 0);
 
         ege_adjustment_action_set_appearance( eact, TOOLBAR_SLIDER_HINT );
         gtk_action_group_add_action( mainActions, GTK_ACTION(eact) );
@@ -552,7 +552,7 @@
                                                               GTK_WIDGET(desktop->canvas), holder, FALSE, NULL,
                                                               0.0, 100, 1, 10.0,
                                                               labels, values, G_N_ELEMENTS(labels),
-                                                              sp_ddc_wiggle_value_changed, 1, 0);
+                                                              sp_ddc_wiggle_value_changed, NULL /*unit tracker*/, 1, 0);
         ege_adjustment_action_set_appearance( eact, TOOLBAR_SLIDER_HINT );
         gtk_action_group_add_action( mainActions, GTK_ACTION(eact) );
         gtk_action_set_sensitive( GTK_ACTION(eact), TRUE );
@@ -569,7 +569,7 @@
                                                               GTK_WIDGET(desktop->canvas), holder, FALSE, NULL,
                                                               0.0, 100, 1, 10.0,
                                                               labels, values, G_N_ELEMENTS(labels),
-                                                              sp_ddc_mass_value_changed, 1, 0);
+                                                              sp_ddc_mass_value_changed, NULL /*unit tracker*/, 1, 0);
         ege_adjustment_action_set_appearance( eact, TOOLBAR_SLIDER_HINT );
         gtk_action_group_add_action( mainActions, GTK_ACTION(eact) );
         gtk_action_set_sensitive( GTK_ACTION(eact), TRUE );

=== modified file 'src/widgets/connector-toolbar.cpp'
--- src/widgets/connector-toolbar.cpp	2013-07-19 18:19:03 +0000
+++ src/widgets/connector-toolbar.cpp	2013-09-20 17:05:49 +0000
@@ -364,7 +364,7 @@
                                     GTK_WIDGET(desktop->canvas), holder, TRUE, "inkscape:connector-curvature",
                                     0, 100, 1.0, 10.0,
                                     0, 0, 0,
-                                    connector_curvature_changed, 1, 0 );
+                                    connector_curvature_changed, NULL /*unit tracker*/, 1, 0 );
     gtk_action_group_add_action( mainActions, GTK_ACTION(eact) );
 
     // Spacing spinbox
@@ -375,7 +375,7 @@
                                     GTK_WIDGET(desktop->canvas), holder, TRUE, "inkscape:connector-spacing",
                                     0, 100, 1.0, 10.0,
                                     0, 0, 0,
-                                    connector_spacing_changed, 1, 0 );
+                                    connector_spacing_changed, NULL /*unit tracker*/, 1, 0 );
     gtk_action_group_add_action( mainActions, GTK_ACTION(eact) );
 
     // Graph (connector network) layout
@@ -397,7 +397,7 @@
                                      GTK_WIDGET(desktop->canvas), holder, TRUE, "inkscape:connector-length",
                                      10, 1000, 10.0, 100.0,
                                      0, 0, 0,
-                                     connector_length_changed, 1, 0 );
+                                     connector_length_changed, NULL /*unit tracker*/, 1, 0 );
     gtk_action_group_add_action( mainActions, GTK_ACTION(eact) );
 
 

=== modified file 'src/widgets/desktop-widget.cpp'
--- src/widgets/desktop-widget.cpp	2013-08-30 21:35:42 +0000
+++ src/widgets/desktop-widget.cpp	2013-09-20 17:05:49 +0000
@@ -2135,8 +2135,8 @@
 
     /* The desktop region we always show unconditionally */
     SPDocument *doc = dtw->desktop->doc();
-    Geom::Rect darea ( Geom::Point(-doc->getWidth(), -doc->getHeight()),
-                     Geom::Point(2 * doc->getWidth(), 2 * doc->getHeight())  );
+    Geom::Rect darea ( Geom::Point(-doc->getWidth().value("px"), -doc->getHeight().value("px")),
+                     Geom::Point(2 * doc->getWidth().value("px"), 2 * doc->getHeight().value("px"))  );
 
     Geom::OptRect deskarea;
     if (Inkscape::Preferences::get()->getInt("/tools/bounding_box") == 0) {

=== modified file 'src/widgets/eraser-toolbar.cpp'
--- src/widgets/eraser-toolbar.cpp	2013-07-30 01:54:37 +0000
+++ src/widgets/eraser-toolbar.cpp	2013-09-20 17:05:49 +0000
@@ -148,7 +148,7 @@
                                                               GTK_WIDGET(desktop->canvas), holder, TRUE, "altx-eraser",
                                                               1, 100, 1.0, 10.0,
                                                               labels, values, G_N_ELEMENTS(labels),
-                                                              sp_erc_width_value_changed, 1, 0);
+                                                              sp_erc_width_value_changed, NULL /*unit tracker*/, 1, 0);
         ege_adjustment_action_set_appearance( eact, TOOLBAR_SLIDER_HINT );
         gtk_action_group_add_action( mainActions, GTK_ACTION(eact) );
         gtk_action_set_sensitive( GTK_ACTION(eact), TRUE );

=== modified file 'src/widgets/gradient-toolbar.cpp'
--- src/widgets/gradient-toolbar.cpp	2013-08-30 21:35:42 +0000
+++ src/widgets/gradient-toolbar.cpp	2013-09-20 17:05:49 +0000
@@ -1175,8 +1175,9 @@
                                          GTK_WIDGET(desktop->canvas), holder, FALSE, NULL,
                                          0.0, 1.0, 0.01, 0.1,
                                          0, 0, 0,
-                                         gr_stop_offset_adjustment_changed
-                                         , 0.01, 2, 1.0);
+                                         gr_stop_offset_adjustment_changed,
+                                         NULL /*unit tracker*/,
+                                         0.01, 2, 1.0);
 
         gtk_action_group_add_action( mainActions, GTK_ACTION(eact) );
         g_object_set_data( holder, "offset_action", eact );

=== modified file 'src/widgets/icon.cpp'
--- src/widgets/icon.cpp	2013-06-12 15:14:48 +0000
+++ src/widgets/icon.cpp	2013-09-20 17:05:49 +0000
@@ -42,6 +42,7 @@
 #include "display/drawing.h"
 #include "io/sys.h"
 #include "sp-root.h"
+#include "util/units.h"
 
 #include "icon.h"
 
@@ -1137,7 +1138,7 @@
             if ( object->parent == NULL )
             {
                 dbox = Geom::Rect(Geom::Point(0, 0),
-                                Geom::Point(doc->getWidth(), doc->getHeight()));
+                                Geom::Point(doc->getWidth().value("px"), doc->getHeight().value("px")));
             }
 
             /* This is in document coordinates, i.e. pixels */

=== modified file 'src/widgets/mesh-toolbar.cpp'
--- src/widgets/mesh-toolbar.cpp	2013-07-19 18:19:03 +0000
+++ src/widgets/mesh-toolbar.cpp	2013-09-20 17:05:49 +0000
@@ -265,7 +265,7 @@
                                          GTK_WIDGET(desktop->canvas), holder, FALSE, NULL,
                                          1, 20, 1, 1,
                                          labels, values, G_N_ELEMENTS(labels),
-                                         ms_row_changed,
+                                         ms_row_changed, NULL /*unit tracker*/,
                                          1.0, 0 );
         gtk_action_group_add_action( mainActions, GTK_ACTION(eact) );
         gtk_action_set_sensitive( GTK_ACTION(eact), TRUE );
@@ -281,7 +281,7 @@
                                          GTK_WIDGET(desktop->canvas), holder, FALSE, NULL,
                                          1, 20, 1, 1,
                                          labels, values, G_N_ELEMENTS(labels),
-                                         ms_col_changed,
+                                         ms_col_changed, NULL /*unit tracker*/,
                                          1.0, 0 );
         gtk_action_group_add_action( mainActions, GTK_ACTION(eact) );
         gtk_action_set_sensitive( GTK_ACTION(eact), TRUE );

=== modified file 'src/widgets/node-toolbar.cpp'
--- src/widgets/node-toolbar.cpp	2013-08-04 22:01:18 +0000
+++ src/widgets/node-toolbar.cpp	2013-09-20 17:05:49 +0000
@@ -595,7 +595,7 @@
                                          GTK_WIDGET(desktop->canvas), holder, TRUE, "altx-nodes",
                                          -1e6, 1e6, SPIN_STEP, SPIN_PAGE_STEP,
                                          labels, values, G_N_ELEMENTS(labels),
-                                         sp_node_path_x_value_changed );
+                                         sp_node_path_x_value_changed, tracker );
         tracker->addAdjustment( ege_adjustment_action_get_adjustment(eact) );
         g_object_set_data( holder, "nodes_x_action", eact );
         gtk_action_set_sensitive( GTK_ACTION(eact), FALSE );
@@ -613,7 +613,7 @@
                                          GTK_WIDGET(desktop->canvas), holder, FALSE, NULL,
                                          -1e6, 1e6, SPIN_STEP, SPIN_PAGE_STEP,
                                          labels, values, G_N_ELEMENTS(labels),
-                                         sp_node_path_y_value_changed );
+                                         sp_node_path_y_value_changed, tracker );
         tracker->addAdjustment( ege_adjustment_action_get_adjustment(eact) );
         g_object_set_data( holder, "nodes_y_action", eact );
         gtk_action_set_sensitive( GTK_ACTION(eact), FALSE );

=== modified file 'src/widgets/paintbucket-toolbar.cpp'
--- src/widgets/paintbucket-toolbar.cpp	2013-08-30 21:35:42 +0000
+++ src/widgets/paintbucket-toolbar.cpp	2013-09-20 17:05:49 +0000
@@ -169,7 +169,7 @@
             "/tools/paintbucket/threshold", 5, GTK_WIDGET(desktop->canvas), holder, TRUE,
             "inkscape:paintbucket-threshold", 0, 100.0, 1.0, 10.0,
             0, 0, 0,
-            paintbucket_threshold_changed, 1, 0 );
+            paintbucket_threshold_changed, NULL /*unit tracker*/, 1, 0 );
 
         ege_adjustment_action_set_appearance( eact, TOOLBAR_SLIDER_HINT );
         gtk_action_group_add_action( mainActions, GTK_ACTION(eact) );
@@ -197,7 +197,7 @@
             "/tools/paintbucket/offset", 0, GTK_WIDGET(desktop->canvas), holder, TRUE,
             "inkscape:paintbucket-offset", -1e4, 1e4, 0.1, 0.5,
             0, 0, 0,
-            paintbucket_offset_changed, 1, 2);
+            paintbucket_offset_changed, tracker, 1, 2);
         tracker->addAdjustment( ege_adjustment_action_get_adjustment(eact) );
 
         gtk_action_group_add_action( mainActions, GTK_ACTION(eact) );

=== modified file 'src/widgets/pencil-toolbar.cpp'
--- src/widgets/pencil-toolbar.cpp	2013-07-19 18:19:03 +0000
+++ src/widgets/pencil-toolbar.cpp	2013-09-20 17:05:49 +0000
@@ -307,6 +307,7 @@
                                          1, 100.0, 0.5, 1.0,
                                          labels, values, G_N_ELEMENTS(labels),
                                          sp_pencil_tb_tolerance_value_changed,
+                                         NULL /*unit tracker*/,
                                          1, 2);
         ege_adjustment_action_set_appearance( eact, TOOLBAR_SLIDER_HINT );
         gtk_action_group_add_action( mainActions, GTK_ACTION(eact) );

=== modified file 'src/widgets/rect-toolbar.cpp'
--- src/widgets/rect-toolbar.cpp	2013-08-30 21:35:42 +0000
+++ src/widgets/rect-toolbar.cpp	2013-09-20 17:05:49 +0000
@@ -114,7 +114,7 @@
     for (GSList const *items = selection->itemList(); items != NULL; items = items->next) {
         if (SP_IS_RECT(items->data)) {
             if (gtk_adjustment_get_value(adj) != 0) {
-                (SP_RECT(items->data)->*setter)(Quantity::convert(gtk_adjustment_get_value(adj), unit, "px"));
+                (SP_RECT(items->data)->*setter)(Quantity::convert(gtk_adjustment_get_value(adj), unit, *sp_desktop_namedview(desktop)->doc_units));
             } else {
                 SP_OBJECT(items->data)->getRepr()->setAttribute(value_name, NULL);
             }
@@ -186,6 +186,7 @@
 
     UnitTracker* tracker = reinterpret_cast<UnitTracker*>( g_object_get_data( tbl, "tracker" ) );
     Unit const unit = tracker->getActiveUnit();
+    Unit const doc_unit = *sp_desktop_namedview(SP_ACTIVE_DESKTOP)->doc_units;
 
     gpointer item = g_object_get_data( tbl, "item" );
     if (item && SP_IS_RECT(item)) {
@@ -193,28 +194,28 @@
             GtkAdjustment *adj = GTK_ADJUSTMENT( g_object_get_data( tbl, "rx" ) );
 
             gdouble rx = SP_RECT(item)->getVisibleRx();
-            gtk_adjustment_set_value(adj, Quantity::convert(rx, "px", unit));
+            gtk_adjustment_set_value(adj, Quantity::convert(rx, doc_unit, unit));
         }
 
         {
             GtkAdjustment *adj = GTK_ADJUSTMENT( g_object_get_data( tbl, "ry" ) );
 
             gdouble ry = SP_RECT(item)->getVisibleRy();
-            gtk_adjustment_set_value(adj, Quantity::convert(ry, "px", unit));
+            gtk_adjustment_set_value(adj, Quantity::convert(ry, doc_unit, unit));
         }
 
         {
             GtkAdjustment *adj = GTK_ADJUSTMENT( g_object_get_data( tbl, "width" ) );
 
             gdouble width = SP_RECT(item)->getVisibleWidth();
-            gtk_adjustment_set_value(adj, Quantity::convert(width, "px", unit));
+            gtk_adjustment_set_value(adj, Quantity::convert(width, doc_unit, unit));
         }
 
         {
             GtkAdjustment *adj = GTK_ADJUSTMENT( g_object_get_data( tbl, "height" ) );
 
             gdouble height = SP_RECT(item)->getVisibleHeight();
-            gtk_adjustment_set_value(adj, Quantity::convert(height, "px", unit));
+            gtk_adjustment_set_value(adj, Quantity::convert(height, doc_unit, unit));
         }
     }
 
@@ -322,7 +323,7 @@
                                          GTK_WIDGET(desktop->canvas), holder, TRUE, "altx-rect",
                                          0, 1e6, SPIN_STEP, SPIN_PAGE_STEP,
                                          labels, values, G_N_ELEMENTS(labels),
-                                         sp_rtb_width_value_changed );
+                                         sp_rtb_width_value_changed, tracker);
         tracker->addAdjustment( ege_adjustment_action_get_adjustment(eact) );
         g_object_set_data( holder, "width_action", eact );
         gtk_action_set_sensitive( GTK_ACTION(eact), FALSE );
@@ -339,7 +340,7 @@
                                          GTK_WIDGET(desktop->canvas), holder, FALSE, NULL,
                                          0, 1e6, SPIN_STEP, SPIN_PAGE_STEP,
                                          labels, values, G_N_ELEMENTS(labels),
-                                         sp_rtb_height_value_changed );
+                                         sp_rtb_height_value_changed, tracker);
         tracker->addAdjustment( ege_adjustment_action_get_adjustment(eact) );
         g_object_set_data( holder, "height_action", eact );
         gtk_action_set_sensitive( GTK_ACTION(eact), FALSE );
@@ -356,7 +357,7 @@
                                          GTK_WIDGET(desktop->canvas), holder, FALSE, NULL,
                                          0, 1e6, SPIN_STEP, SPIN_PAGE_STEP,
                                          labels, values, G_N_ELEMENTS(labels),
-                                         sp_rtb_rx_value_changed);
+                                         sp_rtb_rx_value_changed, tracker);
         tracker->addAdjustment( ege_adjustment_action_get_adjustment(eact) );
         gtk_action_group_add_action( mainActions, GTK_ACTION(eact) );
     }
@@ -371,7 +372,7 @@
                                          GTK_WIDGET(desktop->canvas), holder, FALSE, NULL,
                                          0, 1e6, SPIN_STEP, SPIN_PAGE_STEP,
                                          labels, values, G_N_ELEMENTS(labels),
-                                         sp_rtb_ry_value_changed);
+                                         sp_rtb_ry_value_changed, tracker);
         tracker->addAdjustment( ege_adjustment_action_get_adjustment(eact) );
         gtk_action_group_add_action( mainActions, GTK_ACTION(eact) );
     }

=== modified file 'src/widgets/select-toolbar.cpp'
--- src/widgets/select-toolbar.cpp	2013-08-04 22:01:18 +0000
+++ src/widgets/select-toolbar.cpp	2013-09-20 17:05:49 +0000
@@ -273,7 +273,7 @@
     g_object_set_data(G_OBJECT(spw), "update", GINT_TO_POINTER(FALSE));
 }
 
-static GtkWidget* createCustomSlider( GtkAdjustment *adjustment, gdouble climbRate, guint digits )
+static GtkWidget* createCustomSlider( GtkAdjustment *adjustment, gdouble climbRate, guint digits, Inkscape::UI::Widget::UnitTracker *unit_tracker )
 {
 #if WITH_GTKMM_3_0
     Glib::RefPtr<Gtk::Adjustment> adj = Glib::wrap(adjustment, true);
@@ -281,6 +281,7 @@
 #else
     Inkscape::UI::Widget::SpinButton *inkSpinner = new Inkscape::UI::Widget::SpinButton(*Glib::wrap(adjustment, true), climbRate, digits);
 #endif
+    inkSpinner->addUnitTracker(unit_tracker);
     inkSpinner = Gtk::manage( inkSpinner );
     GtkWidget *widget = GTK_WIDGET( inkSpinner->gobj() );
     return widget;
@@ -313,7 +314,7 @@
         g_object_set_data( G_OBJECT(spw), data, adj );
     }
 
-    EgeAdjustmentAction* act = ege_adjustment_action_new( adj, name, Q_(label), tooltip, 0, SPIN_STEP, 3 );
+    EgeAdjustmentAction* act = ege_adjustment_action_new( adj, name, Q_(label), tooltip, 0, SPIN_STEP, 3, tracker );
     if ( shortLabel ) {
         g_object_set( act, "short_label", Q_(shortLabel), NULL );
     }

=== modified file 'src/widgets/spiral-toolbar.cpp'
--- src/widgets/spiral-toolbar.cpp	2013-07-19 18:19:03 +0000
+++ src/widgets/spiral-toolbar.cpp	2013-09-20 17:05:49 +0000
@@ -262,7 +262,7 @@
                                          GTK_WIDGET(desktop->canvas), holder, TRUE, "altx-spiral",
                                          0.01, 1024.0, 0.1, 1.0,
                                          labels, values, G_N_ELEMENTS(labels),
-                                         sp_spl_tb_revolution_value_changed, 1, 2);
+                                         sp_spl_tb_revolution_value_changed, NULL /*unit tracker*/, 1, 2);
         gtk_action_group_add_action( mainActions, GTK_ACTION(eact) );
     }
 

=== modified file 'src/widgets/spray-toolbar.cpp'
--- src/widgets/spray-toolbar.cpp	2013-07-19 18:19:03 +0000
+++ src/widgets/spray-toolbar.cpp	2013-09-20 17:05:49 +0000
@@ -130,7 +130,7 @@
                                                               GTK_WIDGET(desktop->canvas), holder, TRUE, "altx-spray",
                                                               1, 100, 1.0, 10.0,
                                                               labels, values, G_N_ELEMENTS(labels),
-                                                              sp_spray_width_value_changed,  1, 0 );
+                                                              sp_spray_width_value_changed, NULL /*unit tracker*/, 1, 0 );
         ege_adjustment_action_set_appearance( eact, TOOLBAR_SLIDER_HINT );
         gtk_action_group_add_action( mainActions, GTK_ACTION(eact) );
         gtk_action_set_sensitive( GTK_ACTION(eact), TRUE );
@@ -146,7 +146,7 @@
                                                               GTK_WIDGET(desktop->canvas), holder, TRUE, "spray-mean",
                                                               0, 100, 1.0, 10.0,
                                                               labels, values, G_N_ELEMENTS(labels),
-                                                              sp_spray_mean_value_changed,  1, 0 );
+                                                              sp_spray_mean_value_changed, NULL /*unit tracker*/, 1, 0 );
         ege_adjustment_action_set_appearance( eact, TOOLBAR_SLIDER_HINT );
         gtk_action_group_add_action( mainActions, GTK_ACTION(eact) );
         gtk_action_set_sensitive( GTK_ACTION(eact), TRUE );
@@ -162,7 +162,7 @@
                                                               GTK_WIDGET(desktop->canvas), holder, TRUE, "spray-standard_deviation",
                                                               1, 100, 1.0, 10.0,
                                                               labels, values, G_N_ELEMENTS(labels),
-                                                              sp_spray_standard_deviation_value_changed,  1, 0 );
+                                                              sp_spray_standard_deviation_value_changed, NULL /*unit tracker*/, 1, 0 );
         ege_adjustment_action_set_appearance( eact, TOOLBAR_SLIDER_HINT );
         gtk_action_group_add_action( mainActions, GTK_ACTION(eact) );
         gtk_action_set_sensitive( GTK_ACTION(eact), TRUE );
@@ -223,7 +223,7 @@
                                                               GTK_WIDGET(desktop->canvas), holder, TRUE, "spray-population",
                                                               1, 100, 1.0, 10.0,
                                                               labels, values, G_N_ELEMENTS(labels),
-                                                              sp_spray_population_value_changed,  1, 0 );
+                                                              sp_spray_population_value_changed, NULL /*unit tracker*/, 1, 0 );
         ege_adjustment_action_set_appearance( eact, TOOLBAR_SLIDER_HINT );
         gtk_action_group_add_action( mainActions, GTK_ACTION(eact) );
         gtk_action_set_sensitive( GTK_ACTION(eact), TRUE );
@@ -254,7 +254,7 @@
                                                               GTK_WIDGET(desktop->canvas), holder, TRUE, "spray-rotation",
                                                               0, 100, 1.0, 10.0,
                                                               labels, values, G_N_ELEMENTS(labels),
-                                                              sp_spray_rotation_value_changed,  1, 0 );
+                                                              sp_spray_rotation_value_changed, NULL /*unit tracker*/, 1, 0 );
         ege_adjustment_action_set_appearance( eact, TOOLBAR_SLIDER_HINT );
         gtk_action_group_add_action( mainActions, GTK_ACTION(eact) );
         gtk_action_set_sensitive( GTK_ACTION(eact), TRUE );
@@ -272,7 +272,7 @@
                                                               GTK_WIDGET(desktop->canvas), holder, TRUE, "spray-scale",
                                                               0, 100, 1.0, 10.0,
                                                               labels, values, G_N_ELEMENTS(labels),
-                                                              sp_spray_scale_value_changed,  1, 0 );
+                                                              sp_spray_scale_value_changed, NULL /*unit tracker*/, 1, 0 );
         ege_adjustment_action_set_appearance( eact, TOOLBAR_SLIDER_HINT );
         gtk_action_group_add_action( mainActions, GTK_ACTION(eact) );
         gtk_action_set_sensitive( GTK_ACTION(eact), TRUE );

=== modified file 'src/widgets/star-toolbar.cpp'
--- src/widgets/star-toolbar.cpp	2013-07-19 18:19:03 +0000
+++ src/widgets/star-toolbar.cpp	2013-09-20 17:05:49 +0000
@@ -504,7 +504,7 @@
                                          GTK_WIDGET(desktop->canvas), holder, FALSE, NULL,
                                          3, 1024, 1, 5,
                                          labels, values, G_N_ELEMENTS(labels),
-                                         sp_stb_magnitude_value_changed,
+                                         sp_stb_magnitude_value_changed, NULL /*unit tracker*/,
                                          1.0, 0 );
         gtk_action_group_add_action( mainActions, GTK_ACTION(eact) );
         gtk_action_set_sensitive( GTK_ACTION(eact), TRUE );
@@ -559,7 +559,7 @@
                                          GTK_WIDGET(desktop->canvas), holder, FALSE, NULL,
                                          -10.0, 10.0, 0.001, 0.01,
                                          labels, values, G_N_ELEMENTS(labels),
-                                         sp_stb_randomized_value_changed, 0.1, 3 );
+                                         sp_stb_randomized_value_changed, NULL /*unit tracker*/, 0.1, 3 );
         gtk_action_group_add_action( mainActions, GTK_ACTION(eact) );
         gtk_action_set_sensitive( GTK_ACTION(eact), TRUE );
         }

=== modified file 'src/widgets/text-toolbar.cpp'
--- src/widgets/text-toolbar.cpp	2013-07-30 02:51:28 +0000
+++ src/widgets/text-toolbar.cpp	2013-09-20 17:05:49 +0000
@@ -1459,6 +1459,7 @@
             0.0, 10.0, 0.01, 0.10,                /* lower, upper, step (arrow up/down), page up/down */
             labels, values, G_N_ELEMENTS(labels), /* drop down menu */
             sp_text_lineheight_value_changed,     /* callback */
+            NULL,                                 /* unit tracker */
             0.1,                                  /* step (used?) */
             2,                                    /* digits to show */
             1.0                                   /* factor (multiplies default) */
@@ -1489,6 +1490,7 @@
             -100.0, 100.0, 0.01, 0.10,            /* lower, upper, step (arrow up/down), page up/down */
             labels, values, G_N_ELEMENTS(labels), /* drop down menu */
             sp_text_wordspacing_value_changed,    /* callback */
+            NULL,                                 /* unit tracker */
             0.1,                                  /* step (used?) */
             2,                                    /* digits to show */
             1.0                                   /* factor (multiplies default) */
@@ -1519,6 +1521,7 @@
             -100.0, 100.0, 0.01, 0.10,            /* lower, upper, step (arrow up/down), page up/down */
             labels, values, G_N_ELEMENTS(labels), /* drop down menu */
             sp_text_letterspacing_value_changed,  /* callback */
+            NULL,                                 /* unit tracker */
             0.1,                                  /* step (used?) */
             2,                                    /* digits to show */
             1.0                                   /* factor (multiplies default) */
@@ -1549,6 +1552,7 @@
             -100.0, 100.0, 0.01, 0.1,             /* lower, upper, step (arrow up/down), page up/down */
             labels, values, G_N_ELEMENTS(labels), /* drop down menu */
             sp_text_dx_value_changed,             /* callback */
+            NULL,                                 /* unit tracker */
             0.1,                                  /* step (used?) */
             2,                                    /* digits to show */
             1.0                                   /* factor (multiplies default) */
@@ -1579,6 +1583,7 @@
             -100.0, 100.0, 0.01, 0.1,             /* lower, upper, step (arrow up/down), page up/down */
             labels, values, G_N_ELEMENTS(labels), /* drop down menu */
             sp_text_dy_value_changed,             /* callback */
+            NULL,                                 /* unit tracker */
             0.1,                                  /* step (used?) */
             2,                                    /* digits to show */
             1.0                                   /* factor (multiplies default) */
@@ -1609,6 +1614,7 @@
             -180.0, 180.0, 0.1, 1.0,              /* lower, upper, step (arrow up/down), page up/down */
             labels, values, G_N_ELEMENTS(labels), /* drop down menu */
             sp_text_rotation_value_changed,       /* callback */
+            NULL,                                 /* unit tracker */
             0.1,                                  /* step (used?) */
             2,                                    /* digits to show */
             1.0                                   /* factor (multiplies default) */

=== modified file 'src/widgets/toolbox.cpp'
--- src/widgets/toolbox.cpp	2013-08-30 21:35:42 +0000
+++ src/widgets/toolbox.cpp	2013-09-20 17:05:49 +0000
@@ -1012,7 +1012,7 @@
     return toolboxNewCommon( tb, BAR_SNAP, GTK_POS_LEFT );
 }
 
-static GtkWidget* createCustomSlider( GtkAdjustment *adjustment, gdouble climbRate, guint digits )
+static GtkWidget* createCustomSlider( GtkAdjustment *adjustment, gdouble climbRate, guint digits, Inkscape::UI::Widget::UnitTracker *unit_tracker)
 {
 #if WITH_GTKMM_3_0
     Glib::RefPtr<Gtk::Adjustment> adj = Glib::wrap(adjustment, true);
@@ -1020,6 +1020,7 @@
 #else
     Inkscape::UI::Widget::SpinButton *inkSpinner = new Inkscape::UI::Widget::SpinButton(*Glib::wrap(adjustment, true), climbRate, digits);
 #endif
+    inkSpinner->addUnitTracker(unit_tracker);
     inkSpinner = Gtk::manage( inkSpinner );
     GtkWidget *widget = GTK_WIDGET( inkSpinner->gobj() );
     return widget;
@@ -1034,6 +1035,7 @@
                                                        gdouble lower, gdouble upper, gdouble step, gdouble page,
                                                        gchar const** descrLabels, gdouble const* descrValues, guint descrCount,
                                                        void (*callback)(GtkAdjustment *, GObject *),
+                                                       Inkscape::UI::Widget::UnitTracker *unit_tracker,
                                                        gdouble climb/* = 0.1*/, guint digits/* = 3*/, double factor/* = 1.0*/ )
 {
     static bool init = false;
@@ -1048,7 +1050,7 @@
 
     g_signal_connect( G_OBJECT(adj), "value-changed", G_CALLBACK(callback), dataKludge );
 
-    EgeAdjustmentAction* act = ege_adjustment_action_new( adj, name, label, tooltip, 0, climb, digits );
+    EgeAdjustmentAction* act = ege_adjustment_action_new( adj, name, label, tooltip, 0, climb, digits, unit_tracker );
     if ( shortLabel ) {
         g_object_set( act, "short_label", shortLabel, NULL );
     }

=== modified file 'src/widgets/toolbox.h'
--- src/widgets/toolbox.h	2013-08-30 21:35:42 +0000
+++ src/widgets/toolbox.h	2013-09-20 17:05:49 +0000
@@ -28,6 +28,10 @@
 namespace Inkscape {
 namespace UI {
 
+namespace Widget {
+    class UnitTracker;
+}
+
 /**
  * Main toolbox source.
  */
@@ -123,6 +127,7 @@
                                                        gdouble lower, gdouble upper, gdouble step, gdouble page,
                                                        gchar const** descrLabels, gdouble const* descrValues, guint descrCount,
                                                        void (*callback)(GtkAdjustment *, GObject *),
+                                                       Inkscape::UI::Widget::UnitTracker *unit_tracker = NULL,
                                                        gdouble climb = 0.1, guint digits = 3, double factor = 1.0 );
 
 #endif /* !SEEN_TOOLBOX_H */

=== modified file 'src/widgets/tweak-toolbar.cpp'
--- src/widgets/tweak-toolbar.cpp	2013-07-19 18:19:03 +0000
+++ src/widgets/tweak-toolbar.cpp	2013-09-20 17:05:49 +0000
@@ -144,7 +144,7 @@
                                                               GTK_WIDGET(desktop->canvas), holder, TRUE, "altx-tweak",
                                                               1, 100, 1.0, 10.0,
                                                               labels, values, G_N_ELEMENTS(labels),
-                                                              sp_tweak_width_value_changed,  0.01, 0, 100 );
+                                                              sp_tweak_width_value_changed, NULL /*unit tracker*/, 0.01, 0, 100 );
         ege_adjustment_action_set_appearance( eact, TOOLBAR_SLIDER_HINT );
         gtk_action_group_add_action( mainActions, GTK_ACTION(eact) );
         gtk_action_set_sensitive( GTK_ACTION(eact), TRUE );
@@ -161,7 +161,7 @@
                                                               GTK_WIDGET(desktop->canvas), holder, TRUE, "tweak-force",
                                                               1, 100, 1.0, 10.0,
                                                               labels, values, G_N_ELEMENTS(labels),
-                                                              sp_tweak_force_value_changed,  0.01, 0, 100 );
+                                                              sp_tweak_force_value_changed, NULL /*unit tracker*/, 0.01, 0, 100 );
         ege_adjustment_action_set_appearance( eact, TOOLBAR_SLIDER_HINT );
         gtk_action_group_add_action( mainActions, GTK_ACTION(eact) );
         gtk_action_set_sensitive( GTK_ACTION(eact), TRUE );
@@ -370,7 +370,7 @@
                                                               GTK_WIDGET(desktop->canvas), holder, TRUE, "tweak-fidelity",
                                                               1, 100, 1.0, 10.0,
                                                               labels, values, G_N_ELEMENTS(labels),
-                                                              sp_tweak_fidelity_value_changed,  0.01, 0, 100 );
+                                                              sp_tweak_fidelity_value_changed, NULL /*unit tracker*/, 0.01, 0, 100 );
         gtk_action_group_add_action( mainActions, GTK_ACTION(eact) );
         gtk_action_set_sensitive( GTK_ACTION(eact), TRUE );
         if (mode == TWEAK_MODE_COLORPAINT || mode == TWEAK_MODE_COLORJITTER) {