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

[Matthew Petroff]

This branch is a refactor of Inkscape's unit support as phase one of my Google Summer of Code project. Unit support was consolidated into one implementation, residing in "util/units.*", eliminating "SPUnit", "SPMetric", and "unit-constants.h".

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

12438. By Matthew Petroff on 2013-08-01

Fixed Windows compile bug.

12439. By Matthew Petroff on 2013-08-01

Fix UnitTracker percentage bug.

12440. By Matthew Petroff on 2013-08-03

Fixed building of tests.

12441. By Matthew Petroff on 2013-08-03

Fix handling of SVG lengths with spaces [Bug #1208002].

12442. By Matthew Petroff on 2013-08-04

Switched to global UnitTable.

12443. By Matthew Petroff on 2013-08-06

Fixed bug in page sizer.

[su_v (suv-lp)]

Hi Matthew - the merge of this branch has introduced a couple of regressions in trunk (3 reported so far):

- Bug #1215104: Inkscape crashes when exporting PNG if default unit is different than "px"
  <https://bugs.launchpad.net/inkscape/+bug/1215104>
- Bug #1215575: Manual text kerning not working since r12471
  <https://bugs.launchpad.net/inkscape/+bug/1215575>
- Bug #1216306: Grid parameters not working with comma as decimal separator
  <https://bugs.launchpad.net/inkscape/+bug/1216306>

I just tested your current branch for phase two (<lp:~matthewpetroff/inkscape/gsoc-2013-unit-improvement> r12484), and - since all of them are still reproducible - wanted to make you aware of these issues.

=== modified file 'AUTHORS'
--- AUTHORS	2013-07-18 11:21:06 +0000
+++ AUTHORS	2013-08-06 18:46:25 +0000
@@ -121,6 +121,7 @@
 Mitsuru Oka
 Martin Owens
 Alvin Penner
+Matthew Petroff
 Jon Phillips
 Zdenko Podobny
 Alexandre Prokoudine
 
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2013-07-23 17:01:25 +0000
+++ src/CMakeLists.txt	2013-08-06 18:46:25 +0000
@@ -46,7 +46,6 @@
 	sp-mesh-patch.cpp
 	sp-mesh-row.cpp
 	sp-metadata.cpp
-	sp-metrics.cpp
 	sp-missing-glyph.cpp
 	sp-namedview.cpp
 	sp-object-group.cpp
@@ -136,8 +135,6 @@
 	sp-mesh-row-fns.h
 	sp-mesh-row.h
 	sp-metadata.h
-	sp-metric.h
-	sp-metrics.h
 	sp-missing-glyph.h
 	sp-namedview.h
 	sp-object-group.h
@@ -484,7 +481,6 @@
 	unclump.h
 	undo-stack-observer.h
 	unicoderange.h
-	unit-constants.h
 	uri-references.h
 	uri.h
 	vanishing-point.h
 
=== modified file 'src/Makefile_insert'
--- src/Makefile_insert	2013-08-03 15:35:41 +0000
+++ src/Makefile_insert	2013-08-06 18:46:25 +0000
@@ -198,8 +198,6 @@
 	sp-mesh-patch.cpp sp-mesh-patch.h				\
 	sp-mesh-row-fns.h						\
 	sp-mesh-row.cpp sp-mesh-row.h					\
-	sp-metric.h							\
-	sp-metrics.cpp sp-metrics.h					\
         sp-missing-glyph.cpp sp-missing-glyph.h \
 	sp-namedview.cpp sp-namedview.h		\
 	sp-object.cpp sp-object.h		\
@@ -252,7 +250,6 @@
 	unclump.cpp unclump.h			\
 	undo-stack-observer.h			\
 	unicoderange.cpp unicoderange.h		\
-	unit-constants.h			\
 	uri.cpp uri.h				\
 	uri-references.cpp uri-references.h	\
 	vanishing-point.cpp vanishing-point.h	\
 
=== modified file 'src/arc-context.cpp'
--- src/arc-context.cpp	2013-04-28 22:48:03 +0000
+++ src/arc-context.cpp	2013-08-06 18:46:25 +0000
@@ -32,7 +32,6 @@
 #include "desktop-handles.h"
 #include "snap.h"
 #include "pixmaps/cursor-ellipse.xpm"
-#include "sp-metrics.h"
 #include "xml/repr.h"
 #include "xml/node-event-vector.h"
 #include "preferences.h"
@@ -450,8 +449,10 @@
 
     double rdimx = r.dimensions()[Geom::X];
     double rdimy = r.dimensions()[Geom::Y];
-    GString *xs = SP_PX_TO_METRIC_STRING(rdimx, desktop->namedview->getDefaultMetric());
-    GString *ys = SP_PX_TO_METRIC_STRING(rdimy, desktop->namedview->getDefaultMetric());
+    Inkscape::Util::Quantity rdimx_q = Inkscape::Util::Quantity(rdimx, "px");
+    Inkscape::Util::Quantity rdimy_q = Inkscape::Util::Quantity(rdimy, "px");
+    GString *xs = g_string_new(rdimx_q.string(*desktop->namedview->doc_units).c_str());
+    GString *ys = g_string_new(rdimy_q.string(*desktop->namedview->doc_units).c_str());
     if (state & GDK_CONTROL_MASK) {
         int ratio_x, ratio_y;
         if (fabs (rdimx) > fabs (rdimy)) {
 
=== modified file 'src/box3d-context.cpp'
--- src/box3d-context.cpp	2013-04-28 22:48:03 +0000
+++ src/box3d-context.cpp	2013-08-06 18:46:25 +0000
@@ -35,7 +35,6 @@
 #include "pixmaps/cursor-3dbox.xpm"
 #include "box3d.h"
 #include "box3d-context.h"
-#include "sp-metrics.h"
 #include <glibmm/i18n.h>
 #include "xml/repr.h"
 #include "xml/node-event-vector.h"
 
=== modified file 'src/desktop-events.cpp'
--- src/desktop-events.cpp	2013-03-25 17:42:31 +0000
+++ src/desktop-events.cpp	2013-08-06 18:46:25 +0000
@@ -34,14 +34,11 @@
 #include "document-undo.h"
 #include "event-context.h"
 #include "helper/action.h"
-#include "helper/unit-menu.h"
-#include "helper/units.h"
 #include "message-context.h"
 #include "preferences.h"
 #include "snap.h"
 #include "display/sp-canvas.h"
 #include "sp-guide.h"
-#include "sp-metrics.h"
 #include "sp-namedview.h"
 #include "tools-switch.h"
 #include "verbs.h"
 
=== modified file 'src/desktop.cpp'
--- src/desktop.cpp	2013-07-04 14:01:44 +0000
+++ src/desktop.cpp	2013-08-06 18:46:25 +0000
@@ -54,7 +54,6 @@
 #include "document.h"
 #include "event-log.h"
 #include "helper/action-context.h"
-#include "helper/units.h"
 #include "interface.h"
 #include "inkscape-private.h"
 #include "layer-fns.h"
 
=== modified file 'src/display/canvas-axonomgrid.cpp'
--- src/display/canvas-axonomgrid.cpp	2013-06-06 13:44:11 +0000
+++ src/display/canvas-axonomgrid.cpp	2013-08-06 18:46:25 +0000
@@ -51,8 +51,9 @@
 #include "2geom/angle.h"
 #include "util/mathfns.h"
 #include "round.h"
-#include "helper/units.h"
+#include "util/units.h"
 
+using Inkscape::Util::unit_table;
 
 enum Dim3 { X=0, Y, Z };
 
@@ -160,15 +161,15 @@
     : CanvasGrid(nv, in_repr, in_doc, GRID_AXONOMETRIC)
 {
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-    gridunit = sp_unit_get_by_abbreviation( prefs->getString("/options/grids/axonom/units").data() );
+    gridunit = new Inkscape::Util::Unit(unit_table.getUnit(prefs->getString("/options/grids/axonom/units")));
     if (!gridunit)
-        gridunit = &sp_unit_get_by_id(SP_UNIT_PX);
-    origin[Geom::X] = sp_units_get_pixels( prefs->getDouble("/options/grids/axonom/origin_x", 0.0), *gridunit );
-    origin[Geom::Y] = sp_units_get_pixels( prefs->getDouble("/options/grids/axonom/origin_y", 0.0), *gridunit );
+        gridunit = new Inkscape::Util::Unit(unit_table.getUnit("px"));
+    origin[Geom::X] = Inkscape::Util::Quantity::convert(prefs->getDouble("/options/grids/axonom/origin_x", 0.0), *gridunit, "px");
+    origin[Geom::Y] = Inkscape::Util::Quantity::convert(prefs->getDouble("/options/grids/axonom/origin_y", 0.0), *gridunit, "px");
     color = prefs->getInt("/options/grids/axonom/color", 0x0000ff20);
     empcolor = prefs->getInt("/options/grids/axonom/empcolor", 0x0000ff40);
     empspacing = prefs->getInt("/options/grids/axonom/empspacing", 5);
-    lengthy = sp_units_get_pixels( prefs->getDouble("/options/grids/axonom/spacing_y", 1.0), *gridunit );
+    lengthy = Inkscape::Util::Quantity::convert(prefs->getDouble("/options/grids/axonom/spacing_y", 1.0), *gridunit, "px");
     angle_deg[X] = prefs->getDouble("/options/grids/axonom/angle_x", 30.0);
     angle_deg[Z] = prefs->getDouble("/options/grids/axonom/angle_z", 30.0);
     angle_deg[Y] = 0;
@@ -188,63 +189,6 @@
     if (snapper) delete snapper;
 }
 
-
-/* fixme: Collect all these length parsing methods and think common sane API */
-
-static gboolean sp_nv_read_length(gchar const *str, guint base, gdouble *val, SPUnit const **unit)
-{
-    if (!str) {
-        return FALSE;
-    }
-
-    gchar *u;
-    gdouble v = g_ascii_strtod(str, &u);
-    if (!u) {
-        return FALSE;
-    }
-    while (isspace(*u)) {
-        u += 1;
-    }
-
-    if (!*u) {
-        /* No unit specified - keep default */
-        *val = v;
-        return TRUE;
-    }
-
-    if (base & SP_UNIT_DEVICE) {
-        if (u[0] && u[1] && !isalnum(u[2]) && !strncmp(u, "px", 2)) {
-            *unit = &sp_unit_get_by_id(SP_UNIT_PX);
-            *val = v;
-            return TRUE;
-        }
-    }
-
-    if (base & SP_UNIT_ABSOLUTE) {
-        if (!strncmp(u, "pt", 2)) {
-            *unit = &sp_unit_get_by_id(SP_UNIT_PT);
-        } else if (!strncmp(u, "mm", 2)) {
-            *unit = &sp_unit_get_by_id(SP_UNIT_MM);
-        } else if (!strncmp(u, "cm", 2)) {
-            *unit = &sp_unit_get_by_id(SP_UNIT_CM);
-        } else if (!strncmp(u, "m", 1)) {
-            *unit = &sp_unit_get_by_id(SP_UNIT_M);
-        } else if (!strncmp(u, "in", 2)) {
-            *unit = &sp_unit_get_by_id(SP_UNIT_IN);
-        } else if (!strncmp(u, "ft", 2)) {
-            *unit = &sp_unit_get_by_id(SP_UNIT_FT);
-        } else if (!strncmp(u, "pc", 2)) {
-            *unit = &sp_unit_get_by_id(SP_UNIT_PC);
-        } else {
-            return FALSE;
-        }
-        *val = v;
-        return TRUE;
-    }
-
-    return FALSE;
-}
-
 static gboolean sp_nv_read_opacity(gchar const *str, guint32 *color)
 {
     if (!str) {
@@ -270,17 +214,20 @@
 {
     gchar const *value;
     if ( (value = repr->attribute("originx")) ) {
-        sp_nv_read_length(value, SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE, &origin[Geom::X], &gridunit);
-        origin[Geom::X] = sp_units_get_pixels(origin[Geom::X], *(gridunit));
+        Inkscape::Util::Quantity q = unit_table.getQuantity(value);
+        gridunit = q.unit;
+        origin[Geom::X] = unit_table.getQuantity(value).value("px");
     }
     if ( (value = repr->attribute("originy")) ) {
-        sp_nv_read_length(value, SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE, &origin[Geom::Y], &gridunit);
-        origin[Geom::Y] = sp_units_get_pixels(origin[Geom::Y], *(gridunit));
+        Inkscape::Util::Quantity q = unit_table.getQuantity(value);
+        gridunit = q.unit;
+        origin[Geom::Y] = unit_table.getQuantity(value).value("px");
     }
 
     if ( (value = repr->attribute("spacingy")) ) {
-        sp_nv_read_length(value, SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE, &lengthy, &gridunit);
-        lengthy = sp_units_get_pixels(lengthy, *(gridunit));
+        Inkscape::Util::Quantity q = unit_table.getQuantity(value);
+        gridunit = q.unit;
+        lengthy = q.value("px");
         if (lengthy < 0.0500) lengthy = 0.0500;
     }
 
@@ -419,17 +366,17 @@
     attach_all (*table, widget_array, sizeof(widget_array));
 
     // set widget values
-    _rumg->setUnit (gridunit);
+    _rumg->setUnit (gridunit->abbr);
 
     gdouble val;
     val = origin[Geom::X];
-    val = sp_pixels_get_units (val, *(gridunit));
+    val = Inkscape::Util::Quantity::convert(val, "px", *gridunit);
     _rsu_ox->setValue (val);
     val = origin[Geom::Y];
-    val = sp_pixels_get_units (val, *(gridunit));
+    val = Inkscape::Util::Quantity::convert(val, "px", *gridunit);
     _rsu_oy->setValue (val);
     val = lengthy;
-    double gridy = sp_pixels_get_units (val, *(gridunit));
+    double gridy = Inkscape::Util::Quantity::convert(val, "px", *gridunit);
     _rsu_sy->setValue (gridy);
 
     _rsu_ax->setValue(angle_deg[X]);
@@ -458,17 +405,17 @@
         _rcb_enabled.setActive(snapper->getEnabled());
     }
 
-    _rumg.setUnit (gridunit);
+    _rumg.setUnit (gridunit->abbr);
 
     gdouble val;
     val = origin[Geom::X];
-    val = sp_pixels_get_units (val, *(gridunit));
+    val = Inkscape::Util::Quantity::convert(val, &px, gridunit);
     _rsu_ox.setValue (val);
     val = origin[Geom::Y];
-    val = sp_pixels_get_units (val, *(gridunit));
+    val = Inkscape::Util::Quantity::convert(val, &px, gridunit);
     _rsu_oy.setValue (val);
     val = lengthy;
-    double gridy = sp_pixels_get_units (val, *(gridunit));
+    double gridy = Inkscape::Util::Quantity::convert(val, &px, gridunit);
     _rsu_sy.setValue (gridy);
 
     _rsu_ax.setValue(angle_deg[X]);
 
=== modified file 'src/display/canvas-grid.cpp'
--- src/display/canvas-grid.cpp	2013-06-06 13:44:11 +0000
+++ src/display/canvas-grid.cpp	2013-08-06 18:46:25 +0000
@@ -42,7 +42,7 @@
 #include "display/canvas-grid.h"
 #include "display/sp-canvas-group.h"
 #include "document.h"
-#include "helper/units.h"
+#include "util/units.h"
 #include "inkscape.h"
 #include "preferences.h"
 #include "sp-namedview.h"
@@ -55,6 +55,7 @@
 #include "display/sp-canvas.h"
 
 using Inkscape::DocumentUndo;
+using Inkscape::Util::unit_table;
 
 namespace Inkscape {
 
@@ -398,11 +399,11 @@
     gdouble val;
 
     val = origin_px[Geom::X];
-    val = sp_pixels_get_units (val, *gridunit);
-    os_x << val << sp_unit_get_abbreviation(gridunit);
+    val = Inkscape::Util::Quantity::convert(val, "px", *gridunit);
+    os_x << val << gridunit->abbr;
     val = origin_px[Geom::Y];
-    val = sp_pixels_get_units (val, *gridunit);
-    os_y << val << sp_unit_get_abbreviation(gridunit);
+    val = Inkscape::Util::Quantity::convert(val, "px", *gridunit);
+    os_y << val << gridunit->abbr;
     repr->setAttribute("originx", os_x.str().c_str());
     repr->setAttribute("originy", os_y.str().c_str());
 }
@@ -488,17 +489,17 @@
     : CanvasGrid(nv, in_repr, in_doc, GRID_RECTANGULAR)
 {
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-    gridunit = sp_unit_get_by_abbreviation( prefs->getString("/options/grids/xy/units").data() );
+    gridunit = new Inkscape::Util::Unit(unit_table.getUnit(prefs->getString("/options/grids/xy/units")));
     if (!gridunit) {
-        gridunit = &sp_unit_get_by_id(SP_UNIT_PX);
+        gridunit = new Inkscape::Util::Unit(unit_table.getUnit("px"));
     }
-    origin[Geom::X] = sp_units_get_pixels(prefs->getDouble("/options/grids/xy/origin_x", 0.0), *gridunit);
-    origin[Geom::Y] = sp_units_get_pixels(prefs->getDouble("/options/grids/xy/origin_y", 0.0), *gridunit);
+    origin[Geom::X] = Inkscape::Util::Quantity::convert(prefs->getDouble("/options/grids/xy/origin_x", 0.0), *gridunit, "px");
+    origin[Geom::Y] = Inkscape::Util::Quantity::convert(prefs->getDouble("/options/grids/xy/origin_y", 0.0), *gridunit, "px");
     color = prefs->getInt("/options/grids/xy/color", 0x0000ff20);
     empcolor = prefs->getInt("/options/grids/xy/empcolor", 0x0000ff40);
     empspacing = prefs->getInt("/options/grids/xy/empspacing", 5);
-    spacing[Geom::X] = sp_units_get_pixels(prefs->getDouble("/options/grids/xy/spacing_x", 0.0), *gridunit);
-    spacing[Geom::Y] = sp_units_get_pixels(prefs->getDouble("/options/grids/xy/spacing_y", 0.0), *gridunit);
+    spacing[Geom::X] = Inkscape::Util::Quantity::convert(prefs->getDouble("/options/grids/xy/spacing_x", 0.0), *gridunit, "px");
+    spacing[Geom::Y] = Inkscape::Util::Quantity::convert(prefs->getDouble("/options/grids/xy/spacing_y", 0.0), *gridunit, "px");
     render_dotted = prefs->getBool("/options/grids/xy/dotted", false);
 
     snapper = new CanvasXYGridSnapper(this, &namedview->snap_manager, 0);
@@ -511,64 +512,6 @@
    if (snapper) delete snapper;
 }
 
-
-/* fixme: Collect all these length parsing methods and think common sane API */
-
-static gboolean
-sp_nv_read_length(gchar const *str, guint base, gdouble *val, SPUnit const **unit)
-{
-    if (!str) {
-        return FALSE;
-    }
-
-    gchar *u;
-    gdouble v = g_ascii_strtod(str, &u);
-    if (!u) {
-        return FALSE;
-    }
-    while (isspace(*u)) {
-        u += 1;
-    }
-
-    if (!*u) {
-        /* No unit specified - keep default */
-        *val = v;
-        return TRUE;
-    }
-
-    if (base & SP_UNIT_DEVICE) {
-        if (u[0] && u[1] && !isalnum(u[2]) && !strncmp(u, "px", 2)) {
-            *unit = &sp_unit_get_by_id(SP_UNIT_PX);
-            *val = v;
-            return TRUE;
-        }
-    }
-
-    if (base & SP_UNIT_ABSOLUTE) {
-        if (!strncmp(u, "pt", 2)) {
-            *unit = &sp_unit_get_by_id(SP_UNIT_PT);
-        } else if (!strncmp(u, "mm", 2)) {
-            *unit = &sp_unit_get_by_id(SP_UNIT_MM);
-        } else if (!strncmp(u, "cm", 2)) {
-            *unit = &sp_unit_get_by_id(SP_UNIT_CM);
-        } else if (!strncmp(u, "m", 1)) {
-            *unit = &sp_unit_get_by_id(SP_UNIT_M);
-        } else if (!strncmp(u, "in", 2)) {
-            *unit = &sp_unit_get_by_id(SP_UNIT_IN);
-        } else if (!strncmp(u, "ft", 2)) {
-            *unit = &sp_unit_get_by_id(SP_UNIT_FT);
-        } else if (!strncmp(u, "pc", 2)) {
-            *unit = &sp_unit_get_by_id(SP_UNIT_PC);
-        } else {
-            return FALSE;
-        }
-        *val = v;
-        return TRUE;
-    }
-
-    return FALSE;
-}
-
 static gboolean sp_nv_read_opacity(gchar const *str, guint32 *color)
 {
     if (!str) {
@@ -645,28 +588,32 @@
 {
     gchar const *value;
     if ( (value = repr->attribute("originx")) ) {
-        sp_nv_read_length(value, SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE, &origin[Geom::X], &gridunit);
-        origin[Geom::X] = sp_units_get_pixels(origin[Geom::X], *(gridunit));
+        Inkscape::Util::Quantity q = unit_table.getQuantity(value);
+        gridunit = q.unit;
+        origin[Geom::X] = unit_table.getQuantity(value).value("px");
     }
 
     if ( (value = repr->attribute("originy")) ) {
-        sp_nv_read_length(value, SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE, &origin[Geom::Y], &gridunit);
-        origin[Geom::Y] = sp_units_get_pixels(origin[Geom::Y], *(gridunit));
+        Inkscape::Util::Quantity q = unit_table.getQuantity(value);
+        gridunit = q.unit;
+        origin[Geom::Y] = unit_table.getQuantity(value).value("px");
     }
 
     if ( (value = repr->attribute("spacingx")) ) {
         double oldVal = spacing[Geom::X];
-        sp_nv_read_length(value, SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE, &spacing[Geom::X], &gridunit);
-        validateScalar( oldVal, &spacing[Geom::X]);
-        spacing[Geom::X] = sp_units_get_pixels(spacing[Geom::X], *(gridunit));
-
+        Inkscape::Util::Quantity q = unit_table.getQuantity(value);
+        gridunit = q.unit;
+        spacing[Geom::X] = q.quantity;
+        validateScalar(oldVal, &spacing[Geom::X]);
+        spacing[Geom::X] = Inkscape::Util::Quantity::convert(spacing[Geom::X], *gridunit, "px");
     }
     if ( (value = repr->attribute("spacingy")) ) {
         double oldVal = spacing[Geom::Y];
-        sp_nv_read_length(value, SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE, &spacing[Geom::Y], &gridunit);
-        validateScalar( oldVal, &spacing[Geom::Y]);
-        spacing[Geom::Y] = sp_units_get_pixels(spacing[Geom::Y], *(gridunit));
-
+        Inkscape::Util::Quantity q = unit_table.getQuantity(value);
+        gridunit = q.unit;
+        spacing[Geom::Y] = q.quantity;
+        validateScalar(oldVal, &spacing[Geom::Y]);
+        spacing[Geom::Y] = Inkscape::Util::Quantity::convert(spacing[Geom::Y], *gridunit, "px");
     }
 
     if ( (value = repr->attribute("color")) ) {
@@ -802,20 +749,20 @@
     attach_all (*table, widget_array, sizeof(widget_array));
 
     // set widget values
-    _rumg->setUnit (gridunit);
+    _rumg->setUnit (gridunit->abbr);
 
     gdouble val;
     val = origin[Geom::X];
-    val = sp_pixels_get_units (val, *(gridunit));
+    val = Inkscape::Util::Quantity::convert(val, "px", *gridunit);
     _rsu_ox->setValue (val);
     val = origin[Geom::Y];
-    val = sp_pixels_get_units (val, *(gridunit));
+    val = Inkscape::Util::Quantity::convert(val, "px", *gridunit);
     _rsu_oy->setValue (val);
     val = spacing[Geom::X];
-    double gridx = sp_pixels_get_units (val, *(gridunit));
+    double gridx = Inkscape::Util::Quantity::convert(val, "px", *gridunit);
     _rsu_sx->setValue (gridx);
     val = spacing[Geom::Y];
-    double gridy = sp_pixels_get_units (val, *(gridunit));
+    double gridy = Inkscape::Util::Quantity::convert(val, "px", *gridunit);
     _rsu_sy->setValue (gridy);
 
     _rcp_gcol->setRgba32 (color);
@@ -851,20 +798,20 @@
         _rcb_enabled.setActive(snapper->getEnabled());
     }
 
-    _rumg.setUnit (gridunit);
+    _rumg.setUnit (gridunit->abbr);
 
     gdouble val;
     val = origin[Geom::X];
-    val = sp_pixels_get_units (val, *(gridunit));
+    val = Inkscape::Quantity::convert(val, "px", *gridunit);
     _rsu_ox.setValue (val);
     val = origin[Geom::Y];
-    val = sp_pixels_get_units (val, *(gridunit));
+    val = Inkscape::Quantity::convert(val, "px", *gridunit);
     _rsu_oy.setValue (val);
     val = spacing[Geom::X];
-    double gridx = sp_pixels_get_units (val, *(gridunit));
+    double gridx = Inkscape::Quantity::convert(val, "px", *gridunit);
     _rsu_sx.setValue (gridx);
     val = spacing[Geom::Y];
-    double gridy = sp_pixels_get_units (val, *(gridunit));
+    double gridy = Inkscape::Quantity::convert(val, "px", *gridunit);
     _rsu_sy.setValue (gridy);
 
     _rcp_gcol.setRgba32 (color);
 
=== modified file 'src/display/canvas-grid.h'
--- src/display/canvas-grid.h	2013-01-17 20:07:10 +0000
+++ src/display/canvas-grid.h	2013-08-06 18:46:25 +0000
@@ -28,6 +28,10 @@
 class Node;
 }
 
+namespace Util {
+class Unit;
+}
+
 enum GridType {
     GRID_RECTANGULAR = 0,
     GRID_AXONOMETRIC = 1
@@ -88,7 +92,7 @@
     guint32 empcolor;     /**< Color for emphasis lines */
     gint empspacing;      /**< Spacing between emphasis lines */
 
-    SPUnit const* gridunit;
+    Inkscape::Util::Unit const* gridunit;
 
     Inkscape::XML::Node * repr;
     SPDocument *doc;
 
=== modified file 'src/document.cpp'
--- src/document.cpp	2013-07-10 00:46:51 +0000
+++ src/document.cpp	2013-08-06 18:46:25 +0000
@@ -49,7 +49,6 @@
 #include "display/drawing-item.h"
 #include "document-private.h"
 #include "document-undo.h"
-#include "helper/units.h"
 #include "id-clash.h"
 #include "inkscape-private.h"
 #include "inkscape-version.h"
@@ -63,12 +62,13 @@
 #include "sp-object-repr.h"
 #include "sp-symbol.h"
 #include "transf_mat_3x4.h"
-#include "unit-constants.h"
+#include "util/units.h"
 #include "xml/repr.h"
 #include "xml/rebase-hrefs.h"
 #include "libcroco/cr-cascade.h"
 
 using Inkscape::DocumentUndo;
+using Inkscape::Util::unit_table;
 
 // Higher number means lower priority.
 #define SP_DOCUMENT_UPDATE_PRIORITY (G_PRIORITY_HIGH_IDLE - 2)
@@ -546,21 +546,21 @@
     return result;
 }
 
-void SPDocument::setWidth(gdouble width, const SPUnit *unit)
+void SPDocument::setWidth(const Inkscape::Util::Quantity &width)
 {
     if (root->width.unit == SVGLength::PERCENT && root->viewBox_set) { // set to viewBox=
-        root->viewBox.setMax(Geom::Point(root->viewBox.left() + sp_units_get_pixels (width, *unit), root->viewBox.bottom()));
+        root->viewBox.setMax(Geom::Point(root->viewBox.left() + width.value("px"), root->viewBox.bottom()));
     } else { // set to width=
         gdouble old_computed = root->width.computed;
-        root->width.computed = sp_units_get_pixels (width, *unit);
+        root->width.computed = width.value("px");
         /* SVG does not support meters as a unit, so we must translate meters to
          * cm when writing */
-        if (!strcmp(unit->abbr, "m")) {
-            root->width.value = 100*width;
+        if (*width.unit == unit_table.getUnit("m")) {
+            root->width.value = width.value("cm");
             root->width.unit = SVGLength::CM;
         } else {
-            root->width.value = width;
-            root->width.unit = (SVGLength::Unit) sp_unit_get_svg_unit(unit);
+            root->width.value = width.quantity;
+            root->width.unit = (SVGLength::Unit) width.unit->svgUnit();
         }
 
         if (root->viewBox_set)
@@ -582,21 +582,21 @@
     return result;
 }
 
-void SPDocument::setHeight(gdouble height, const SPUnit *unit)
+void SPDocument::setHeight(const Inkscape::Util::Quantity &height)
 {
     if (root->height.unit == SVGLength::PERCENT && root->viewBox_set) { // set to viewBox=
-        root->viewBox.setMax(Geom::Point(root->viewBox.right(), root->viewBox.top() + sp_units_get_pixels (height, *unit)));
+        root->viewBox.setMax(Geom::Point(root->viewBox.right(), root->viewBox.top() + height.value("px")));
     } else { // set to height=
         gdouble old_computed = root->height.computed;
-        root->height.computed = sp_units_get_pixels (height, *unit);
+        root->height.computed = height.value("px");
         /* SVG does not support meters as a unit, so we must translate meters to
          * cm when writing */
-        if (!strcmp(unit->abbr, "m")) {
-            root->height.value = 100*height;
+        if (*height.unit == unit_table.getUnit("m")) {
+            root->height.value = height.value("cm");
             root->height.unit = SVGLength::CM;
         } else {
-            root->height.value = height;
-            root->height.unit = (SVGLength::Unit) sp_unit_get_svg_unit(unit);
+            root->height.value = height.quantity;
+            root->height.unit = (SVGLength::Unit) height.unit->svgUnit();
         }
 
         if (root->viewBox_set)
@@ -631,7 +631,7 @@
     double const h = rect.height();
 
     double const old_height = getHeight();
-    SPUnit const &px(sp_unit_get_by_id(SP_UNIT_PX));
+    Inkscape::Util::Unit const px = unit_table.getUnit("px");
     
     /* in px */
     double margin_top = 0.0;
@@ -644,9 +644,10 @@
     if (with_margins && nv) {
         if (nv != NULL) {
             gchar const * const units_abbr = nv->getAttribute("units");
-            SPUnit const *margin_units = NULL;
+            Inkscape::Util::Unit const *margin_units = NULL;
             if (units_abbr != NULL) {
-                margin_units = sp_unit_get_by_abbreviation(units_abbr);
+                Inkscape::Util::Unit mu = unit_table.getUnit(units_abbr);
+                margin_units = &mu;
             }
             if (margin_units == NULL) {
                 margin_units = &px;
@@ -663,8 +664,8 @@
             rect.max() + Geom::Point(margin_right, margin_top));
     
     
-    setWidth(rect_with_margins.width(), &px);
-    setHeight(rect_with_margins.height(), &px);
+    setWidth(Inkscape::Util::Quantity(rect_with_margins.width(), "px"));
+    setHeight(Inkscape::Util::Quantity(rect_with_margins.height(), "px"));
 
     Geom::Translate const tr(
             Geom::Point(0, old_height - rect_with_margins.height())
@@ -964,7 +965,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 * PX_PER_MM, 297 * PX_PER_MM);
+        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->i2vp = Geom::identity();
 }
 
=== modified file 'src/document.h'
--- src/document.h	2013-07-10 00:46:51 +0000
+++ src/document.h	2013-08-06 18:46:25 +0000
@@ -35,7 +35,6 @@
 class  SPObject;
 struct SPGroup;
 struct SPRoot;
-struct SPUnit;
 
 namespace Inkscape {
     struct Application;
@@ -47,6 +46,9 @@
         struct Document;
         class Node;
     }
+    namespace Util {
+        class Quantity;
+    }
 }
 
 class SPDefs;
@@ -229,8 +231,8 @@
     gdouble getHeight() const;
     Geom::Point getDimensions() const;
     Geom::OptRect preferredBounds() const;
-    void setWidth(gdouble width, const SPUnit *unit);
-    void setHeight(gdouble height, const SPUnit *unit);
+    void setWidth(const Inkscape::Util::Quantity &width);
+    void setHeight(const Inkscape::Util::Quantity &height);
     void requestModified();
     gint ensureUpToDate();
     bool addResource(const gchar *key, SPObject *object);
@@ -254,8 +256,6 @@
     void setupViewport(SPItemCtx *ctx);
 };
 
-struct SPUnit;
-
 /*
  * Ideas: How to overcome style invalidation nightmare
  *
 
=== modified file 'src/doxygen-main.cpp'
--- src/doxygen-main.cpp	2013-07-23 16:54:03 +0000
+++ src/doxygen-main.cpp	2013-08-06 18:46:25 +0000
@@ -334,8 +334,6 @@
  *
  * Inkscape::GC
  *
- * [\ref sp-metrics.cpp, \ref sp-metrics.h]
- *
  * [\ref prefs-utils.cpp] [\ref print.cpp]
  *
  * - Inkscape::GZipBuffer [\ref streams-gzip.h]
@@ -350,7 +348,7 @@
  * Inkscape::Whiteboard::UndoStackObserver [\ref undo-stack-observer.cpp, \ref composite-undo-stack-observer.cpp]
  * [\ref document-undo.cpp]
  *
- * {\ref dialogs/} [\ref decimal-round.h] [\ref enums.h] [\ref unit-constants.h]
+ * {\ref dialogs/} [\ref decimal-round.h] [\ref enums.h]
  */
 
 
 
=== modified file 'src/extension/internal/cairo-render-context.cpp'
--- src/extension/internal/cairo-render-context.cpp	2013-08-05 21:07:35 +0000
+++ src/extension/internal/cairo-render-context.cpp	2013-08-06 18:46:25 +0000
@@ -44,12 +44,11 @@
 #include "sp-pattern.h"
 #include "sp-mask.h"
 #include "sp-clippath.h"
+#include "util/units.h"
 #ifdef WIN32
 #include "libnrtype/FontFactory.h" // USE_PANGO_WIN32
 #endif
 
-#include <unit-constants.h>
-
 #include "cairo-render-context.h"
 #include "cairo-renderer.h"
 #include "extension/system.h"
@@ -855,7 +854,7 @@
     _surface = surface;
 
     if (_vector_based_target) {
-        cairo_scale(_cr, PT_PER_PX, PT_PER_PX);
+        cairo_scale(_cr, Inkscape::Util::Quantity::convert(1, "px", "pt"), Inkscape::Util::Quantity::convert(1, "px", "pt"));
     } else if (cairo_surface_get_content(_surface) != CAIRO_CONTENT_ALPHA) {
         // set background color on non-alpha surfaces
         // TODO: bgcolor should be derived from SPDocument
 
=== modified file 'src/extension/internal/cairo-renderer-pdf-out.cpp'
--- src/extension/internal/cairo-renderer-pdf-out.cpp	2013-08-05 21:07:35 +0000
+++ src/extension/internal/cairo-renderer-pdf-out.cpp	2013-08-06 18:46:25 +0000
@@ -39,7 +39,7 @@
 #include <2geom/affine.h>
 #include "document.h"
 
-#include "unit-constants.h"
+#include "util/units.h"
 
 namespace Inkscape {
 namespace Extension {
@@ -197,7 +197,7 @@
 
     float new_bleedmargin_px = 0.;
     try {
-        new_bleedmargin_px = mod->get_param_float("bleed") * PX_PER_MM;
+        new_bleedmargin_px = mod->get_param_float("bleed") * Inkscape::Util::Quantity::convert(1, "mm", "px");
     }
     catch(...) {
         g_warning("Parameter <bleed> might not exist");
 
=== modified file 'src/extension/internal/cairo-renderer.cpp'
--- src/extension/internal/cairo-renderer.cpp	2012-10-28 18:19:43 +0000
+++ src/extension/internal/cairo-renderer.cpp	2013-08-06 18:46:25 +0000
@@ -55,7 +55,7 @@
 #include "sp-mask.h"
 #include "sp-clippath.h"
 
-#include <unit-constants.h>
+#include "util/units.h"
 #include "helper/png-write.h"
 #include "helper/pixbuf-ops.h"
 
@@ -442,7 +442,7 @@
     */
     res = ctx->getBitmapResolution();
     if(res == 0) {
-        res = PX_PER_IN;
+        res = Inkscape::Util::Quantity::convert(1, "in", "px");
     }
     TRACE(("sp_asbitmap_render: resolution: %f\n", res ));
 
@@ -463,8 +463,8 @@
     }
 
     // The width and height of the bitmap in pixels
-    unsigned width =  ceil(bbox->width() * (res / PX_PER_IN));
-    unsigned height = ceil(bbox->height() * (res / PX_PER_IN));
+    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")));
 
     if (width == 0 || height == 0) return;
 
@@ -477,7 +477,7 @@
     double shift_y = bbox->max()[Geom::Y];
 
     // For default 90 dpi, snap bitmap to pixel grid
-    if (res == PX_PER_IN) { 
+    if (res == Inkscape::Util::Quantity::convert(1, "in", "px")) { 
         shift_x = round (shift_x);
         shift_y = -round (-shift_y); // Correct rounding despite coordinate inversion.
                                      // Remove the negations when the inversion is gone.
@@ -629,7 +629,7 @@
 
     if (ctx->_vector_based_target) {
         // convert from px to pt
-        d *= Geom::Scale(PT_PER_PX);
+        d *= Geom::Scale(Inkscape::Util::Quantity::convert(1, "px", "pt"));
     }
 
     ctx->_width = d.width();
@@ -647,11 +647,11 @@
         } else {
             double high = doc->getHeight();
             if (ctx->_vector_based_target)
-                high *= PT_PER_PX;
+                high *= Inkscape::Util::Quantity::convert(1, "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 ? PX_PER_PT : 1.0),
-                                            (d.bottom() - high) * (ctx->_vector_based_target ? PX_PER_PT : 1.0)));
+            Geom::Affine tp(Geom::Translate(-d.left() * (ctx->_vector_based_target ? Inkscape::Util::Quantity::convert(1, "pt", "px") : 1.0),
+                                            (d.bottom() - high) * (ctx->_vector_based_target ? Inkscape::Util::Quantity::convert(1, "pt", "px") : 1.0)));
             ctx->transform(tp);
         }
     }
 
=== modified file 'src/extension/internal/emf-win32-inout.cpp'
--- src/extension/internal/emf-win32-inout.cpp	2013-08-05 21:07:35 +0000
+++ src/extension/internal/emf-win32-inout.cpp	2013-08-06 18:46:25 +0000
@@ -37,9 +37,9 @@
 #include "extension/output.h"
 #include "display/drawing.h"
 #include "display/drawing-item.h"
-#include "unit-constants.h"
 #include "clear-n_.h"
 #include "document.h"
+#include "util/units.h"
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
@@ -60,7 +60,7 @@
 namespace Extension {
 namespace Internal {
 
-static float device_scale = DEVICESCALE;
+static float device_scale = Inkscape::Util::Quantity::convert(1, "px", "pt");
 static float device_x;
 static float device_y;
 static RECTL rc_old;
@@ -781,18 +781,18 @@
 
             d->dc[d->level].PixelsInX = pEmr->rclFrame.right - pEmr->rclFrame.left;
             d->dc[d->level].PixelsInY = pEmr->rclFrame.bottom - pEmr->rclFrame.top;
-            device_x = pEmr->rclFrame.left/100.0*PX_PER_MM;
-            device_y = pEmr->rclFrame.top/100.0*PX_PER_MM;
+            device_x = pEmr->rclFrame.left/100.0*Inkscape::Util::Quantity::convert(1, "mm", "px");
+            device_y = pEmr->rclFrame.top/100.0*Inkscape::Util::Quantity::convert(1, "mm", "px");
 
             d->MMX = d->dc[d->level].PixelsInX / 100.0;
             d->MMY = d->dc[d->level].PixelsInY / 100.0;
 
-            d->dc[d->level].PixelsOutX = d->MMX * PX_PER_MM;
-            d->dc[d->level].PixelsOutY = d->MMY * PX_PER_MM;
+            d->dc[d->level].PixelsOutX = d->MMX * Inkscape::Util::Quantity::convert(1, "mm", "px");
+            d->dc[d->level].PixelsOutY = d->MMY * Inkscape::Util::Quantity::convert(1, "mm", "px");
 
             // calculate ratio of Inkscape dpi/device dpi
             if (pEmr->szlMillimeters.cx && pEmr->szlDevice.cx)
-                device_scale = PX_PER_MM*pEmr->szlMillimeters.cx/pEmr->szlDevice.cx;
+                device_scale = Inkscape::Util::Quantity::convert(1, "mm", "px")*pEmr->szlMillimeters.cx/pEmr->szlDevice.cx;
             
             tmp_outdef <<
                 "  width=\"" << d->MMX << "mm\"\n" <<
 
=== modified file 'src/extension/internal/emf-win32-print.cpp'
--- src/extension/internal/emf-win32-print.cpp	2013-08-05 21:07:35 +0000
+++ src/extension/internal/emf-win32-print.cpp	2013-08-06 18:46:25 +0000
@@ -36,6 +36,7 @@
 #include "helper/geom.h"
 #include "helper/geom-curves.h"
 #include "sp-item.h"
+#include "util/units.h"
 
 #include "style.h"
 #include "inkscape-version.h"
@@ -43,8 +44,6 @@
 
 #include "emf-win32-print.h"
 
-#include "unit-constants.h"
-
 #include "extension/system.h"
 #include "extension/print.h"
 #include "document.h"
@@ -129,7 +128,7 @@
         if (bbox) d = *bbox;
     }
 
-    d *= Geom::Scale(IN_PER_PX);
+    d *= Geom::Scale(Inkscape::Util::Quantity::convert(1, "px", "in"));
 
     float dwInchesX = d.width();
     float dwInchesY = d.height();
@@ -196,7 +195,7 @@
         snprintf(buff, sizeof(buff)-1, "Screen=%dx%dpx, %dx%dmm", PixelsX, PixelsY, MMX, MMY);
         GdiComment(hdc, strlen(buff), (BYTE*) buff);
 
-        snprintf(buff, sizeof(buff)-1, "Drawing=%.1lfx%.1lfpx, %.1lfx%.1lfmm", _width, _height, dwInchesX * MM_PER_IN, dwInchesY * MM_PER_IN);
+        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"));
         GdiComment(hdc, strlen(buff), (BYTE*) buff);
     }
 
@@ -304,7 +303,7 @@
 
         double scale = sqrt( (p[X]*p[X]) + (p[Y]*p[Y]) ) / sqrt(2);
 
-        DWORD linewidth = MAX( 1, (DWORD) (scale * style->stroke_width.computed * IN_PER_PX * dwDPI) );
+        DWORD linewidth = MAX( 1, (DWORD) (scale * style->stroke_width.computed * Inkscape::Util::Quantity::convert(1, "px", "in") * dwDPI) );
 
         if (style->stroke_linecap.computed == 0) {
             linecap = PS_ENDCAP_FLAT;
@@ -341,7 +340,7 @@
                 n_dash = style->stroke_dash.n_dash;
                 dash = new DWORD[n_dash];
                 for (i = 0; i < style->stroke_dash.n_dash; i++) {
-                    dash[i] = (DWORD) (style->stroke_dash.dash[i] * IN_PER_PX * dwDPI);
+                    dash[i] = (DWORD) (style->stroke_dash.dash[i] * Inkscape::Util::Quantity::convert(1, "px", "in") * dwDPI);
                 }
             }
         }
@@ -544,8 +543,8 @@
 
         Geom::Point p0 = pit->initialPoint();
 
-        p0[X] = (p0[X] * IN_PER_PX * dwDPI);
-        p0[Y] = (p0[Y] * IN_PER_PX * dwDPI);
+        p0[X] = (p0[X] * Inkscape::Util::Quantity::convert(1, "px", "in") * dwDPI);
+        p0[Y] = (p0[Y] * Inkscape::Util::Quantity::convert(1, "px", "in") * dwDPI);
         
         LONG const x0 = (LONG) round(p0[X]);
         LONG const y0 = (LONG) round(rc.bottom-p0[Y]);
@@ -564,10 +563,10 @@
                 //Geom::Point p0 = cit->initialPoint();
                 Geom::Point p1 = cit->finalPoint();
 
-                //p0[X] = (p0[X] * IN_PER_PX * dwDPI);
-                p1[X] = (p1[X] * IN_PER_PX * dwDPI);
-                //p0[Y] = (p0[Y] * IN_PER_PX * dwDPI);
-                p1[Y] = (p1[Y] * IN_PER_PX * dwDPI);
+                //p0[X] = (p0[X] * Inkscape::Util::Quantity::convert(1, "px", "in") * dwDPI);
+                p1[X] = (p1[X] * Inkscape::Util::Quantity::convert(1, "px", "in") * dwDPI);
+                //p0[Y] = (p0[Y] * Inkscape::Util::Quantity::convert(1, "px", "in") * dwDPI);
+                p1[Y] = (p1[Y] * Inkscape::Util::Quantity::convert(1, "px", "in") * dwDPI);
                 
                 //LONG const x0 = (LONG) round(p0[X]);
                 //LONG const y0 = (LONG) round(rc.bottom-p0[Y]);
@@ -586,14 +585,14 @@
                 Geom::Point p2 = points[2];
                 Geom::Point p3 = points[3];
 
-                //p0[X] = (p0[X] * IN_PER_PX * dwDPI);
-                p1[X] = (p1[X] * IN_PER_PX * dwDPI);
-                p2[X] = (p2[X] * IN_PER_PX * dwDPI);
-                p3[X] = (p3[X] * IN_PER_PX * dwDPI);
-                //p0[Y] = (p0[Y] * IN_PER_PX * dwDPI);
-                p1[Y] = (p1[Y] * IN_PER_PX * dwDPI);
-                p2[Y] = (p2[Y] * IN_PER_PX * dwDPI);
-                p3[Y] = (p3[Y] * IN_PER_PX * dwDPI);
+                //p0[X] = (p0[X] * Inkscape::Util::Quantity::convert(1, "px", "in") * dwDPI);
+                p1[X] = (p1[X] * Inkscape::Util::Quantity::convert(1, "px", "in") * dwDPI);
+                p2[X] = (p2[X] * Inkscape::Util::Quantity::convert(1, "px", "in") * dwDPI);
+                p3[X] = (p3[X] * Inkscape::Util::Quantity::convert(1, "px", "in") * dwDPI);
+                //p0[Y] = (p0[Y] * Inkscape::Util::Quantity::convert(1, "px", "in") * dwDPI);
+                p1[Y] = (p1[Y] * Inkscape::Util::Quantity::convert(1, "px", "in") * dwDPI);
+                p2[Y] = (p2[Y] * Inkscape::Util::Quantity::convert(1, "px", "in") * dwDPI);
+                p3[Y] = (p3[Y] * Inkscape::Util::Quantity::convert(1, "px", "in") * dwDPI);
                 
                 //LONG const x0 = (LONG) round(p0[X]);
                 //LONG const y0 = (LONG) round(rc.bottom-p0[Y]);
@@ -716,8 +715,8 @@
 
         Geom::Point p0 = pit->initialPoint();
 
-        p0[X] = (p0[X] * IN_PER_PX * dwDPI);
-        p0[Y] = (p0[Y] * IN_PER_PX * dwDPI);
+        p0[X] = (p0[X] * Inkscape::Util::Quantity::convert(1, "px", "in") * dwDPI);
+        p0[Y] = (p0[Y] * Inkscape::Util::Quantity::convert(1, "px", "in") * dwDPI);
         
         LONG const x0 = (LONG) round(p0[X]);
         LONG const y0 = (LONG) round(rc.bottom-p0[Y]);
@@ -734,10 +733,10 @@
                 //Geom::Point p0 = cit->initialPoint();
                 Geom::Point p1 = cit->finalPoint();
 
-                //p0[X] = (p0[X] * IN_PER_PX * dwDPI);
-                p1[X] = (p1[X] * IN_PER_PX * dwDPI);
-                //p0[Y] = (p0[Y] * IN_PER_PX * dwDPI);
-                p1[Y] = (p1[Y] * IN_PER_PX * dwDPI);
+                //p0[X] = (p0[X] * Inkscape::Util::Quantity::convert(1, "px", "in") * dwDPI);
+                p1[X] = (p1[X] * Inkscape::Util::Quantity::convert(1, "px", "in") * dwDPI);
+                //p0[Y] = (p0[Y] * Inkscape::Util::Quantity::convert(1, "px", "in") * dwDPI);
+                p1[Y] = (p1[Y] * Inkscape::Util::Quantity::convert(1, "px", "in") * dwDPI);
                 
                 //LONG const x0 = (LONG) round(p0[X]);
                 //LONG const y0 = (LONG) round(rc.bottom-p0[Y]);
@@ -754,14 +753,14 @@
                 Geom::Point p2 = points[2];
                 Geom::Point p3 = points[3];
 
-                //p0[X] = (p0[X] * IN_PER_PX * dwDPI);
-                p1[X] = (p1[X] * IN_PER_PX * dwDPI);
-                p2[X] = (p2[X] * IN_PER_PX * dwDPI);
-                p3[X] = (p3[X] * IN_PER_PX * dwDPI);
-                //p0[Y] = (p0[Y] * IN_PER_PX * dwDPI);
-                p1[Y] = (p1[Y] * IN_PER_PX * dwDPI);
-                p2[Y] = (p2[Y] * IN_PER_PX * dwDPI);
-                p3[Y] = (p3[Y] * IN_PER_PX * dwDPI);
+                //p0[X] = (p0[X] * Inkscape::Util::Quantity::convert(1, "px", "in") * dwDPI);
+                p1[X] = (p1[X] * Inkscape::Util::Quantity::convert(1, "px", "in") * dwDPI);
+                p2[X] = (p2[X] * Inkscape::Util::Quantity::convert(1, "px", "in") * dwDPI);
+                p3[X] = (p3[X] * Inkscape::Util::Quantity::convert(1, "px", "in") * dwDPI);
+                //p0[Y] = (p0[Y] * Inkscape::Util::Quantity::convert(1, "px", "in") * dwDPI);
+                p1[Y] = (p1[Y] * Inkscape::Util::Quantity::convert(1, "px", "in") * dwDPI);
+                p2[Y] = (p2[Y] * Inkscape::Util::Quantity::convert(1, "px", "in") * dwDPI);
+                p3[Y] = (p3[Y] * Inkscape::Util::Quantity::convert(1, "px", "in") * dwDPI);
                 
                 //LONG const x0 = (LONG) round(p0[X]);
                 //LONG const y0 = (LONG) round(rc.bottom-p0[Y]);
@@ -829,7 +828,7 @@
         LOGFONTW *lf = (LOGFONTW*)g_malloc(sizeof(LOGFONTW));
         g_assert(lf != NULL);
         
-        lf->lfHeight = -style->font_size.computed * IN_PER_PX * dwDPI;
+        lf->lfHeight = -style->font_size.computed * Inkscape::Util::Quantity::convert(1, "px", "in") * dwDPI;
         lf->lfWidth = 0;
         lf->lfEscapement = rot;
         lf->lfOrientation = rot;
@@ -878,8 +877,8 @@
     SetBkMode(hdc, TRANSPARENT);
 
     Geom::Point p2 = p * tf;
-    p2[Geom::X] = (p2[Geom::X] * IN_PER_PX * dwDPI);
-    p2[Geom::Y] = (p2[Geom::Y] * IN_PER_PX * dwDPI);
+    p2[Geom::X] = (p2[Geom::X] * Inkscape::Util::Quantity::convert(1, "px", "in") * dwDPI);
+    p2[Geom::Y] = (p2[Geom::Y] * Inkscape::Util::Quantity::convert(1, "px", "in") * dwDPI);
 
     LONG const xpos = (LONG) round(p2[Geom::X]);
     LONG const ypos = (LONG) round(rc.bottom - p2[Geom::Y]);
 
=== modified file 'src/extension/internal/gdkpixbuf-input.cpp'
--- src/extension/internal/gdkpixbuf-input.cpp	2012-09-20 06:15:42 +0000
+++ src/extension/internal/gdkpixbuf-input.cpp	2013-08-06 18:46:25 +0000
@@ -12,7 +12,7 @@
 #include "selection-chemistry.h"
 #include "sp-image.h"
 #include "document-undo.h"
-#include "unit-constants.h"
+#include "util/units.h"
 #include "image-resolution.h"
 #include <set>
 
@@ -79,7 +79,7 @@
 
         double width = gdk_pixbuf_get_width(pb);
         double height = gdk_pixbuf_get_height(pb);
-        double defaultxdpi = prefs->getDouble("/dialogs/import/defaultxdpi/value", PX_PER_IN);
+        double defaultxdpi = prefs->getDouble("/dialogs/import/defaultxdpi/value", Inkscape::Util::Quantity::convert(1, "in", "px"));
         bool forcexdpi = prefs->getBool("/dialogs/import/forcexdpi");
         ImageResolution *ir = 0;
         double xscale = 1;
 
=== modified file 'src/extension/internal/latex-pstricks.cpp'
--- src/extension/internal/latex-pstricks.cpp	2012-04-18 07:02:24 +0000
+++ src/extension/internal/latex-pstricks.cpp	2013-08-06 18:46:25 +0000
@@ -21,7 +21,7 @@
 #include <2geom/hvlinesegment.h>
 #include <errno.h>
 #include <signal.h>
-#include <unit-constants.h>
+#include "util/units.h"
 #include "helper/geom-curves.h"
 
 #include "extension/print.h"
@@ -117,8 +117,8 @@
     }
 
     // width and height in pt
-    _width = doc->getWidth() * PT_PER_PX;
-    _height = doc->getHeight() * PT_PER_PX;
+    _width = doc->getWidth() * Inkscape::Util::Quantity::convert(1, "px", "pt");
+    _height = doc->getHeight() * Inkscape::Util::Quantity::convert(1, "px", "pt");
 
     if (res >= 0) {
 
 
=== modified file 'src/extension/internal/latex-text-renderer.cpp'
--- src/extension/internal/latex-text-renderer.cpp	2012-10-28 14:10:22 +0000
+++ src/extension/internal/latex-text-renderer.cpp	2013-08-06 18:46:25 +0000
@@ -39,7 +39,7 @@
 #include "sp-rect.h"
 #include "text-editing.h"
 
-#include <unit-constants.h>
+#include "util/units.h"
 
 #include "extension/system.h"
 
@@ -611,7 +611,7 @@
     // scaling of the image when including it in LaTeX
 
     os << "  \\ifx\\svgwidth\\undefined%\n";
-    os << "    \\setlength{\\unitlength}{" << d.width() * PT_PER_PX << "bp}%\n"; // note: 'bp' is the Postscript pt unit in LaTeX, see LP bug #792384
+    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 << "    \\ifx\\svgscale\\undefined%\n";
     os << "      \\relax%\n";
     os << "    \\else%\n";
 
=== modified file 'src/extension/internal/pdfinput/pdf-parser.cpp'
--- src/extension/internal/pdfinput/pdf-parser.cpp	2013-08-05 21:07:35 +0000
+++ src/extension/internal/pdfinput/pdf-parser.cpp	2013-08-06 18:46:25 +0000
@@ -34,7 +34,7 @@
 #include "svg-builder.h"
 #include "Gfx.h"
 #include "pdf-parser.h"
-#include "unit-constants.h"
+#include "util/units.h"
 
 #include "goo/gmem.h"
 #include "goo/GooTimer.h"
@@ -279,14 +279,14 @@
   ignoreUndef = 0;
   operatorHistory = NULL;
   builder = builderA;
-  builder->setDocumentSize(state->getPageWidth()*PX_PER_PT,
-                           state->getPageHeight()*PX_PER_PT);
+  builder->setDocumentSize(state->getPageWidth()*Inkscape::Util::Quantity::convert(1, "pt", "px"),
+                           state->getPageHeight()*Inkscape::Util::Quantity::convert(1, "pt", "px"));
 
   double *ctm = state->getCTM();
   double scaledCTM[6];
   for (int i = 0; i < 6; ++i) {
     baseMatrix[i] = ctm[i];
-    scaledCTM[i] = PX_PER_PT * ctm[i];
+    scaledCTM[i] = Inkscape::Util::Quantity::convert(1, "pt", "px") * ctm[i];
   }
   saveState();
   builder->setTransform((double*)&scaledCTM);
 
=== modified file 'src/extension/internal/pdfinput/svg-builder.cpp'
--- src/extension/internal/pdfinput/svg-builder.cpp	2013-08-05 21:07:35 +0000
+++ src/extension/internal/pdfinput/svg-builder.cpp	2013-08-06 18:46:25 +0000
@@ -33,7 +33,7 @@
 #include "svg/css-ostringstream.h"
 #include "svg/svg-color.h"
 #include "color.h"
-#include "unit-constants.h"
+#include "util/units.h"
 #include "io/stringstream.h"
 #include "io/base64stream.h"
 #include "display/nr-filter-utils.h"
@@ -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 * PT_PER_PX);
+            Geom::Affine flip(1.0, 0.0, 0.0, -1.0, 0.0, _height * Inkscape::Util::Quantity::convert(1, "px", "pt"));
             pat_matrix *= flip;
         }
         gchar *transform_text = sp_svg_transform_write(pat_matrix);
 
=== modified file 'src/flood-context.cpp'
--- src/flood-context.cpp	2013-07-01 20:04:32 +0000
+++ src/flood-context.cpp	2013-08-06 18:46:25 +0000
@@ -54,7 +54,6 @@
 #include "sp-defs.h"
 #include "sp-item.h"
 #include "splivarot.h"
-#include "sp-metrics.h"
 #include "sp-namedview.h"
 #include "sp-object.h"
 #include "sp-path.h"
 
=== modified file 'src/flood-context.h'
--- src/flood-context.h	2013-03-14 23:24:17 +0000
+++ src/flood-context.h	2013-08-06 18:46:25 +0000
@@ -15,8 +15,6 @@
 #include <sigc++/sigc++.h>
 #include <gtk/gtk.h>
 #include "event-context.h"
-#include "helper/unit-menu.h"
-#include "helper/units.h"
 
 #define SP_TYPE_FLOOD_CONTEXT            (sp_flood_context_get_type ())
 #define SP_FLOOD_CONTEXT(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), SP_TYPE_FLOOD_CONTEXT, SPFloodContext))
 
=== modified file 'src/helper/Makefile_insert'
--- src/helper/Makefile_insert	2013-07-01 20:04:32 +0000
+++ src/helper/Makefile_insert	2013-08-06 18:46:25 +0000
@@ -18,12 +18,6 @@
 	helper/png-write.h	\
 	helper/sp-marshal.cpp	\
 	helper/sp-marshal.h	\
-	helper/unit-menu.cpp	\
-	helper/unit-menu.h	\
-	helper/unit-tracker.cpp	\
-	helper/unit-tracker.h	\
-	helper/units.cpp	\
-	helper/units.h	\
 	helper/window.cpp	\
 	helper/window.h		\
 	helper/stock-items.cpp	\
@@ -46,9 +40,3 @@
 	else mv helper/tmp.sp-marshal.cpp helper/sp-marshal.cpp; fi
 
 helper/sp-marshal.cpp helper/sp-marshal.h: helper/sp-marshal.list
-
-# ######################
-# ### CxxTest stuff ####
-# ######################
-CXXTEST_TESTSUITES += \
-	$(srcdir)/helper/units-test.h
 
=== modified file 'src/helper/pixbuf-ops.cpp'
--- src/helper/pixbuf-ops.cpp	2013-03-25 17:42:31 +0000
+++ src/helper/pixbuf-ops.cpp	2013-08-06 18:46:25 +0000
@@ -29,7 +29,7 @@
 #include "sp-root.h"
 #include "sp-use.h"
 #include "sp-defs.h"
-#include "unit-constants.h"
+#include "util/units.h"
 
 #include "helper/pixbuf-ops.h"
 
@@ -121,7 +121,7 @@
     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 / PX_PER_IN),   (ydpi / PX_PER_IN));
+    Geom::Scale scale( (xdpi / Inkscape::Util::Quantity::convert(1, "in", "px")),   (ydpi / Inkscape::Util::Quantity::convert(1, "in", "px")));
     Geom::Affine affine = scale * Geom::Translate(-origin * scale);
 
     /* Create ArenaItems and set transform */
 
=== removed file 'src/helper/unit-menu.cpp'
--- src/helper/unit-menu.cpp	2013-01-26 19:33:04 +0000
+++ src/helper/unit-menu.cpp	1970-01-01 00:00:00 +0000
@@ -1,360 +0,0 @@
-#define __SP_UNIT_MENU_C__
-
-/*
- * Unit selector with autupdate capability
- *
- * Authors:
- *   Lauris Kaplinski <[e-mail]>
- *   bulia byak <[e-mail]>
- *
- * Copyright (C) 2000-2002 Authors
- *
- * Released under GNU GPL, read the file 'COPYING' for more information
- */
-
-#define noUNIT_SELECTOR_VERBOSE
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-#include <gtk/gtk.h>
-#include "helper/sp-marshal.h"
-#include "helper/units.h"
-#include "helper/unit-menu.h"
-#include "widgets/spw-utilities.h"
-
-struct SPUnitSelector {
-    GtkHBox box;
-
-    GtkWidget *combo_box;
-    GtkListStore *store;
-
-
-    guint bases;
-    GSList *units;
-    SPUnit const *unit;
-    gdouble ctmscale;
-    guint plural : 1;
-    guint abbr : 1;
-
-    guint update : 1;
-
-    GSList *adjustments;
-};
-
-enum {COMBO_COL_LABEL=0, COMBO_COL_UNIT};
-
-struct SPUnitSelectorClass {
-    GtkHBoxClass parent_class;
-
-    gboolean (* set_unit)(SPUnitSelector *us, SPUnit const *old, SPUnit const *new_unit);
-};
-
-enum {SET_UNIT, LAST_SIGNAL};
-
-static void sp_unit_selector_finalize(GObject *object);
-
-static guint signals[LAST_SIGNAL] = {0};
-
-G_DEFINE_TYPE(SPUnitSelector, sp_unit_selector, GTK_TYPE_HBOX);
-
-static void
-sp_unit_selector_class_init(SPUnitSelectorClass *klass)
-{
-    GObjectClass *object_class = G_OBJECT_CLASS(klass);
-
-    signals[SET_UNIT] = g_signal_new("set_unit",
-                                     G_TYPE_FROM_CLASS(klass),
-                                     G_SIGNAL_RUN_LAST,
-                                     G_STRUCT_OFFSET(SPUnitSelectorClass, set_unit),
-                                     NULL, NULL,
-                                     sp_marshal_BOOLEAN__POINTER_POINTER,
-                                     G_TYPE_BOOLEAN, 2,
-                                     G_TYPE_POINTER, G_TYPE_POINTER);
-
-    object_class->finalize = sp_unit_selector_finalize;
-}
-
-static void
-sp_unit_selector_init(SPUnitSelector *us)
-{
-    us->ctmscale = 1.0;
-    us->abbr = FALSE;
-    us->plural = TRUE;
-
-    /**
-     * Create a combo_box and store with 2 columns,
-     * a label and a pointer to a SPUnit
-     */
-    us->store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_POINTER);
-    us->combo_box = gtk_combo_box_new_with_model (GTK_TREE_MODEL (us->store));
-
-    GtkCellRenderer *renderer = gtk_cell_renderer_text_new ();
-    g_object_set (renderer, "scale", 0.8, "scale-set", TRUE, NULL);
-    gtk_cell_renderer_set_padding (renderer, 2, 0);
-    gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (us->combo_box), renderer, TRUE);
-    gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (us->combo_box), renderer, "text", COMBO_COL_LABEL, NULL);
-
-    gtk_widget_show (us->combo_box);
-    gtk_box_pack_start (GTK_BOX(us), us->combo_box, TRUE, TRUE, 0);
-}
-
-static void
-sp_unit_selector_finalize(GObject *object)
-{
-    SPUnitSelector *selector = SP_UNIT_SELECTOR(object);
-
-    if (selector->combo_box) {
-        selector->combo_box = NULL;
-    }
-
-    while (selector->adjustments) {
-        g_object_unref(selector->adjustments->data);
-        selector->adjustments = g_slist_remove(selector->adjustments, selector->adjustments->data);
-    }
-
-    if (selector->units) {
-        sp_unit_free_list(selector->units);
-    }
-
-    selector->unit = NULL;
-
-    G_OBJECT_CLASS(sp_unit_selector_parent_class)->finalize(object);
-}
-
-GtkWidget *
-sp_unit_selector_new(guint bases)
-{
-    SPUnitSelector *us = SP_UNIT_SELECTOR(g_object_new(SP_TYPE_UNIT_SELECTOR, NULL));
-
-    sp_unit_selector_set_bases(us, bases);
-
-    return GTK_WIDGET(us);
-}
-
-void
-sp_unit_selector_setsize(GtkWidget *us, guint w, guint h)
-{
-    gtk_widget_set_size_request((SP_UNIT_SELECTOR(us))->combo_box, w, h);
-}
-
-SPUnit const *
-sp_unit_selector_get_unit(SPUnitSelector const *us)
-{
-    g_return_val_if_fail(us != NULL, NULL);
-    g_return_val_if_fail(SP_IS_UNIT_SELECTOR(us), NULL);
-
-    return us->unit;
-}
-
-
-static void
-on_combo_box_changed (GtkComboBox *widget, SPUnitSelector *us)
-{
-    GtkTreeIter  iter;
-    if (!gtk_combo_box_get_active_iter (widget, &iter)) {
-        return;
-    }
-
-    SPUnit const *unit = NULL;
-    gtk_tree_model_get (GTK_TREE_MODEL(us->store), &iter, COMBO_COL_UNIT, &unit, -1);
-
-    g_return_if_fail(unit != NULL);
-
-#ifdef UNIT_SELECTOR_VERBOSE
-    g_print("Old unit %s new unit %s\n", us->unit->name, unit->name);
-#endif
-
-    SPUnit const *old = us->unit;
-    us->unit = unit;
-
-    us->update = TRUE;
-
-    gboolean consumed = FALSE;
-    g_signal_emit(G_OBJECT(us), signals[SET_UNIT], 0, old, unit, &consumed);
-
-    if ( !consumed
-         && ( unit->base == old->base
-              || ( unit->base == SP_UNIT_ABSOLUTE && old->base == SP_UNIT_DEVICE )
-              || ( old->base == SP_UNIT_ABSOLUTE && unit->base == SP_UNIT_DEVICE ) ) ) {
-        // Either the same base, or absolute<->device:
-        /* Recalculate adjustments. */
-        for (GSList *l = us->adjustments; l != NULL; l = g_slist_next(l)) {
-            GtkAdjustment *adj = GTK_ADJUSTMENT(l->data);
-            gdouble val = gtk_adjustment_get_value (adj);
-#ifdef UNIT_SELECTOR_VERBOSE
-            g_print("Old val %g ... ", val);
-#endif
-            val = sp_convert_distance_full(val, *old, *unit);
-#ifdef UNIT_SELECTOR_VERBOSE
-            g_print("new val %g\n", val);
-#endif
-            gtk_adjustment_set_value (adj, val);
-        }
-        /* need to separate the value changing from the notification
-         * or else the unit changes can break the calculations */
-        for (GSList *l = us->adjustments; l != NULL; l = g_slist_next(l)) {
-            gtk_adjustment_value_changed(GTK_ADJUSTMENT(l->data));
-        }
-    } else if (!consumed && unit->base != old->base) {
-        /* when the base changes, signal all the adjustments to get them
-         * to recalculate */
-        for (GSList *l = us->adjustments; l != NULL; l = g_slist_next(l)) {
-            g_signal_emit_by_name(G_OBJECT(l->data), "value_changed");
-        }
-    }
-
-    us->update = FALSE;
-
-}
-
-static void
-spus_rebuild_menu(SPUnitSelector *us)
-{
-
-    gtk_list_store_clear(us->store);
-
-    GtkTreeIter iter;
-
-    gint pos = 0;
-    gint p = 0;
-    for (GSList *l = us->units; l != NULL; l = l->next) {
-        SPUnit const *u = static_cast<SPUnit const*>(l->data);
-
-        // use only abbreviations in the menu
-        //        i = gtk_menu_item_new_with_label((us->abbr) ? (us->plural) ? u->abbr_plural : u->abbr : (us->plural) ? u->plural : u->name);
-        gtk_list_store_append (us->store, &iter);
-        gtk_list_store_set (us->store, &iter, COMBO_COL_LABEL, u->abbr, COMBO_COL_UNIT, (gpointer) u, -1);
-
-        if (u == us->unit) {
-            pos = p;
-        }
-
-        p += 1;
-    }
-
-    gtk_combo_box_set_active(GTK_COMBO_BOX(us->combo_box), pos);
-    g_signal_connect (G_OBJECT (us->combo_box), "changed", G_CALLBACK (on_combo_box_changed), us);
-}
-
-void
-sp_unit_selector_set_bases(SPUnitSelector *us, guint bases)
-{
-    g_return_if_fail(us != NULL);
-    g_return_if_fail(SP_IS_UNIT_SELECTOR(us));
-
-    if (bases == us->bases) return;
-
-    GSList *units = sp_unit_get_list(bases);
-    g_return_if_fail(units != NULL);
-    sp_unit_free_list(us->units);
-    us->units = units;
-    us->unit = static_cast<SPUnit *>(units->data);
-
-    spus_rebuild_menu(us);
-}
-
-void
-sp_unit_selector_add_unit(SPUnitSelector *us, SPUnit const *unit, int position)
-{
-    if (!g_slist_find(us->units, (gpointer) unit)) {
-        us->units = g_slist_insert(us->units, (gpointer) unit, position);
-
-        spus_rebuild_menu(us);
-    }
-}
-
-void
-sp_unit_selector_set_unit(SPUnitSelector *us, SPUnit const *unit)
-{
-    g_return_if_fail(us != NULL);
-    g_return_if_fail(SP_IS_UNIT_SELECTOR(us));
-
-    if (unit == NULL) {
-        return; // silently return, by default a newly created selector uses pt
-    }
-    if (unit == us->unit) {
-        return;
-    }
-
-    gint const pos = g_slist_index(us->units, (gpointer) unit);
-    g_return_if_fail(pos >= 0);
-
-    gtk_combo_box_set_active(GTK_COMBO_BOX(us->combo_box), pos);
-
-    SPUnit const *old = us->unit;
-    us->unit = unit;
-
-    /* Recalculate adjustments */
-    for (GSList *l = us->adjustments; l != NULL; l = l->next) {
-        GtkAdjustment *adj = GTK_ADJUSTMENT(l->data);
-        gdouble const val = sp_convert_distance_full(gtk_adjustment_get_value (adj), *old, *unit);
-        gtk_adjustment_set_value(adj, val);
-    }
-}
-
-void
-sp_unit_selector_add_adjustment(SPUnitSelector *us, GtkAdjustment *adj)
-{
-    g_return_if_fail(us != NULL);
-    g_return_if_fail(SP_IS_UNIT_SELECTOR(us));
-    g_return_if_fail(adj != NULL);
-    g_return_if_fail(GTK_IS_ADJUSTMENT(adj));
-
-    g_return_if_fail(!g_slist_find(us->adjustments, adj));
-
-    g_object_ref(adj);
-    us->adjustments = g_slist_prepend(us->adjustments, adj);
-}
-
-void
-sp_unit_selector_remove_adjustment(SPUnitSelector *us, GtkAdjustment *adj)
-{
-    g_return_if_fail(us != NULL);
-    g_return_if_fail(SP_IS_UNIT_SELECTOR(us));
-    g_return_if_fail(adj != NULL);
-    g_return_if_fail(GTK_IS_ADJUSTMENT(adj));
-
-    g_return_if_fail(g_slist_find(us->adjustments, adj));
-
-    us->adjustments = g_slist_remove(us->adjustments, adj);
-    g_object_unref(adj);
-}
-
-gboolean
-sp_unit_selector_update_test(SPUnitSelector const *selector)
-{
-    g_return_val_if_fail(selector != NULL, FALSE);
-    g_return_val_if_fail(SP_IS_UNIT_SELECTOR(selector), FALSE);
-
-    return selector->update;
-}
-
-double
-sp_unit_selector_get_value_in_pixels(SPUnitSelector const *selector, GtkAdjustment *adj)
-{
-    g_return_val_if_fail(selector != NULL, gtk_adjustment_get_value (adj));
-    g_return_val_if_fail(SP_IS_UNIT_SELECTOR(selector), gtk_adjustment_get_value (adj));
-
-    return sp_units_get_pixels(gtk_adjustment_get_value (adj), *(selector->unit));
-}
-
-void
-sp_unit_selector_set_value_in_pixels(SPUnitSelector *selector, GtkAdjustment *adj, double value)
-{
-    g_return_if_fail(selector != NULL);
-    g_return_if_fail(SP_IS_UNIT_SELECTOR(selector));
-
-    gtk_adjustment_set_value(adj, sp_pixels_get_units(value, *(selector->unit)));
-}
-
-/*
-  Local Variables:
-  mode:c++
-  c-file-style:"stroustrup"
-  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
-  indent-tabs-mode:nil
-  fill-column:99
-  End:
-*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
 
=== removed file 'src/helper/unit-menu.h'
--- src/helper/unit-menu.h	2011-12-08 11:53:54 +0000
+++ src/helper/unit-menu.h	1970-01-01 00:00:00 +0000
@@ -1,60 +0,0 @@
-#ifndef SP_UNIT_MENU_H
-#define SP_UNIT_MENU_H
-
-/*
- * SPUnitMenu
- *
- * Generic (and quite unintelligent) grid item for gnome canvas
- *
- * Copyright (C) Lauris Kaplinski 2000
- *
- */
-
-#include <glib.h>
-#include <gtk/gtk.h>
-
-struct SPUnit;
-struct SPUnitSelector;
-struct SPUnitSelectorClass;
-
-/* Unit selector Widget */
-
-#define SP_TYPE_UNIT_SELECTOR (sp_unit_selector_get_type())
-#define SP_UNIT_SELECTOR(o) (G_TYPE_CHECK_INSTANCE_CAST((o), SP_TYPE_UNIT_SELECTOR, SPUnitSelector))
-#define SP_UNIT_SELECTOR_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), SP_TYPE_UNIT_SELECTOR, SPUnitSelectorClass))
-#define SP_IS_UNIT_SELECTOR(o) (G_TYPE_CHECK_INSTANCE_TYPE((o), SP_TYPE_UNIT_SELECTOR))
-#define SP_IS_UNIT_SELECTOR_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE((k), SP_TYPE_UNIT_SELECTOR))
-
-GType sp_unit_selector_get_type(void);
-
-GtkWidget *sp_unit_selector_new(guint bases);
-void sp_unit_selector_setsize(GtkWidget *us, guint w, guint h);
-
-SPUnit const *sp_unit_selector_get_unit(SPUnitSelector const *selector);
-
-void sp_unit_selector_set_bases(SPUnitSelector *selector, guint bases);
-void sp_unit_selector_add_unit(SPUnitSelector *selector, SPUnit const *unit, int position);
-
-void sp_unit_selector_set_unit(SPUnitSelector *selector, SPUnit const *unit);
-void sp_unit_selector_add_adjustment(SPUnitSelector *selector, GtkAdjustment *adjustment);
-void sp_unit_selector_remove_adjustment(SPUnitSelector *selector, GtkAdjustment *adjustment);
-
-gboolean sp_unit_selector_update_test(SPUnitSelector const *selector);
-
-double sp_unit_selector_get_value_in_pixels(SPUnitSelector const *selector, GtkAdjustment *adj);
-void sp_unit_selector_set_value_in_pixels(SPUnitSelector *selector, GtkAdjustment *adj, double value);
-
-
-
-#endif // SP_UNIT_MENU_H
-
-/*
-  Local Variables:
-  mode:c++
-  c-file-style:"stroustrup"
-  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
-  indent-tabs-mode:nil
-  fill-column:99
-  End:
-*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
 
=== removed file 'src/helper/unit-tracker.cpp'
--- src/helper/unit-tracker.cpp	2011-06-03 10:44:52 +0000
+++ src/helper/unit-tracker.cpp	1970-01-01 00:00:00 +0000
@@ -1,267 +0,0 @@
-/*
- * Inkscape::UnitTracker - Simple mediator to synchronize changes to a set
- *   of possible units
- *
- * Authors:
- *   Jon A. Cruz <[e-mail]>
- *
- * Copyright (C) 2007 Jon A. Cruz
- *
- * Released under GNU GPL, read the file 'COPYING' for more information
- */
-
-#include <gtk/gtk.h>
-
-#include "unit-tracker.h"
-#include "ege-select-one-action.h"
-
-namespace Inkscape {
-
-enum {
-    COLUMN_STRING,
-    COLUMN_SPUNIT,
-    N_COLUMNS
-};
-
-UnitTracker::UnitTracker( guint bases ) :
-    _active(0),
-    _isUpdating(false),
-    _activeUnit(0),
-    _store(0),
-    _unitList(0),
-    _actionList(0),
-    _adjList(0),
-    _priorValues()
-{
-    _store = gtk_list_store_new( N_COLUMNS, G_TYPE_STRING, G_TYPE_POINTER );
-    setBase( bases );
-}
-
-UnitTracker::~UnitTracker()
-{
-    if ( _unitList ) {
-        sp_unit_free_list( _unitList );
-    }
-
-    // Unhook weak references to GtkActions
-    while ( _actionList ) {
-        g_signal_handlers_disconnect_by_func( G_OBJECT(_actionList->data), (gpointer)_unitChangedCB, this );
-        g_object_weak_unref( G_OBJECT(_actionList->data), _actionFinalizedCB, this );
-        _actionList = g_slist_delete_link( _actionList, _actionList );
-    }
-
-    // Unhook wek references to GtkAdjustments
-    while ( _adjList ) {
-        g_object_weak_unref( G_OBJECT(_adjList->data), _adjustmentFinalizedCB, this );
-        _adjList = g_slist_delete_link( _adjList, _adjList );
-    }
-}
-
-void UnitTracker::setBase( guint bases )
-{
-    GtkTreeIter iter;
-    _unitList = sp_unit_get_list( bases );
-    for ( GSList* cur = _unitList; cur; cur = g_slist_next(cur) ) {
-        SPUnit* unit = static_cast<SPUnit*>(cur->data);
-        gtk_list_store_append( _store, &iter );
-        gtk_list_store_set( _store, &iter, COLUMN_STRING, unit->abbr, COLUMN_SPUNIT, unit, -1 );
-    }
-    gint count = gtk_tree_model_iter_n_children( GTK_TREE_MODEL(_store), 0 );
-    if ( (count > 0) && (_active > count) ) {
-        _setActive( count - 1 );
-    } else {
-        _setActive( _active );
-    }
-}
-
-void UnitTracker::addUnit( SPUnitId id, gint index )
-{
-    GtkTreeIter iter;
-    const SPUnit* percentUnit = &sp_unit_get_by_id( id );
-    gtk_list_store_insert( _store, &iter, index );
-    gtk_list_store_set( _store, &iter, COLUMN_STRING, percentUnit->abbr, COLUMN_SPUNIT, percentUnit, -1 );
-}
-
-bool UnitTracker::isUpdating() const
-{
-    return _isUpdating;
-}
-
-SPUnit const* UnitTracker::getActiveUnit() const
-{
-    return _activeUnit;
-}
-
-void UnitTracker::setActiveUnit( SPUnit const *unit )
-{
-    if ( unit ) {
-        GtkTreeIter iter;
-        int index = 0;
-        gboolean found = gtk_tree_model_get_iter_first( GTK_TREE_MODEL(_store), &iter );
-        while ( found ) {
-            SPUnit* storedUnit = 0;
-            gtk_tree_model_get( GTK_TREE_MODEL(_store), &iter, COLUMN_SPUNIT, &storedUnit, -1 );
-            if ( storedUnit && (storedUnit->unit_id == unit->unit_id) ) {
-                _setActive(index);
-                break;
-            }
-
-            found = gtk_tree_model_iter_next( GTK_TREE_MODEL(_store), &iter );
-            index++;
-        }
-    }
-}
-
-void UnitTracker::addAdjustment( GtkAdjustment* adj )
-{
-    if ( !g_slist_find( _adjList, adj ) ) {
-        g_object_weak_ref( G_OBJECT(adj), _adjustmentFinalizedCB, this );
-        _adjList = g_slist_append( _adjList, adj );
-    }
-}
-
-void UnitTracker::setFullVal( GtkAdjustment* adj, gdouble val )
-{
-    _priorValues[adj] = val;
-}
-
-GtkAction* UnitTracker::createAction( gchar const* name, gchar const* label, gchar const* tooltip )
-{
-    EgeSelectOneAction* act1 = ege_select_one_action_new( name, label, tooltip, NULL, GTK_TREE_MODEL(_store) );
-    ege_select_one_action_set_label_column( act1, COLUMN_STRING );
-    if ( _active ) {
-        ege_select_one_action_set_active( act1, _active );
-    }
-
-    ege_select_one_action_set_appearance( act1, "minimal" );
-    g_object_weak_ref( G_OBJECT(act1), _actionFinalizedCB, this );
-    g_signal_connect( G_OBJECT(act1), "changed", G_CALLBACK( _unitChangedCB ), this );
-    _actionList = g_slist_append( _actionList, act1 );
-
-    return GTK_ACTION(act1);
-}
-
-void UnitTracker::_unitChangedCB( GtkAction* action, gpointer data )
-{
-    if ( action && data ) {
-        EgeSelectOneAction* act = EGE_SELECT_ONE_ACTION(action);
-        gint active = ege_select_one_action_get_active( act );
-        UnitTracker* self = reinterpret_cast<UnitTracker*>(data);
-        self->_setActive(active);
-    }
-}
-
-void UnitTracker::_actionFinalizedCB( gpointer data, GObject *where_the_object_was )
-{
-    if ( data && where_the_object_was ) {
-        UnitTracker* self = reinterpret_cast<UnitTracker*>(data);
-        self->_actionFinalized( where_the_object_was );
-    }
-}
-
-void UnitTracker::_adjustmentFinalizedCB( gpointer data, GObject *where_the_object_was )
-{
-    if ( data && where_the_object_was ) {
-        UnitTracker* self = reinterpret_cast<UnitTracker*>(data);
-        self->_adjustmentFinalized( where_the_object_was );
-    }
-}
-
-void UnitTracker::_actionFinalized( GObject *where_the_object_was )
-{
-    GSList* target = g_slist_find( _actionList, where_the_object_was );
-    if ( target ) {
-        _actionList = g_slist_remove( _actionList, where_the_object_was );
-    } else {
-        g_warning("Received a finalization callback for unknown object %p", where_the_object_was );
-    }
-}
-
-void UnitTracker::_adjustmentFinalized( GObject *where_the_object_was )
-{
-    GSList* target = g_slist_find( _adjList, where_the_object_was );
-    if ( target ) {
-        _adjList = g_slist_remove( _adjList, where_the_object_was );
-    } else {
-        g_warning("Received a finalization callback for unknown object %p", where_the_object_was );
-    }
-}
-
-void UnitTracker::_setActive( gint active )
-{
-    if ( active != _active || (_activeUnit == 0) ) {
-        gint oldActive = _active;
-
-        GtkTreeIter iter;
-        gboolean found = gtk_tree_model_iter_nth_child( GTK_TREE_MODEL(_store), &iter, NULL, oldActive );
-        if ( found ) {
-            SPUnit* unit = 0;
-            gtk_tree_model_get( GTK_TREE_MODEL(_store), &iter, COLUMN_SPUNIT, &unit, -1 );
-
-            found = gtk_tree_model_iter_nth_child( GTK_TREE_MODEL(_store), &iter, NULL, active );
-            if ( found ) {
-                SPUnit* newUnit = 0;
-                gtk_tree_model_get( GTK_TREE_MODEL(_store), &iter, COLUMN_SPUNIT, &newUnit, -1 );
-                _activeUnit = newUnit;
-
-                if ( _adjList ) {
-                    _fixupAdjustments( unit, newUnit );
-                }
-
-            } else {
-                g_warning("Did not find new unit");
-            }
-        } else {
-            g_warning("Did not find old unit");
-        }
-
-        _active = active;
-
-        for ( GSList* cur = _actionList; cur; cur = g_slist_next(cur) ) {
-            if ( IS_EGE_SELECT_ONE_ACTION( cur->data ) ) {
-                EgeSelectOneAction* act = EGE_SELECT_ONE_ACTION( cur->data );
-                ege_select_one_action_set_active( act, active );
-            }
-        }
-    }
-}
-
-void UnitTracker::_fixupAdjustments( SPUnit const* oldUnit, SPUnit const *newUnit )
-{
-    _isUpdating = true;
-    for ( GSList* cur = _adjList; cur; cur = g_slist_next(cur) ) {
-        GtkAdjustment* adj = GTK_ADJUSTMENT(cur->data);
-        gdouble oldVal = gtk_adjustment_get_value(adj);
-        gdouble val = oldVal;
-
-        if ((oldUnit->base == SP_UNIT_ABSOLUTE || oldUnit->base == SP_UNIT_DEVICE)
-            && (newUnit->base == SP_UNIT_DIMENSIONLESS))
-        {
-            val = 1.0 / newUnit->unittobase;
-            _priorValues[adj] = sp_units_get_pixels( oldVal, *oldUnit );
-        } else if ((oldUnit->base == SP_UNIT_DIMENSIONLESS)
-                   && (newUnit->base == SP_UNIT_ABSOLUTE || newUnit->base == SP_UNIT_DEVICE)) {
-            if ( _priorValues.find(adj) != _priorValues.end() ) {
-                val = sp_pixels_get_units( _priorValues[adj], *newUnit );
-            }
-        } else {
-            val = sp_convert_distance_full( oldVal, *oldUnit, *newUnit );
-        }
-
-        gtk_adjustment_set_value( adj, val );
-    }
-    _isUpdating = false;
-}
-
-}
-
-/*
-  Local Variables:
-  mode:c++
-  c-file-style:"stroustrup"
-  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
-  indent-tabs-mode:nil
-  fill-column:99
-  End:
-*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
 
=== removed file 'src/helper/unit-tracker.h'
--- src/helper/unit-tracker.h	2011-06-03 10:44:52 +0000
+++ src/helper/unit-tracker.h	1970-01-01 00:00:00 +0000
@@ -1,75 +0,0 @@
-/*
- * Inkscape::UnitTracker - Simple mediator to synchronize changes to a set
- *   of possible units
- *
- * Authors:
- *   Jon A. Cruz <[e-mail]>
- *
- * Copyright (C) 2007 Jon A. Cruz
- *
- * Released under GNU GPL, read the file 'COPYING' for more information
- */
-
-#ifndef SEEN_INKSCAPE_UNIT_TRACKER_H
-#define SEEN_INKSCAPE_UNIT_TRACKER_H
-
-#include <map>
-
-#include <gtk/gtk.h>
-
-#include "helper/units.h"
-
-namespace Inkscape {
-
-class UnitTracker
-{
-public:
-    UnitTracker( guint bases = (SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE) );
-    virtual ~UnitTracker();
-
-    void setBase( guint bases ); // SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE
-    void addUnit( SPUnitId id, gint index );
-
-    bool isUpdating() const;
-
-    void setActiveUnit( SPUnit const *unit );
-    SPUnit const* getActiveUnit() const;
-
-    void addAdjustment( GtkAdjustment* adj );
-    void setFullVal( GtkAdjustment* adj, gdouble val );
-
-    GtkAction* createAction( gchar const* name, gchar const* label, gchar const* tooltip );
-
-private:
-    static void _unitChangedCB( GtkAction* action, gpointer data );
-    static void _actionFinalizedCB( gpointer data, GObject *where_the_object_was );
-    static void _adjustmentFinalizedCB( gpointer data, GObject *where_the_object_was );
-    void _setActive( gint index );
-    void _fixupAdjustments( SPUnit const* oldUnit, SPUnit const *newUnit );
-    void _actionFinalized( GObject *where_the_object_was );
-    void _adjustmentFinalized( GObject *where_the_object_was );
-
-    gint _active;
-    bool _isUpdating;
-    SPUnit* _activeUnit;
-    GtkListStore* _store;
-    GSList* _unitList;
-    GSList* _actionList;
-    GSList* _adjList;
-    std::map <GtkAdjustment*, gdouble> _priorValues;
-};
-
-}
-
-#endif // SEEN_INKSCAPE_UNIT_TRACKER_H
-
-/*
-  Local Variables:
-  mode:c++
-  c-file-style:"stroustrup"
-  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
-  indent-tabs-mode:nil
-  fill-column:99
-  End:
-*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
 
=== removed file 'src/helper/units-test.h'
--- src/helper/units-test.h	2010-11-17 02:12:56 +0000
+++ src/helper/units-test.h	1970-01-01 00:00:00 +0000
@@ -1,90 +0,0 @@
-#include <cxxtest/TestSuite.h>
-
-#include <helper/units.h>
-#include <glibmm/i18n.h>
-#include <math.h>
-
-class UnitsTest : public CxxTest::TestSuite {
-public:
-
-    UnitsTest()
-    {
-    }
-    virtual ~UnitsTest() {}
-
-// createSuite and destroySuite get us per-suite setup and teardown
-// without us having to worry about static initialization order, etc.
-    static UnitsTest *createSuite() { return new UnitsTest(); }
-    static void destroySuite( UnitsTest *suite ) { delete suite; }
-
-    void testConversions()
-    {
-        struct Case { double x; char const *abbr; double pts; } const tests[] = {
-            { 1.0, "pt", 1.0 },
-            { 5.0, "pt", 5.0 },
-            { 1.0, "in", 72.0 },
-            { 2.0, "in", 144.0 },
-            { 254., "mm", 720.0 },
-            { 254., "cm", 7200. },
-            { 254., "m", 720000. },
-            { 1.5, "mm", (15 * 72. / 254) }
-        };
-        for (unsigned i = 0; i < G_N_ELEMENTS(tests); ++i) {
-            Case const &c = tests[i];
-            SPUnit const &unit = *sp_unit_get_by_abbreviation(N_(c.abbr));
-
-            double const calc_pts = sp_units_get_points(c.x, unit);
-            TS_ASSERT(approx_equal(calc_pts, c.pts));
-
-            double const calc_x = sp_points_get_units(c.pts, unit);
-            TS_ASSERT(approx_equal(calc_x, c.x));
-
-            double tmp = c.x;
-            bool const converted_to_pts = sp_convert_distance(&tmp, &unit, SP_PS_UNIT);
-            TS_ASSERT(converted_to_pts);
-            TS_ASSERT(approx_equal(tmp, c.pts));
-
-            tmp = c.pts;
-            bool const converted_from_pts = sp_convert_distance(&tmp, SP_PS_UNIT, &unit);
-            TS_ASSERT(converted_from_pts);
-            TS_ASSERT(approx_equal(tmp, c.x));
-        }
-    }
-
-    void testUnitTable()
-    {
-        TS_ASSERT(sp_units_table_sane());
-    }
-
-private:
-    /* N.B. Wrongly returns false if both near 0.  (Not a problem for current users.) */
-    bool approx_equal(double const x, double const y)
-    {
-        return fabs(x / y - 1) < 1e-15;
-    }
-    
-    double sp_units_get_points(double const x, SPUnit const &unit)
-    {
-        SPUnit const &pt_unit = sp_unit_get_by_id(SP_UNIT_PT);
-        double const px = sp_units_get_pixels(x, unit);
-        return sp_pixels_get_units(px, pt_unit);
-    }
-
-    double sp_points_get_units(double const pts, SPUnit const &unit)
-    {
-        SPUnit const &pt_unit = sp_unit_get_by_id(SP_UNIT_PT);
-        double const px = sp_units_get_pixels(pts, pt_unit);
-        return sp_pixels_get_units(px, unit);
-    }
-};
-
-/*
-  Local Variables:
-  mode:c++
-  c-file-style:"stroustrup"
-  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
-  indent-tabs-mode:nil
-  fill-column:99
-  End:
-*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
 
=== removed file 'src/helper/units.cpp'
--- src/helper/units.cpp	2012-10-27 18:15:53 +0000
+++ src/helper/units.cpp	1970-01-01 00:00:00 +0000
@@ -1,261 +0,0 @@
-#define __SP_PAPER_C__
-
-/*
- * SPUnit
- *
- * Ported from libgnomeprint
- *
- * Authors:
- *   Dirk Luetjens <[e-mail]>
- *   Yves Arrouye <[e-mail]>
- *   Lauris Kaplinski <[e-mail]>
- *   bulia byak <[e-mail]>
- *
- * Copyright 1999-2001 Ximian, Inc. and authors
- *
- */
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include "helper/units.h"
-#include <glib.h> // g_assert()
-#include <glibmm/i18n.h>
-#include "unit-constants.h"
-#include "svg/svg-length.h"
-
-/* todo: use some fancy unit program */
-
-/* The order determines the order of the list returned by sp_unit_get_list.
- * (It can also affect string lookups if there are any duplicates in the
- * current locale... hopefully none.)  If you re-order this list, then you must
- * also re-order the SPUnitId enum values accordingly.  Run `make check' (which
- * calls sp_unit_table_sane) to ensure that the two are in sync.
- */
-SPUnit const sp_units[] = {
-    {SP_UNIT_SCALE, SP_UNIT_DIMENSIONLESS, 1.0, SP_NONE, SVGLength::NONE, N_("Unit"), "", N_("Units"), ""},
-    {SP_UNIT_PT, SP_UNIT_ABSOLUTE, PX_PER_PT, SP_PT, SVGLength::PT, N_("Point"), N_("pt"), N_("Points"), N_("Pt")},
-    {SP_UNIT_PC, SP_UNIT_ABSOLUTE, PX_PER_PC, SP_PC, SVGLength::PC, N_("Pica"), N_("pc"), N_("Picas"), N_("Pc")},
-    {SP_UNIT_PX, SP_UNIT_DEVICE, PX_PER_PX, SP_PX, SVGLength::PX, N_("Pixel"), N_("px"), N_("Pixels"), N_("Px")}, 
-    /* You can add new elements from this point forward */
-    {SP_UNIT_PERCENT, SP_UNIT_DIMENSIONLESS, 0.01, SP_NONE, SVGLength::PERCENT, N_("Percent"), N_("%"), N_("Percents"), N_("%")},
-    {SP_UNIT_MM, SP_UNIT_ABSOLUTE, PX_PER_MM, SP_MM, SVGLength::MM, N_("Millimeter"), N_("mm"), N_("Millimeters"), N_("mm")},
-    {SP_UNIT_CM, SP_UNIT_ABSOLUTE, PX_PER_CM, SP_CM, SVGLength::CM, N_("Centimeter"), N_("cm"), N_("Centimeters"), N_("cm")},
-    {SP_UNIT_M, SP_UNIT_ABSOLUTE, PX_PER_M, SP_M, SVGLength::NONE, N_("Meter"), N_("m"), N_("Meters"), N_("m")}, // no svg_unit
-    {SP_UNIT_IN, SP_UNIT_ABSOLUTE, PX_PER_IN, SP_IN, SVGLength::INCH, N_("Inch"), N_("in"), N_("Inches"), N_("in")},
-    {SP_UNIT_FT, SP_UNIT_ABSOLUTE, PX_PER_FT, SP_FT, SVGLength::FOOT, N_("Foot"), N_("ft"), N_("Feet"), N_("ft")},
-    /* Volatiles do not have default, so there are none here */
-    // TRANSLATORS: for info, see http://www.w3.org/TR/REC-CSS2/syndata.html#length-units
-    {SP_UNIT_EM, SP_UNIT_VOLATILE, 1.0, SP_NONE, SVGLength::EM, N_("Em square"), N_("em"), N_("Em squares"), N_("em")},
-    // TRANSLATORS: for info, see http://www.w3.org/TR/REC-CSS2/syndata.html#length-units
-    {SP_UNIT_EX, SP_UNIT_VOLATILE, 1.0, SP_NONE, SVGLength::EX, N_("Ex square"), N_("ex"), N_("Ex squares"), N_("ex")},
-};
-
-#define sp_num_units G_N_ELEMENTS(sp_units)
-
-SPUnit const *
-sp_unit_get_by_abbreviation(gchar const *abbreviation)
-{
-    g_return_val_if_fail(abbreviation != NULL, NULL);
-
-    for (unsigned i = 0 ; i < sp_num_units ; i++) {
-        if (!g_ascii_strcasecmp(abbreviation, sp_units[i].abbr)) return &sp_units[i];
-        if (!g_ascii_strcasecmp(abbreviation, sp_units[i].abbr_plural)) return &sp_units[i];
-    }
-
-    return NULL;
-}
-
-gchar const *
-sp_unit_get_abbreviation(SPUnit const *unit)
-{
-    g_return_val_if_fail(unit != NULL, NULL);
-
-    return unit->abbr;
-}
-
-gchar const *
-sp_unit_get_plural (SPUnit const *unit)
-{
-    g_return_val_if_fail(unit != NULL, NULL);
-
-    return unit->plural;
-}
-
-SPMetric sp_unit_get_metric(SPUnit const *unit)
-{
-    g_return_val_if_fail(unit != NULL, SP_NONE);
-
-    return unit->metric;
-}
-
-guint sp_unit_get_svg_unit(SPUnit const *unit)
-{
-    g_return_val_if_fail(unit != NULL, SP_NONE);
-
-    return unit->svg_unit;
-}
-
-GSList *
-sp_unit_get_list(guint bases)
-{
-    g_return_val_if_fail((bases & ~SP_UNITS_ALL) == 0, NULL);
-
-    GSList *units = NULL;
-    for (unsigned i = sp_num_units ; i--; ) {
-        if (bases & sp_units[i].base) {
-            units = g_slist_prepend(units, (gpointer) &sp_units[i]);
-        }
-    }
-
-    return units;
-}
-
-void
-sp_unit_free_list(GSList *units)
-{
-    g_slist_free(units);
-}
-
-/* These are pure utility */
-/* Return TRUE if conversion is possible */
-gboolean
-sp_convert_distance(gdouble *distance, SPUnit const *from, SPUnit const *to)
-{
-    g_return_val_if_fail(distance != NULL, FALSE);
-    g_return_val_if_fail(from != NULL, FALSE);
-    g_return_val_if_fail(to != NULL, FALSE);
-
-    if (from == to) return TRUE;
-    if ((from->base == SP_UNIT_DIMENSIONLESS) || (to->base == SP_UNIT_DIMENSIONLESS)) {
-        *distance = *distance * from->unittobase / to->unittobase;
-        return TRUE;
-    }
-    if ((from->base == SP_UNIT_VOLATILE) || (to->base == SP_UNIT_VOLATILE)) return FALSE;
-
-    if ((from->base == to->base)
-        || ((from->base == SP_UNIT_DEVICE) && (to->base == SP_UNIT_ABSOLUTE))
-        || ((from->base == SP_UNIT_ABSOLUTE) && (to->base == SP_UNIT_DEVICE)))
-    {
-        *distance = *distance * from->unittobase / to->unittobase;
-        return TRUE;
-    }
-
-    return FALSE;
-}
-
-/** @param devicetransform for device units. */
-/* TODO: Remove the ctmscale parameter given that we no longer have SP_UNIT_USERSPACE. */
-gdouble
-sp_convert_distance_full(gdouble const from_dist, SPUnit const &from, SPUnit const &to)
-{
-    if (&from == &to) {
-        return from_dist;
-    }
-    if (from.base == to.base) {
-        gdouble ret = from_dist;
-        bool const succ = sp_convert_distance(&ret, &from, &to);
-        g_assert(succ);
-        return ret;
-    }
-    if ((from.base == SP_UNIT_DIMENSIONLESS)
-        || (to.base == SP_UNIT_DIMENSIONLESS))
-    {
-        return from_dist * from.unittobase / to.unittobase;
-    }
-    g_return_val_if_fail(((from.base != SP_UNIT_VOLATILE)
-                          && (to.base != SP_UNIT_VOLATILE)),
-                         from_dist);
-
-    gdouble absolute;
-    switch (from.base) {
-        case SP_UNIT_ABSOLUTE:
-        case SP_UNIT_DEVICE:
-            absolute = from_dist * from.unittobase;
-            break;
-        default:
-            g_warning("file %s: line %d: Illegal unit (base 0x%x)", __FILE__, __LINE__, from.base);
-            return from_dist;
-    }
-
-    gdouble ret;
-    switch (to.base) {
-        default:
-            g_warning("file %s: line %d: Illegal unit (base 0x%x)", __FILE__, __LINE__, to.base);
-            /* FALL-THROUGH */
-        case SP_UNIT_ABSOLUTE:
-        case SP_UNIT_DEVICE:
-            ret = absolute / to.unittobase;
-            break;
-    }
-
-    return ret;
-}
-
-/* Some more convenience */
-
-gdouble
-sp_units_get_pixels(gdouble const units, SPUnit const &unit)
-{
-    if (unit.base == SP_UNIT_ABSOLUTE || unit.base == SP_UNIT_DEVICE) {
-        return units * unit.unittobase;
-    } else {
-        g_warning("Different unit bases: No exact unit conversion available");
-        return units * unit.unittobase;
-    }
-}
-
-gdouble
-sp_pixels_get_units(gdouble const pixels, SPUnit const &unit)
-{
-    if (unit.base == SP_UNIT_ABSOLUTE || unit.base == SP_UNIT_DEVICE) {
-        return pixels / unit.unittobase;
-    } else {
-        g_warning("Different unit bases: No exact unit conversion available");
-        return pixels / unit.unittobase;
-    }
-}
-
-bool
-sp_units_table_sane()
-{
-    for (unsigned i = 0; i < G_N_ELEMENTS(sp_units); ++i) {
-        if (unsigned(sp_units[i].unit_id) != i) {
-            return false;
-        }
-    }
-    return true;
-}
-
-/** Converts angle (in deg) to compass display */
-double 
-angle_to_compass(double angle)
-{
-    double ret = 90 - angle;
-    if (ret < 0)
-        ret = 360 + ret;
-    return ret;
-}
-
-/** Converts angle (in deg) to compass display */
-double 
-angle_from_compass(double angle)
-{
-    double ret = 90 - angle;
-    if (ret > 180)
-        ret = ret - 180;
-    return ret;
-}
-
-
-/*
-  Local Variables:
-  mode:c++
-  c-file-style:"stroustrup"
-  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
-  indent-tabs-mode:nil
-  fill-column:99
-  End:
-*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
 
=== removed file 'src/helper/units.h'
--- src/helper/units.h	2011-12-08 11:53:54 +0000
+++ src/helper/units.h	1970-01-01 00:00:00 +0000
@@ -1,146 +0,0 @@
-#ifndef __SP_UNIT_H__
-#define __SP_UNIT_H__
-
-/*
- * SPUnit
- *
- * Ported from libgnomeprint
- *
- * Authors:
- *   Dirk Luetjens <[e-mail]>
- *   Yves Arrouye <[e-mail]>
- *   Lauris Kaplinski <[e-mail]>
- *
- * Copyright 1999-2001 Ximian, Inc. and authors
- *
- */
-
-#include <glib.h>
-#include "sp-metric.h"
-
-
-/*
- * Units and conversion methods used by libgnomeprint.
- *
- * You need those for certain config keys (like paper size), if you are
- * interested in using these (look at gnome-print-config.h for discussion,
- * why you may NOT be interested in paper size).
- *
- * Unit bases define set of mutually unrelated measuring systems (numbers,
- * paper, screen and dimesionless user coordinates). Still, you can convert
- * between those, specifying scaling factors explicitly.
- *
- * Paper (i.e. output) coordinates are taken as absolute real world units.
- * It has some justification, because screen unit (pixel) size changes,
- * if you change screen resolution, while you cannot change output on paper
- * as easily (unless you have thermally contracting paper, of course).
- *
- */
-
-struct SPUnit;
-struct SPDistance;
-
-/*
- * The base linear ("absolute") unit is 1/72th of an inch, i.e. the base unit of postscript.
- */
-
-/*
- * Unit bases
- */
-enum SPUnitBase {
-	SP_UNIT_DIMENSIONLESS = (1 << 0), /* For percentages and like */
-	SP_UNIT_ABSOLUTE = (1 << 1), /* Real world distances - i.e. mm, cm... */
-	SP_UNIT_DEVICE = (1 << 2), /* Pixels in the SVG/CSS sense. */
-	SP_UNIT_VOLATILE = (1 << 3) /* em and ex */
-};
-
-/*
- * Units: indexes into sp_units.
- */
-enum SPUnitId {
-	SP_UNIT_SCALE,	// 1.0 == 100%
-	SP_UNIT_PT,	// Postscript points: exactly 72 per inch
-	SP_UNIT_PC,	// Pica; there are 12 points per pica
-	SP_UNIT_PX,	// "Pixels" in the CSS sense; though Inkscape assumes a constant 90 per inch.
-	SP_UNIT_PERCENT,  /* Note: In Inkscape this often means "relative to current value" (for
-			     users to edit a value), rather than the SVG/CSS use of percentages. */
-	SP_UNIT_MM,	// millimetres
-	SP_UNIT_CM,	// centimetres
-	SP_UNIT_M,	// metres
-	SP_UNIT_IN,	// inches
-	SP_UNIT_FT,	// foot
-	SP_UNIT_EM,	// font-size of relevant font
-	SP_UNIT_EX,	// x-height of relevant font
-	sp_max_unit_id = SP_UNIT_EX	// For bounds-checking in sp_unit_get_by_id.
-};
-
-/*
- * Notice, that for correct menus etc. you have to use
- * ngettext method family yourself. For that reason we
- * do not provide translations in unit names.
- * I also do not know, whether to allow user-created units,
- * because this would certainly confuse textdomain.
- */
-
-struct SPUnit {
-	SPUnitId unit_id; /* used as sanity check */
-	SPUnitBase base;
-	gdouble unittobase; /* how many base units in this unit */
-	SPMetric metric; // the corresponding SPMetric from sp-metrics.h
-	guint svg_unit; // the corresponding SVGLengthUnit
-
-	/* When using, you must call "gettext" on them so they're translated */
-	gchar const *name;
-	gchar const *abbr;
-	gchar const *plural;
-	gchar const *abbr_plural;
-};
-
-const SPUnit *sp_unit_get_by_abbreviation (const gchar *abbreviation);
-/* When using, you must call "gettext" on them so they're translated */
-const gchar *sp_unit_get_abbreviation (const SPUnit *unit);
-gchar const *sp_unit_get_plural (SPUnit const *unit);
-
-SPMetric sp_unit_get_metric(SPUnit const *unit);
-guint sp_unit_get_svg_unit(SPUnit const *unit);
-
-extern SPUnit const sp_units[];
-
-inline SPUnit const &
-sp_unit_get_by_id(SPUnitId const id)
-{
-	/* inline because the compiler should optimize away the g_return_val_if_fail test in the
-	   usual case that the argument value is known at compile-time, leaving just
-	   "return sp_units[constant]". */
-	unsigned const ix = unsigned(id);
-	g_return_val_if_fail(ix <= sp_max_unit_id, sp_units[SP_UNIT_PX]);
-	return sp_units[ix];
-}
-
-#define SP_PS_UNIT (&sp_unit_get_by_id(SP_UNIT_PT))
-
-
-/** Used solely by units-test.cpp. */
-bool sp_units_table_sane();
-
-#define SP_UNITS_ALL (SP_UNIT_DIMENSIONLESS | SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE | SP_UNIT_VOLATILE)
-
-GSList *sp_unit_get_list (guint bases);
-void sp_unit_free_list (GSList *units);
-
-/* These are pure utility */
-/* Return TRUE if conversion is possible, FALSE if unit bases differ */
-gboolean sp_convert_distance (gdouble *distance, const SPUnit *from, const SPUnit *to);
-
-/* If either one is NULL, transconverting to/from that base fails */
-/* Generic conversion between volatile units would be useless anyways */
-gdouble sp_convert_distance_full(gdouble const from_dist, SPUnit const &from, SPUnit const &to);
-
-/* Some more convenience */
-gdouble sp_units_get_pixels(gdouble const units, SPUnit const &unit);
-gdouble sp_pixels_get_units(gdouble const pixels, SPUnit const &unit);
-
-double angle_to_compass(double angle);
-double angle_from_compass(double angle);
-
-#endif 
 
=== modified file 'src/live_effects/lpe-path_length.cpp'
--- src/live_effects/lpe-path_length.cpp	2012-10-21 18:04:54 +0000
+++ src/live_effects/lpe-path_length.cpp	2013-08-06 18:46:25 +0000
@@ -14,7 +14,7 @@
 #include <glibmm/i18n.h>
 
 #include "live_effects/lpe-path_length.h"
-#include "sp-metrics.h"
+#include "util/units.h"
 
 #include "2geom/sbasis-geometric.h"
 
@@ -52,11 +52,11 @@
 
     /* convert the measured length to the correct unit ... */
     double lengthval = Geom::length(pwd2_in) * scale;
-    gboolean success = sp_convert_distance(&lengthval, &sp_unit_get_by_id(SP_UNIT_PX), unit);
+    lengthval = Inkscape::Util::Quantity::convert(lengthval, "px", unit.get_abbreviation());
 
     /* ... set it as the canvas text ... */
     gchar *arc_length = g_strdup_printf("%.2f %s", lengthval,
-                                        display_unit ? (success ? unit.get_abbreviation() : "px") : "");
+                                        display_unit ? unit.get_abbreviation() : "");
     info_text.param_setValue(arc_length);
     g_free(arc_length);
 
 
=== modified file 'src/live_effects/lpe-ruler.cpp'
--- src/live_effects/lpe-ruler.cpp	2013-03-13 17:30:15 +0000
+++ src/live_effects/lpe-ruler.cpp	2013-08-06 18:46:25 +0000
@@ -81,9 +81,9 @@
     using namespace Geom;
 
     double real_mark_length = mark_length;
-    sp_convert_distance(&real_mark_length, unit, &sp_unit_get_by_id(SP_UNIT_PX));
+    real_mark_length = Inkscape::Util::Quantity::convert(real_mark_length, unit.get_abbreviation(), "px");
     double real_minor_mark_length = minor_mark_length;
-    sp_convert_distance(&real_minor_mark_length, unit, &sp_unit_get_by_id(SP_UNIT_PX));
+    real_minor_mark_length = Inkscape::Util::Quantity::convert(real_minor_mark_length, unit.get_abbreviation(), "px");
 
     n_major = real_mark_length * n;
     n_minor = real_minor_mark_length * n;
@@ -133,10 +133,10 @@
     std::vector<double> s_cuts;
 
     double real_mark_distance = mark_distance;
-    sp_convert_distance(&real_mark_distance, unit, &sp_unit_get_by_id(SP_UNIT_PX));
+    real_mark_distance = Inkscape::Util::Quantity::convert(real_mark_distance, unit.get_abbreviation(), "px");
 
     double real_offset = offset;
-    sp_convert_distance(&real_offset, unit, &sp_unit_get_by_id(SP_UNIT_PX));
+    real_offset = Inkscape::Util::Quantity::convert(real_offset, unit.get_abbreviation(), "px");
     for (double s = real_offset; s<totlength; s+=real_mark_distance){
         s_cuts.push_back(s);
     }
 
=== modified file 'src/live_effects/parameter/unit.cpp'
--- src/live_effects/parameter/unit.cpp	2013-03-25 17:42:31 +0000
+++ src/live_effects/parameter/unit.cpp	2013-08-06 18:46:25 +0000
@@ -10,6 +10,9 @@
 #include "live_effects/parameter/unit.h"
 #include "live_effects/effect.h"
 #include "verbs.h"
+#include "util/units.h"
+
+using Inkscape::Util::unit_table;
 
 namespace Inkscape {
 
@@ -18,10 +21,10 @@
 
 UnitParam::UnitParam( const Glib::ustring& label, const Glib::ustring& tip,
                               const Glib::ustring& key, Inkscape::UI::Widget::Registry* wr,
-                              Effect* effect, SPUnitId default_value)
+                              Effect* effect, Glib::ustring default_unit)
     : Parameter(label, tip, key, wr, effect)
 {
-    defunit = &sp_unit_get_by_id(default_value);;
+    defunit = new Inkscape::Util::Unit(unit_table.getUnit(default_unit));
     unit = defunit;
 }
 
@@ -32,9 +35,8 @@
 bool
 UnitParam::param_readSVGValue(const gchar * strvalue)
 {
-    SPUnit const *newval = sp_unit_get_by_abbreviation(strvalue);
-    if (newval) {
-        param_set_value(newval);
+    if (strvalue) {
+        param_set_value(unit_table.getUnit(strvalue));
         return true;
     }
     return false;
@@ -43,25 +45,25 @@
 gchar *
 UnitParam::param_getSVGValue() const
 {
-    return g_strdup(sp_unit_get_abbreviation(unit));
+    return g_strdup(unit->abbr.c_str());
 }
 
 void
 UnitParam::param_set_default()
 {
-    param_set_value(defunit);
+    param_set_value(*defunit);
 }
 
 void
-UnitParam::param_set_value(SPUnit const *val)
+UnitParam::param_set_value(Inkscape::Util::Unit const &val)
 {
-    unit = val;
+    unit = new Inkscape::Util::Unit(val);
 }
 
 const gchar *
 UnitParam::get_abbreviation() const
 {
-    return sp_unit_get_abbreviation(unit);
+    return unit->abbr.c_str();
 }
 
 Gtk::Widget *
@@ -74,7 +76,7 @@
                                                      param_effect->getRepr(),
                                                      param_effect->getSPDoc()));
 
-    unit_menu->setUnit(unit);
+    unit_menu->setUnit(unit->abbr);
     unit_menu->set_undo_parameters(SP_VERB_DIALOG_LIVE_PATH_EFFECT, _("Change unit parameter"));
 
     return dynamic_cast<Gtk::Widget *> (unit_menu);
 
=== modified file 'src/live_effects/parameter/unit.h'
--- src/live_effects/parameter/unit.h	2013-01-17 18:23:15 +0000
+++ src/live_effects/parameter/unit.h	2013-08-06 18:46:25 +0000
@@ -10,10 +10,13 @@
  */
 
 #include "live_effects/parameter/parameter.h"
-#include <helper/units.h>
 
 namespace Inkscape {
 
+namespace Util {
+    class Unit;
+}
+
 namespace LivePathEffect {
 
 class UnitParam : public Parameter {
@@ -23,22 +26,22 @@
 		  const Glib::ustring& key, 
 		  Inkscape::UI::Widget::Registry* wr,
 		  Effect* effect,
-		  SPUnitId default_value = SP_UNIT_PX);
+		  Glib::ustring default_unit = "px");
     virtual ~UnitParam();
 
     virtual bool param_readSVGValue(const gchar * strvalue);
     virtual gchar * param_getSVGValue() const;
     virtual void param_set_default();
-    void param_set_value(SPUnit const *val);
+    void param_set_value(Inkscape::Util::Unit const &val);
     const gchar *get_abbreviation() const;
 
     virtual Gtk::Widget * param_newWidget();
 
-    operator SPUnit const *() const { return unit; }
+    operator Inkscape::Util::Unit const *() const { return unit; }
 
 private:
-    SPUnit const *unit;
-    SPUnit const *defunit;
+    Inkscape::Util::Unit const *unit;
+    Inkscape::Util::Unit const *defunit;
 
     UnitParam(const UnitParam&);
     UnitParam& operator=(const UnitParam&);
 
=== modified file 'src/lpe-tool-context.cpp'
--- src/lpe-tool-context.cpp	2013-08-03 21:30:12 +0000
+++ src/lpe-tool-context.cpp	2013-08-06 18:46:25 +0000
@@ -37,10 +37,12 @@
 #include "display/canvas-text.h"
 #include "message-stack.h"
 #include "sp-path.h"
-#include "helper/units.h"
+#include "util/units.h"
 
 #include "lpe-tool-context.h"
 
+using Inkscape::Util::unit_table;
+
 static void sp_lpetool_context_dispose(GObject *object);
 
 static void sp_lpetool_context_setup(SPEventContext *ec);
@@ -453,13 +455,17 @@
             if (!show)
                 sp_canvas_item_hide(SP_CANVAS_ITEM(canvas_text));
 
-            SPUnitId unitid = static_cast<SPUnitId>(prefs->getInt("/tools/lpetool/unitid", SP_UNIT_PX));
-            SPUnit unit = sp_unit_get_by_id(unitid);
+            Inkscape::Util::Unit unit;
+            if (prefs->getString("/tools/lpetool/unit").compare("")) {
+                unit = unit_table.getUnit(prefs->getString("/tools/lpetool/unit"));
+            } else {
+                unit = unit_table.getUnit("px");
+            }
 
             lengthval = Geom::length(pwd2);
             gboolean success;
-            success = sp_convert_distance(&lengthval, &sp_unit_get_by_id(SP_UNIT_PX), &unit);
-            arc_length = g_strdup_printf("%.2f %s", lengthval, success ? sp_unit_get_abbreviation(&unit) : "px");
+            lengthval = Inkscape::Util::Quantity::convert(lengthval, "px", unit);
+            arc_length = g_strdup_printf("%.2f %s", lengthval, unit.abbr.c_str());
             sp_canvastext_set_text (canvas_text, arc_length);
             set_pos_and_anchor(canvas_text, pwd2, 0.5, 10);
             // TODO: must we free arc_length?
@@ -489,12 +495,27 @@
         SPPath *path = i->first;
         SPCurve *curve = SP_SHAPE(path)->getCurve();
         Geom::Piecewise<Geom::D2<Geom::SBasis> > pwd2 = Geom::paths_to_pw(curve->get_pathvector());
+<<<<<<< TREE
         SPUnitId unitid = static_cast<SPUnitId>(prefs->getInt("/tools/lpetool/unitid", SP_UNIT_PX));
         SPUnit unit = sp_unit_get_by_id(unitid);
         double lengthval = Geom::length(pwd2);
+=======
+        Inkscape::Util::Unit unit;
+        if (prefs->getString("/tools/lpetool/unit").compare("")) {
+            unit = unit_table.getUnit(prefs->getString("/tools/lpetool/unit"));
+        } else {
+            unit = unit_table.getUnit("px");
+        }
+        lengthval = Geom::length(pwd2);
+>>>>>>> MERGE-SOURCE
         gboolean success;
+<<<<<<< TREE
         success = sp_convert_distance(&lengthval, &sp_unit_get_by_id(SP_UNIT_PX), &unit);
         gchar *arc_length = g_strdup_printf("%.2f %s", lengthval, success ? sp_unit_get_abbreviation(&unit) : "px");
+=======
+        lengthval = Inkscape::Util::Quantity::convert(lengthval, "px", unit);
+        arc_length = g_strdup_printf("%.2f %s", lengthval, unit.abbr.c_str());
+>>>>>>> MERGE-SOURCE
         sp_canvastext_set_text (SP_CANVASTEXT(i->second), arc_length);
         set_pos_and_anchor(SP_CANVASTEXT(i->second), pwd2, 0.5, 10);
         // TODO: must we free arc_length?
 
=== modified file 'src/lpe-tool-context.h'
--- src/lpe-tool-context.h	2013-03-14 23:24:17 +0000
+++ src/lpe-tool-context.h	2013-08-06 18:46:25 +0000
@@ -16,7 +16,6 @@
  */
 
 #include "pen-context.h"
-#include "helper/units.h"
 
 #define SP_TYPE_LPETOOL_CONTEXT (sp_lpetool_context_get_type())
 #define SP_LPETOOL_CONTEXT(o) (G_TYPE_CHECK_INSTANCE_CAST((o), SP_TYPE_LPETOOL_CONTEXT, SPLPEToolContext))
 
=== modified file 'src/main.cpp'
--- src/main.cpp	2013-07-17 11:42:40 +0000
+++ src/main.cpp	2013-08-06 18:46:25 +0000
@@ -68,7 +68,6 @@
 #include "color.h"
 #include "sp-item.h"
 #include "sp-root.h"
-#include "unit-constants.h"
 
 #include "svg/svg.h"
 #include "svg/svg-color.h"
@@ -1524,7 +1523,7 @@
 
     // default dpi
     if (dpi == 0.0) {
-        dpi = PX_PER_IN;
+        dpi = Inkscape::Util::Quantity::convert(1, "in", "px");
     }
 
     unsigned long int width = 0;
@@ -1537,7 +1536,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 * PX_PER_IN / area.width();
+        dpi = (gdouble) width * Inkscape::Util::Quantity::convert(1, "in", "px") / area.width();
     }
 
     if (sp_export_height) {
@@ -1547,15 +1546,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 * PX_PER_IN / area.height();
+        dpi = (gdouble) height * Inkscape::Util::Quantity::convert(1, "in", "px") / area.height();
     }
 
     if (!sp_export_width) {
-        width = (unsigned long int) (area.width() * dpi / PX_PER_IN + 0.5);
+        width = (unsigned long int) (area.width() * dpi / Inkscape::Util::Quantity::convert(1, "in", "px") + 0.5);
     }
 
     if (!sp_export_height) {
-        height = (unsigned long int) (area.height() * dpi / PX_PER_IN + 0.5);
+        height = (unsigned long int) (area.height() * dpi / Inkscape::Util::Quantity::convert(1, "in", "px") + 0.5);
     }
 
     guint32 bgcolor = 0x00000000;
 
=== modified file 'src/measure-context.cpp'
--- src/measure-context.cpp	2013-08-03 21:30:12 +0000
+++ src/measure-context.cpp	2013-08-06 18:46:25 +0000
@@ -13,7 +13,7 @@
 
 #include <gdk/gdkkeysyms.h>
 #include <boost/none_t.hpp>
-#include "helper/units.h"
+#include "util/units.h"
 #include "macros.h"
 #include "display/curve.h"
 #include "sp-shape.h"
@@ -46,6 +46,7 @@
 
 using Inkscape::ControlManager;
 using Inkscape::CTLINE_SECONDARY;
+using Inkscape::Util::unit_table;
 
 static void sp_measure_context_setup(SPEventContext *ec);
 static void sp_measure_context_finish(SPEventContext *ec);
@@ -514,8 +515,10 @@
                     std::sort(intersections.begin(), intersections.end(), GeomPointSortPredicate);
                 }
 
-                SPUnitId unitid = static_cast<SPUnitId>(prefs->getInt("/tools/measure/unitid", SP_UNIT_PX));
-                SPUnit unit = sp_unit_get_by_id(unitid);
+                Glib::ustring unit_name = prefs->getString("/tools/measure/unit");
+                if (!unit_name.compare("")) {
+                    unit_name = "px";
+                }
 
                 double fontsize = prefs->getInt("/tools/measure/fontsize");
 
@@ -526,7 +529,7 @@
                 for (size_t idx = 1; idx < intersections.size(); ++idx) {
                     LabelPlacement placement;
                     placement.lengthVal = (intersections[idx] - intersections[idx - 1]).length();
-                    sp_convert_distance(&placement.lengthVal, &sp_unit_get_by_id(SP_UNIT_PX), &unit);
+                    placement.lengthVal = Inkscape::Util::Quantity::convert(placement.lengthVal, "px", unit_name);
                     placement.offset = DIMENSION_OFFSET;
                     placement.start = desktop->doc2dt( (intersections[idx - 1] + intersections[idx]) / 2 );
                     placement.end = placement.start - (normal * placement.offset);
@@ -542,7 +545,7 @@
                     LabelPlacement &place = *it;
 
                     // TODO cleanup memory, Glib::ustring, etc.:
-                    gchar *measure_str = g_strdup_printf("%.2f %s", place.lengthVal, unit.abbr);
+                    gchar *measure_str = g_strdup_printf("%.2f %s", place.lengthVal, unit_name.c_str());
                     SPCanvasText *canvas_tooltip = sp_canvastext_new(sp_desktop_tempgroup(desktop),
                                                                      desktop,
                                                                      place.end,
@@ -583,10 +586,10 @@
 
                 {
                     double totallengthval = (end_point - start_point).length();
-                    sp_convert_distance(&totallengthval, &sp_unit_get_by_id(SP_UNIT_PX), &unit);
+                    totallengthval = Inkscape::Util::Quantity::convert(totallengthval, "px", unit_name);
 
                     // TODO cleanup memory, Glib::ustring, etc.:
-                    gchar *totallength_str = g_strdup_printf("%.2f %s", totallengthval, unit.abbr);
+                    gchar *totallength_str = g_strdup_printf("%.2f %s", totallengthval, unit_name.c_str());
                     SPCanvasText *canvas_tooltip = sp_canvastext_new(sp_desktop_tempgroup(desktop),
                                                                      desktop,
                                                                      end_point + desktop->w2d(Geom::Point(3*fontsize, -fontsize)),
@@ -604,10 +607,10 @@
 
                 if (intersections.size() > 2) {
                     double totallengthval = (intersections[intersections.size()-1] - intersections[0]).length();
-                    sp_convert_distance(&totallengthval, &sp_unit_get_by_id(SP_UNIT_PX), &unit);
+                    totallengthval = Inkscape::Util::Quantity::convert(totallengthval, "px", unit_name);
 
                     // TODO cleanup memory, Glib::ustring, etc.:
-                    gchar *total_str = g_strdup_printf("%.2f %s", totallengthval, unit.abbr);
+                    gchar *total_str = g_strdup_printf("%.2f %s", totallengthval, unit_name.c_str());
                     SPCanvasText *canvas_tooltip = sp_canvastext_new(sp_desktop_tempgroup(desktop),
                                                                      desktop,
                                                                      desktop->doc2dt((intersections[0] + intersections[intersections.size()-1])/2) + normal * 60,
 
=== modified file 'src/pen-context.cpp'
--- src/pen-context.cpp	2013-04-28 22:48:03 +0000
+++ src/pen-context.cpp	2013-08-06 18:46:25 +0000
@@ -22,7 +22,6 @@
 
 #include "pen-context.h"
 #include "sp-namedview.h"
-#include "sp-metrics.h"
 #include "desktop.h"
 #include "desktop-handles.h"
 #include "selection.h"
@@ -39,7 +38,6 @@
 #include "display/sp-ctrlline.h"
 #include "display/sodipodi-ctrl.h"
 #include <glibmm/i18n.h>
-#include "helper/units.h"
 #include "macros.h"
 #include "context-fns.h"
 #include "tools-switch.h"
@@ -1185,11 +1183,16 @@
 
     SPDesktop *desktop = SP_EVENT_CONTEXT(pc)->desktop;
     Geom::Point rel = p - pc->p[pc_point_to_compare];
-    GString *dist = SP_PX_TO_METRIC_STRING(Geom::L2(rel), desktop->namedview->getDefaultMetric());
+    Inkscape::Util::Quantity q = Inkscape::Util::Quantity(Geom::L2(rel), "px");
+    GString *dist = g_string_new(q.string(*desktop->namedview->doc_units).c_str());
     double angle = atan2(rel[Geom::Y], rel[Geom::X]) * 180 / M_PI;
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-    if (prefs->getBool("/options/compassangledisplay/value", 0) != 0)
-        angle = angle_to_compass (angle);
+    if (prefs->getBool("/options/compassangledisplay/value", 0) != 0) {
+        angle = 90 - angle;
+        if (angle < 0) {
+            angle += 360;
+        }
+    }
 
     pc->_message_context->setF(Inkscape::IMMEDIATE_MESSAGE, message, angle, dist->str);
     g_string_free(dist, FALSE);
 
=== modified file 'src/preferences.cpp'
--- src/preferences.cpp	2013-02-11 23:34:59 +0000
+++ src/preferences.cpp	2013-08-06 18:46:25 +0000
@@ -28,6 +28,8 @@
 
 #define PREFERENCES_FILE_NAME "preferences.xml"
 
+using Inkscape::Util::unit_table;
+
 namespace Inkscape {
 
 static Inkscape::XML::Document *loadImpl( std::string const& prefsFilename, Glib::ustring & errMsg );
@@ -777,8 +779,6 @@
 
 double Preferences::_extractDouble(Entry const &v, Glib::ustring const &requested_unit)
 {
-    static Inkscape::Util::UnitTable unit_table; // load the unit_table once by making it static
-
     double val = _extractDouble(v);
     Glib::ustring unit = _extractUnit(v);
 
 
=== modified file 'src/rect-context.cpp'
--- src/rect-context.cpp	2013-04-28 22:48:03 +0000
+++ src/rect-context.cpp	2013-08-06 18:46:25 +0000
@@ -35,7 +35,6 @@
 #include "message-context.h"
 #include "pixmaps/cursor-rect.xpm"
 #include "rect-context.h"
-#include "sp-metrics.h"
 #include <glibmm/i18n.h>
 #include "xml/repr.h"
 #include "xml/node-event-vector.h"
@@ -483,8 +482,10 @@
     // status text
     double rdimx = r.dimensions()[Geom::X];
     double rdimy = r.dimensions()[Geom::Y];
-    GString *xs = SP_PX_TO_METRIC_STRING(rdimx, desktop->namedview->getDefaultMetric());
-    GString *ys = SP_PX_TO_METRIC_STRING(rdimy, desktop->namedview->getDefaultMetric());
+    Inkscape::Util::Quantity rdimx_q = Inkscape::Util::Quantity(rdimx, "px");
+    Inkscape::Util::Quantity rdimy_q = Inkscape::Util::Quantity(rdimy, "px");
+    GString *xs = g_string_new(rdimx_q.string(*desktop->namedview->doc_units).c_str());
+    GString *ys = g_string_new(rdimy_q.string(*desktop->namedview->doc_units).c_str());
     if (state & GDK_CONTROL_MASK) {
         int ratio_x, ratio_y;
         bool is_golden_ratio = false;
 
=== modified file 'src/selection-chemistry.cpp'
--- src/selection-chemistry.cpp	2013-07-04 14:01:44 +0000
+++ src/selection-chemistry.cpp	2013-08-06 18:46:25 +0000
@@ -86,11 +86,10 @@
 #include <map>
 #include <cstring>
 #include <string>
-#include "helper/units.h"
 #include "sp-item.h"
 #include "box3d.h"
 #include "persp3d.h"
-#include "unit-constants.h"
+#include "util/units.h"
 #include "xml/simple-document.h"
 #include "sp-filter-reference.h"
 #include "gradient-drag.h"
@@ -3398,7 +3397,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 = PX_PER_IN * prefs_min / MIN(bbox->width(), bbox->height());
+        res = Inkscape::Util::Quantity::convert(1, "in", "px") * prefs_min / MIN(bbox->width(), bbox->height());
     } else {
         float hint_xdpi = 0, hint_ydpi = 0;
         Glib::ustring hint_filename;
@@ -3413,14 +3412,14 @@
                 res = hint_xdpi;
             } else {
                 // if all else fails, take the default 90 dpi
-                res = PX_PER_IN;
+                res = Inkscape::Util::Quantity::convert(1, "in", "px");
             }
         }
     }
 
     // The width and height of the bitmap in pixels
-    unsigned width = (unsigned) floor(bbox->width() * res / PX_PER_IN);
-    unsigned height =(unsigned) floor(bbox->height() * res / PX_PER_IN);
+    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"));
 
     // Find out if we have to run an external filter
     gchar const *run = NULL;
@@ -3452,7 +3451,7 @@
 
     double shift_x = bbox->min()[Geom::X];
     double shift_y = bbox->max()[Geom::Y];
-    if (res == PX_PER_IN) { // for default 90 dpi, snap it to pixel grid
+    if (res == Inkscape::Util::Quantity::convert(1, "in", "px")) { // for default 90 dpi, snap it to pixel grid
         shift_x = round(shift_x);
         shift_y = -round(-shift_y); // this gets correct rounding despite coordinate inversion, remove the negations when the inversion is gone
     }
@@ -3485,7 +3484,7 @@
         // Create the repr for the image
         Inkscape::XML::Node * repr = xml_doc->createElement("svg:image");
         sp_embed_image(repr, pb, "image/png");
-        if (res == PX_PER_IN) { // for default 90 dpi, snap it to pixel grid
+        if (res == Inkscape::Util::Quantity::convert(1, "in", "px")) { // for default 90 dpi, snap it to pixel grid
             sp_repr_set_svg_double(repr, "width", width);
             sp_repr_set_svg_double(repr, "height", height);
         } else {
 
=== modified file 'src/seltrans.cpp'
--- src/seltrans.cpp	2013-07-03 16:59:04 +0000
+++ src/seltrans.cpp	2013-08-06 18:46:25 +0000
@@ -37,7 +37,6 @@
 #include "seltrans-handles.h"
 #include "seltrans.h"
 #include "selection-chemistry.h"
-#include "sp-metrics.h"
 #include "verbs.h"
 #include <glibmm/i18n.h>
 #include "display/sp-ctrlline.h"
@@ -1273,8 +1272,10 @@
     m.unSetup();
 
     // status text
-    GString *xs = SP_PX_TO_METRIC_STRING(pt[Geom::X], _desktop->namedview->getDefaultMetric());
-    GString *ys = SP_PX_TO_METRIC_STRING(pt[Geom::Y], _desktop->namedview->getDefaultMetric());
+    Inkscape::Util::Quantity x_q = Inkscape::Util::Quantity(pt[Geom::X], "px");
+    Inkscape::Util::Quantity y_q = Inkscape::Util::Quantity(pt[Geom::Y], "px");
+    GString *xs = g_string_new(x_q.string(*_desktop->namedview->doc_units).c_str());
+    GString *ys = g_string_new(y_q.string(*_desktop->namedview->doc_units).c_str());
     _message_context.setF(Inkscape::NORMAL_MESSAGE, _("Move <b>center</b> to %s, %s"), xs->str, ys->str);
     g_string_free(xs, FALSE);
     g_string_free(ys, FALSE);
@@ -1425,8 +1426,10 @@
     transform(move, norm);
 
     // status text
-    GString *xs = SP_PX_TO_METRIC_STRING(dxy[Geom::X], _desktop->namedview->getDefaultMetric());
-    GString *ys = SP_PX_TO_METRIC_STRING(dxy[Geom::Y], _desktop->namedview->getDefaultMetric());
+    Inkscape::Util::Quantity x_q = Inkscape::Util::Quantity(dxy[Geom::X], "px");
+    Inkscape::Util::Quantity y_q = Inkscape::Util::Quantity(dxy[Geom::Y], "px");
+    GString *xs = g_string_new(x_q.string(*_desktop->namedview->doc_units).c_str());
+    GString *ys = g_string_new(y_q.string(*_desktop->namedview->doc_units).c_str());
     _message_context.setF(Inkscape::NORMAL_MESSAGE, _("<b>Move</b> by %s, %s; with <b>Ctrl</b> to restrict to horizontal/vertical; with <b>Shift</b> to disable snapping"), xs->str, ys->str);
     g_string_free(xs, TRUE);
     g_string_free(ys, TRUE);
 
=== modified file 'src/snap-preferences.h'
--- src/snap-preferences.h	2012-02-14 20:56:34 +0000
+++ src/snap-preferences.h	2013-08-06 18:46:25 +0000
@@ -10,7 +10,6 @@
  * Released under GNU GPL, read the file 'COPYING' for more information
  */
 
-#include "helper/units.h"
 #include "snap-enums.h"
 
 namespace Inkscape
 
=== modified file 'src/sp-guide.cpp'
--- src/sp-guide.cpp	2013-03-02 11:29:23 +0000
+++ src/sp-guide.cpp	2013-08-06 18:46:25 +0000
@@ -35,7 +35,6 @@
 #include <glibmm/i18n.h>
 #include <xml/repr.h>
 #include <remove-last.h>
-#include "sp-metrics.h"
 #include "inkscape.h"
 #include "desktop.h"
 #include "sp-namedview.h"
@@ -463,10 +462,10 @@
     } else {
         SPNamedView *namedview = sp_document_namedview(guide->document, NULL);
 
-        GString *position_string_x = SP_PX_TO_METRIC_STRING(guide->point_on_line[X],
-                                                            namedview->getDefaultMetric());
-        GString *position_string_y = SP_PX_TO_METRIC_STRING(guide->point_on_line[Y],
-                                                            namedview->getDefaultMetric());
+        Inkscape::Util::Quantity x_q = Inkscape::Util::Quantity(guide->point_on_line[X], "px");
+        Inkscape::Util::Quantity y_q = Inkscape::Util::Quantity(guide->point_on_line[Y], "px");
+        GString *position_string_x = g_string_new(x_q.string(*namedview->doc_units).c_str());
+        GString *position_string_y = g_string_new(y_q.string(*namedview->doc_units).c_str());
 
         gchar *shortcuts = g_strdup_printf("; %s", _("<b>Shift+drag</b> to rotate, <b>Ctrl+drag</b> to move origin, <b>Del</b> to delete"));
 
 
=== removed file 'src/sp-metric.h'
--- src/sp-metric.h	2012-10-27 18:15:53 +0000
+++ src/sp-metric.h	1970-01-01 00:00:00 +0000
@@ -1,28 +0,0 @@
-#ifndef INKSCAPE_SP_METRIC_H
-#define INKSCAPE_SP_METRIC_H
-
-/** Known metrics so far.  (I don't know why this doesn't include pica.) */
-enum SPMetric {
-    SP_NONE,
-    SP_MM,
-    SP_CM,
-    SP_IN,
-    SP_FT,
-    SP_PT,
-    SP_PC,
-    SP_PX,
-    SP_M
-};
-
-#endif /* !INKSCAPE_SP_METRIC_H */
-
-/*
-  Local Variables:
-  mode:c++
-  c-file-style:"stroustrup"
-  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
-  indent-tabs-mode:nil
-  fill-column:99
-  End:
-*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
 
=== removed file 'src/sp-metrics.cpp'
--- src/sp-metrics.cpp	2012-10-27 18:15:53 +0000
+++ src/sp-metrics.cpp	1970-01-01 00:00:00 +0000
@@ -1,120 +0,0 @@
-#include "sp-metrics.h"
-#include "unit-constants.h"
-
-/*
- * SPMetric handling and stuff
- * I hope this will be usefull :-)
- */
-
-gdouble
-sp_absolute_metric_to_metric (gdouble length_src, const SPMetric metric_src, const SPMetric metric_dst)
-{
-  gdouble src = 1;
-  gdouble dst = 1;
-
-  switch (metric_src) {
-  case SP_M:
-    src = M_PER_IN;
-    break;
-  case SP_MM:
-    src = MM_PER_IN;
-    break;
-  case SP_CM:
-    src = CM_PER_IN;
-    break;
-  case SP_IN:
-    src = IN_PER_IN;
-    break;
-  case SP_FT:
-    src = FT_PER_IN;
-    break;
-  case SP_PT:
-    src = PT_PER_IN;
-    break;
-  case SP_PC:
-    src = PC_PER_IN;
-    break;
-  case SP_PX:
-    src = PX_PER_IN;
-    break;
-  case SP_NONE:
-    src = 1;
-    break;
-  }
-
-  switch (metric_dst) {
-  case SP_M:
-    dst = M_PER_IN;
-    break;
-  case SP_MM:
-    dst = MM_PER_IN;
-    break;
-  case SP_CM:
-    dst = CM_PER_IN;
-    break;
-  case SP_IN:
-    dst = IN_PER_IN;
-    break;
-  case SP_FT:
-    dst = FT_PER_IN;
-    break;
-  case SP_PT:
-    dst = PT_PER_IN;
-    break;
-  case SP_PC:
-    dst = PC_PER_IN;
-    break;
-  case SP_PX:
-    dst = PX_PER_IN;
-    break;
-  case SP_NONE:
-    dst = 1;
-    break;
-  }
-
-  return length_src * (dst/src);
-}
-
-/**
- * Create a human-readable string suitable for status-bar display.
- */
-GString *
-sp_metric_to_metric_string(gdouble const length,
-                           SPMetric const metric_src, SPMetric const metric_dst,
-                           gboolean const m)
-{
-    gdouble const len = sp_absolute_metric_to_metric(length, metric_src, metric_dst);
-    GString *str = g_string_new("");
-    g_string_printf(str, "%0.02f", len);
-    /* We need a fixed number of fractional digits, because otherwise the live statusbar display of
-     * lengths will be too jerky */
-
-    if (m) {
-        char const *unit_str;
-        switch (metric_dst) {
-            case SP_M:  unit_str = " m"; break;
-            case SP_MM: unit_str = " mm"; break;
-            case SP_CM: unit_str = " cm"; break;
-            case SP_IN: unit_str = "\""; break;
-            case SP_PT: unit_str = " pt"; break;
-            case SP_PX: unit_str = " px"; break;
-            default: unit_str = NULL; break;
-        }
-        if (unit_str) {
-            g_string_append(str, unit_str);
-        }
-    }
-    return str;
-}
-
-
-/*
-  Local Variables:
-  mode:c++
-  c-file-style:"stroustrup"
-  c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
-  indent-tabs-mode:nil
-  fill-column:99
-  End:
-*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
 
=== removed file 'src/sp-metrics.h'
--- src/sp-metrics.h	2011-12-08 11:53:54 +0000
+++ src/sp-metrics.h	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-#ifndef SP_METRICS_H
-#define SP_METRICS_H
-
-#include <glib.h>
-#include "sp-metric.h"
-
-gdouble sp_absolute_metric_to_metric (gdouble length_src, const SPMetric metric_src, const SPMetric metric_dst);
-GString * sp_metric_to_metric_string (gdouble length,  const SPMetric metric_src, const SPMetric metric_dst, gboolean m);
-
-// convenience since we mostly deal with points
-#define SP_METRIC_TO_PT(l,m) sp_absolute_metric_to_metric(l,m,SP_PT);
-#define SP_PT_TO_METRIC(l,m) sp_absolute_metric_to_metric(l,SP_PT,m);
-
-#define SP_PT_TO_METRIC_STRING(l,m) sp_metric_to_metric_string(l, SP_PT, m, TRUE)
-#define SP_PT_TO_STRING(l,m) sp_metric_to_metric_string(l, SP_PT, m, FALSE)
-
-#define SP_PX_TO_METRIC_STRING(l,m) sp_metric_to_metric_string(l, SP_PX, m, TRUE)
-#define SP_PX_TO_STRING(l,m) sp_metric_to_metric_string(l, SP_PX, m, FALSE)
-
-#endif
 
=== modified file 'src/sp-namedview.cpp'
--- src/sp-namedview.cpp	2013-05-01 07:46:46 +0000
+++ src/sp-namedview.cpp	2013-08-06 18:46:25 +0000
@@ -22,7 +22,7 @@
 
 #include "display/canvas-grid.h"
 #include "display/guideline.h"
-#include "helper/units.h"
+#include "util/units.h"
 #include "svg/svg-color.h"
 #include "xml/repr.h"
 #include "attributes.h"
@@ -40,6 +40,7 @@
 #include <gtkmm/window.h>
 
 using Inkscape::DocumentUndo;
+using Inkscape::Util::unit_table;
 
 #define DEFAULTGRIDCOLOR 0x3f3fff25
 #define DEFAULTGRIDEMPCOLOR 0x3f3fff60
@@ -549,18 +550,19 @@
              * in that they aren't in general absolute units as currently required by
              * doc_units.
              */
-            SPUnit const *new_unit = &sp_unit_get_by_id(SP_UNIT_PX);
+            static Inkscape::Util::Unit px = unit_table.getUnit("px");
+            Inkscape::Util::Unit const *new_unit = new Inkscape::Util::Unit(px);
 
             if (value) {
-                SPUnit const *const req_unit = sp_unit_get_by_abbreviation(value);
-                if ( req_unit == NULL ) {
+                Inkscape::Util::Unit u = unit_table.getUnit(value);
+                Inkscape::Util::Unit const *const req_unit = new Inkscape::Util::Unit(u);
+                if ( !unit_table.hasUnit(value) ) {
                     g_warning("Unrecognized unit `%s'", value);
                     /* fixme: Document errors should be reported in the status bar or
                      * the like (e.g. as per
                      * http://www.w3.org/TR/SVG11/implnote.html#ErrorProcessing); g_log
                      * should be only for programmer errors. */
-                } else if ( req_unit->base == SP_UNIT_ABSOLUTE ||
-                            req_unit->base == SP_UNIT_DEVICE     ) {
+                } else if ( req_unit->isAbsolute() ) {
                     new_unit = req_unit;
                 } else {
                     g_warning("Document units must be absolute like `mm', `pt' or `px', but found `%s'",
@@ -573,18 +575,18 @@
             break;
     }
     case SP_ATTR_UNITS: {
-            SPUnit const *new_unit = NULL;
+            Inkscape::Util::Unit const *new_unit = NULL;
 
             if (value) {
-                SPUnit const *const req_unit = sp_unit_get_by_abbreviation(value);
-                if ( req_unit == NULL ) {
+                Inkscape::Util::Unit u = unit_table.getUnit(value);
+                Inkscape::Util::Unit const *const req_unit = new Inkscape::Util::Unit(u);
+                if ( !unit_table.hasUnit(value) ) {
                     g_warning("Unrecognized unit `%s'", value);
                     /* fixme: Document errors should be reported in the status bar or
                      * the like (e.g. as per
                      * http://www.w3.org/TR/SVG11/implnote.html#ErrorProcessing); g_log
                      * should be only for programmer errors. */
-                } else if ( req_unit->base == SP_UNIT_ABSOLUTE ||
-                            req_unit->base == SP_UNIT_DEVICE     ) {
+                } else if ( req_unit->isAbsolute() ) {
                     new_unit = req_unit;
                 } else {
                     g_warning("Document units must be absolute like `mm', `pt' or `px', but found `%s'",
@@ -1101,35 +1103,35 @@
  * \return the margin size in px, else 0.0 if anything is invalid.
  */
 double SPNamedView::getMarginLength(gchar const * const key,
-                             SPUnit const * const margin_units,
-                             SPUnit const * const return_units,
+                             Inkscape::Util::Unit const * const margin_units,
+                             Inkscape::Util::Unit const * const return_units,
                              double const width,
                              double const height,
                              bool const use_width)
 {
     double value;
+    Inkscape::Util::Unit percent = unit_table.getUnit("%");
     if(!this->storeAsDouble(key,&value)) {
         return 0.0;
     }
-    if (margin_units == &sp_unit_get_by_id (SP_UNIT_PERCENT)) {
+    if (*margin_units == percent) {
         return (use_width)? width * value : height * value; 
     }
-    if (!sp_convert_distance (&value, margin_units, return_units)) {
+    if (!margin_units->compatibleWith(*return_units)) {
         return 0.0;
     }
     return value;
 }
 
-
 /**
- * Returns namedview's default metric.
+ * Returns namedview's default unit.
  */
-SPMetric SPNamedView::getDefaultMetric() const
+Inkscape::Util::Unit const SPNamedView::getDefaultUnit() const
 {
     if (doc_units) {
-        return sp_unit_get_metric(doc_units);
+        return *doc_units;
     } else {
-        return SP_PT;
+        return *(new Inkscape::Util::Unit(unit_table.getUnit("pt")));
     }
 }
 
 
=== modified file 'src/sp-namedview.h'
--- src/sp-namedview.h	2013-01-23 12:22:14 +0000
+++ src/sp-namedview.h	2013-08-06 18:46:25 +0000
@@ -21,16 +21,17 @@
 #define SP_IS_NAMEDVIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), SP_TYPE_NAMEDVIEW))
 
 #include "sp-object-group.h"
-#include "sp-metric.h"
 #include "snap.h"
 #include "document.h"
+#include "util/units.h"
 
 G_BEGIN_DECLS
 
-struct SPUnit;
-
 namespace Inkscape {
-class CanvasGrid;
+    class CanvasGrid;
+    namespace Util {
+        class Unit;
+    }
 }
 
 enum {
@@ -58,8 +59,8 @@
     GSList * grids;
     bool grids_visible;
 
-    SPUnit const *doc_units;
-    SPUnit const *units;
+    Inkscape::Util::Unit const *doc_units;
+    Inkscape::Util::Unit const *units;
     
     GQuark default_layer_id;
 
@@ -82,7 +83,7 @@
     gchar const *getName() const;
     guint getViewCount();
     GSList const *getViewList() const;
-    SPMetric getDefaultMetric() const;
+    Inkscape::Util::Unit const getDefaultUnit() const;
 
     void translateGuides(Geom::Translate const &translation);
     void translateGrids(Geom::Translate const &translation);
@@ -94,7 +95,7 @@
     bool getGuides();
 
 private:
-    double getMarginLength(gchar const * const key,SPUnit const * const margin_units,SPUnit const * const return_units,double const width,double const height,bool const use_width);
+    double getMarginLength(gchar const * const key,Inkscape::Util::Unit const * const margin_units,Inkscape::Util::Unit const * const return_units,double const width,double const height,bool const use_width);
     friend class SPDocument;
 };
 
 
=== modified file 'src/sp-text.cpp'
--- src/sp-text.cpp	2013-08-04 14:27:59 +0000
+++ src/sp-text.cpp	2013-08-06 18:46:25 +0000
@@ -43,7 +43,6 @@
 #include "sp-namedview.h"
 #include "style.h"
 #include "inkscape.h"
-#include "sp-metrics.h"
 #include "xml/quote.h"
 #include "xml/repr.h"
 #include "mod360.h"
@@ -56,7 +55,6 @@
 #include "sp-tspan.h"
 
 #include "text-editing.h"
-#include "unit-constants.h"
 
 /*#####################################################
 #  SPTEXT
@@ -392,7 +390,8 @@
         n = g_strdup(_("&lt;no name found&gt;"));
     }
 
-    GString *xs = SP_PX_TO_METRIC_STRING(style->font_size.computed, sp_desktop_namedview(SP_ACTIVE_DESKTOP)->getDefaultMetric());
+    Inkscape::Util::Quantity q = Inkscape::Util::Quantity(style->font_size.computed, "px");
+    GString *xs = g_string_new(q.string(*sp_desktop_namedview(SP_ACTIVE_DESKTOP)->doc_units).c_str());
 
     char const *trunc = "";
     Inkscape::Text::Layout const *layout = te_get_layout((SPItem *) item);
 
=== modified file 'src/spiral-context.cpp'
--- src/spiral-context.cpp	2013-04-28 22:48:03 +0000
+++ src/spiral-context.cpp	2013-08-06 18:46:25 +0000
@@ -34,7 +34,6 @@
 #include "message-context.h"
 #include "pixmaps/cursor-spiral.xpm"
 #include "spiral-context.h"
-#include "sp-metrics.h"
 #include <glibmm/i18n.h>
 #include "xml/repr.h"
 #include "xml/node-event-vector.h"
@@ -437,7 +436,8 @@
                            /*t0*/ sc->t0);
 
     /* status text */
-    GString *rads = SP_PX_TO_METRIC_STRING(rad, desktop->namedview->getDefaultMetric());
+    Inkscape::Util::Quantity q = Inkscape::Util::Quantity(rad, "px");
+    GString *rads = g_string_new(q.string(*desktop->namedview->doc_units).c_str());
     sc->_message_context->setF(Inkscape::IMMEDIATE_MESSAGE,
                                _("<b>Spiral</b>: radius %s, angle %5g&#176;; with <b>Ctrl</b> to snap angle"),
                                rads->str, sp_round((arg + 2.0*M_PI*spiral->revo)*180/M_PI, 0.0001));
 
=== modified file 'src/star-context.cpp'
--- src/star-context.cpp	2013-04-28 22:48:03 +0000
+++ src/star-context.cpp	2013-08-06 18:46:25 +0000
@@ -36,7 +36,6 @@
 #include "desktop-style.h"
 #include "message-context.h"
 #include "pixmaps/cursor-star.xpm"
-#include "sp-metrics.h"
 #include <glibmm/i18n.h>
 #include "preferences.h"
 #include "xml/repr.h"
@@ -450,7 +449,8 @@
                          arg1, arg1 + M_PI / sides, sc->isflatsided, sc->rounded, sc->randomized);
 
     /* status text */
-    GString *rads = SP_PX_TO_METRIC_STRING(r1, desktop->namedview->getDefaultMetric());
+    Inkscape::Util::Quantity q = Inkscape::Util::Quantity(r1, "px");
+    GString *rads = g_string_new(q.string(*desktop->namedview->doc_units).c_str());
     sc->_message_context->setF(Inkscape::IMMEDIATE_MESSAGE,
                                ( sc->isflatsided?
                                  _("<b>Polygon</b>: radius %s, angle %5g&#176;; with <b>Ctrl</b> to snap angle")
 
=== modified file 'src/style.cpp'
--- src/style.cpp	2013-08-06 17:29:13 +0000
+++ src/style.cpp	2013-08-06 18:46:25 +0000
@@ -45,7 +45,7 @@
 #include "svg/css-ostringstream.h"
 #include "xml/repr.h"
 #include "xml/simple-document.h"
-#include "unit-constants.h"
+#include "util/units.h"
 #include "macros.h"
 #include "preferences.h"
 
@@ -2483,11 +2483,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 * PT_PER_PX;  break;
-        case SP_CSS_UNIT_PC: unit_size = size * (PT_PER_PX / PT_PER_PC);  break;
-        case SP_CSS_UNIT_MM: unit_size = size * MM_PER_PX;  break;
-        case SP_CSS_UNIT_CM: unit_size = size * CM_PER_PX;  break;
-        case SP_CSS_UNIT_IN: unit_size = size * IN_PER_PX;  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_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;
@@ -3472,19 +3472,19 @@
             } else if (!strcmp(e, "pt")) {
                 /* Userspace / DEVICESCALE */
                 val->unit = SP_CSS_UNIT_PT;
-                val->computed = value * PX_PER_PT;
+                val->computed = value * Inkscape::Util::Quantity::convert(1, "pt", "px");
             } else if (!strcmp(e, "pc")) {
                 val->unit = SP_CSS_UNIT_PC;
-                val->computed = value * PX_PER_PC;
+                val->computed = value * Inkscape::Util::Quantity::convert(1, "pc", "px");
             } else if (!strcmp(e, "mm")) {
                 val->unit = SP_CSS_UNIT_MM;
-                val->computed = value * PX_PER_MM;
+                val->computed = value * Inkscape::Util::Quantity::convert(1, "mm", "px");
             } else if (!strcmp(e, "cm")) {
                 val->unit = SP_CSS_UNIT_CM;
-                val->computed = value * PX_PER_CM;
+                val->computed = value * Inkscape::Util::Quantity::convert(1, "cm", "px");
             } else if (!strcmp(e, "in")) {
                 val->unit = SP_CSS_UNIT_IN;
-                val->computed = value * PX_PER_IN;
+                val->computed = value * Inkscape::Util::Quantity::convert(1, "in", "px");
             } else if (!strcmp(e, "em")) {
                 /* EM square */
                 val->unit = SP_CSS_UNIT_EM;
@@ -4043,23 +4043,23 @@
                     return g_strlcpy(p, os.str().c_str(), len);
                     break;
                 case SP_CSS_UNIT_PT:
-                    os << key << ":" << val->computed * PT_PER_PX << "pt;";
+                    os << key << ":" << val->computed * Inkscape::Util::Quantity::convert(1, "px", "pt") << "pt;";
                     return g_strlcpy(p, os.str().c_str(), len);
                     break;
                 case SP_CSS_UNIT_PC:
-                    os << key << ":" << val->computed * PT_PER_PX / 12.0 << "pc;";
+                    os << key << ":" << val->computed * Inkscape::Util::Quantity::convert(1, "px", "pt") / 12.0 << "pc;";
                     return g_strlcpy(p, os.str().c_str(), len);
                     break;
                 case SP_CSS_UNIT_MM:
-                    os << key << ":" << val->computed * MM_PER_PX << "mm;";
+                    os << key << ":" << val->computed * Inkscape::Util::Quantity::convert(1, "px", "mm") << "mm;";
                     return g_strlcpy(p, os.str().c_str(), len);
                     break;
                 case SP_CSS_UNIT_CM:
-                    os << key << ":" << val->computed * CM_PER_PX << "cm;";
+                    os << key << ":" << val->computed * Inkscape::Util::Quantity::convert(1, "px", "cm") << "cm;";
                     return g_strlcpy(p, os.str().c_str(), len);
                     break;
                 case SP_CSS_UNIT_IN:
-                    os << key << ":" << val->computed * IN_PER_PX << "in;";
+                    os << key << ":" << val->computed * Inkscape::Util::Quantity::convert(1, "px", "in") << "in;";
                     return g_strlcpy(p, os.str().c_str(), len);
                     break;
                 case SP_CSS_UNIT_EM:
 
=== modified file 'src/svg/svg-length.cpp'
--- src/svg/svg-length.cpp	2011-12-08 11:53:54 +0000
+++ src/svg/svg-length.cpp	2013-08-06 18:46:25 +0000
@@ -23,7 +23,7 @@
 
 #include "svg.h"
 #include "stringstream.h"
-#include "../unit-constants.h"
+#include "util/units.h"
 
 
 static unsigned sp_svg_length_read_lff(gchar const *str, SVGLength::Unit *unit, float *val, float *computed, char **next);
@@ -330,6 +330,8 @@
                 *next = (char *) e + 1;
             }
             return 1;
+        } else if (g_ascii_isspace(e[0])) {
+            return 0; // spaces are not allowed
         } else {
             /* Unitless */
             if (unit) {
@@ -365,7 +367,7 @@
                     *unit = SVGLength::PT;
                 }
                 if (computed) {
-                    *computed = v * PX_PER_PT;
+                    *computed = v * Inkscape::Util::Quantity::convert(1, "pt", "px");
                 }
                 break;
             case UVAL('p','c'):
@@ -373,7 +375,7 @@
                     *unit = SVGLength::PC;
                 }
                 if (computed) {
-                    *computed = v * PX_PER_PC;
+                    *computed = v * Inkscape::Util::Quantity::convert(1, "pc", "px");
                 }
                 break;
             case UVAL('m','m'):
@@ -381,7 +383,7 @@
                     *unit = SVGLength::MM;
                 }
                 if (computed) {
-                    *computed = v * PX_PER_MM;
+                    *computed = v * Inkscape::Util::Quantity::convert(1, "mm", "px");
                 }
                 break;
             case UVAL('c','m'):
@@ -389,7 +391,7 @@
                     *unit = SVGLength::CM;
                 }
                 if (computed) {
-                    *computed = v * PX_PER_CM;
+                    *computed = v * Inkscape::Util::Quantity::convert(1, "cm", "px");
                 }
                 break;
             case UVAL('i','n'):
@@ -397,7 +399,7 @@
                     *unit = SVGLength::INCH;
                 }
                 if (computed) {
-                    *computed = v * PX_PER_IN;
+                    *computed = v * Inkscape::Util::Quantity::convert(1, "in", "px");
                 }
                 break;
             case UVAL('f','t'):
@@ -405,7 +407,7 @@
                     *unit = SVGLength::FOOT;
                 }
                 if (computed) {
-                    *computed = v * PX_PER_FT;
+                    *computed = v * Inkscape::Util::Quantity::convert(1, "ft", "px");
                 }
                 break;
             case UVAL('e','m'):
 
=== modified file 'src/text-context.cpp'
--- src/text-context.cpp	2013-05-12 10:22:42 +0000
+++ src/text-context.cpp	2013-08-06 18:46:25 +0000
@@ -42,7 +42,6 @@
 #include "selection.h"
 #include "shape-editor.h"
 #include "sp-flowtext.h"
-#include "sp-metrics.h"
 #include "sp-namedview.h"
 #include "sp-text.h"
 #include "style.h"
@@ -640,8 +639,10 @@
                 gobble_motion_events(GDK_BUTTON1_MASK);
 
                 // status text
-                GString *xs = SP_PX_TO_METRIC_STRING(fabs((p - tc->p0)[Geom::X]), desktop->namedview->getDefaultMetric());
-                GString *ys = SP_PX_TO_METRIC_STRING(fabs((p - tc->p0)[Geom::Y]), desktop->namedview->getDefaultMetric());
+                Inkscape::Util::Quantity x_q = Inkscape::Util::Quantity(fabs((p - tc->p0)[Geom::X]), "px");
+                Inkscape::Util::Quantity y_q = Inkscape::Util::Quantity(fabs((p - tc->p0)[Geom::Y]), "px");
+                GString *xs = g_string_new(x_q.string(*desktop->namedview->doc_units).c_str());
+                GString *ys = g_string_new(y_q.string(*desktop->namedview->doc_units).c_str());
                 event_context->_message_context->setF(Inkscape::IMMEDIATE_MESSAGE, _("<b>Flowed text frame</b>: %s &#215; %s"), xs->str, ys->str);
                 g_string_free(xs, FALSE);
                 g_string_free(ys, FALSE);
 
=== modified file 'src/text-editing.cpp'
--- src/text-editing.cpp	2013-03-16 19:42:47 +0000
+++ src/text-editing.cpp	2013-08-06 18:46:25 +0000
@@ -24,7 +24,7 @@
 #include "inkscape.h"
 #include "message-stack.h"
 #include "style.h"
-#include "unit-constants.h"
+#include "util/units.h"
 
 #include "document.h"
 #include "xml/repr.h"
@@ -1278,23 +1278,23 @@
             style->line_height.value = style->line_height.computed;
             break;
         case SP_CSS_UNIT_PT:
-            style->line_height.computed += zby * PT_PER_PX;
+            style->line_height.computed += zby * Inkscape::Util::Quantity::convert(1, "px", "pt");
             style->line_height.value = style->line_height.computed;
             break;
         case SP_CSS_UNIT_PC:
-            style->line_height.computed += zby * (PT_PER_PX / 12);
+            style->line_height.computed += zby * (Inkscape::Util::Quantity::convert(1, "px", "pt") / 12);
             style->line_height.value = style->line_height.computed;
             break;
         case SP_CSS_UNIT_MM:
-            style->line_height.computed += zby * MM_PER_PX;
+            style->line_height.computed += zby * Inkscape::Util::Quantity::convert(1, "px", "mm");
             style->line_height.value = style->line_height.computed;
             break;
         case SP_CSS_UNIT_CM:
-            style->line_height.computed += zby * CM_PER_PX;
+            style->line_height.computed += zby * Inkscape::Util::Quantity::convert(1, "px", "cm");
             style->line_height.value = style->line_height.computed;
             break;
         case SP_CSS_UNIT_IN:
-            style->line_height.computed += zby * IN_PER_PX;
+            style->line_height.computed += zby * Inkscape::Util::Quantity::convert(1, "px", "in");
             style->line_height.value = style->line_height.computed;
             break;
     }
 
=== modified file 'src/ui/CMakeLists.txt'
--- src/ui/CMakeLists.txt	2013-07-23 10:54:01 +0000
+++ src/ui/CMakeLists.txt	2013-08-06 18:46:25 +0000
@@ -112,6 +112,7 @@
 	widget/text.cpp
 	widget/tolerance-slider.cpp
 	widget/unit-menu.cpp
+	widget/unit-tracker.cpp
 
 	view/view.cpp
 	view/view-widget.cpp
@@ -240,6 +241,7 @@
 	widget/text.h
 	widget/tolerance-slider.h
 	widget/unit-menu.h
+	widget/unit-tracker.h
 
 	view/edit-widget-interface.h
 	view/view-widget.h
 
=== modified file 'src/ui/clipboard.cpp'
--- src/ui/clipboard.cpp	2013-04-21 00:16:01 +0000
+++ src/ui/clipboard.cpp	2013-08-06 18:46:25 +0000
@@ -79,7 +79,7 @@
 #include "text-editing.h"
 #include "tools-switch.h"
 #include "path-chemistry.h"
-#include "unit-constants.h"
+#include "util/units.h"
 #include "helper/png-write.h"
 #include "svg/svg-color.h"
 #include "sp-namedview.h"
@@ -1078,14 +1078,14 @@
     try {
         if (out == outlist.end() && target == "image/png")
         {
-            gdouble dpi = PX_PER_IN;
+            gdouble dpi = Inkscape::Util::Quantity::convert(1, "in", "px");
             guint32 bgcolor = 0x00000000;
 
             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 / PX_PER_IN + 0.5);
-            unsigned long int height = (unsigned long int) (area.height() * dpi / PX_PER_IN + 0.5);
+            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);
 
             // read from namedview
             Inkscape::XML::Node *nv = sp_repr_lookup_name (_clipboardSPDoc->rroot, "sodipodi:namedview");
 
=== modified file 'src/ui/dialog/clonetiler.cpp'
--- src/ui/dialog/clonetiler.cpp	2013-03-29 11:00:19 +0000
+++ src/ui/dialog/clonetiler.cpp	2013-08-06 18:46:25 +0000
@@ -34,8 +34,8 @@
 #include "document.h"
 #include "document-undo.h"
 #include "filter-chemistry.h"
-#include "helper/unit-menu.h"
-#include "helper/units.h"
+#include "ui/widget/unit-menu.h"
+#include "util/units.h"
 #include "helper/window.h"
 #include "inkscape.h"
 #include "interface.h"
@@ -58,6 +58,7 @@
 #include "sp-root.h"
 
 using Inkscape::DocumentUndo;
+using Inkscape::Util::unit_table;
 
 namespace Inkscape {
 namespace UI {
@@ -1092,35 +1093,36 @@
                 g_object_set_data (G_OBJECT(dlg), "widthheight", (gpointer) hb);
 
                 // unitmenu
-                GtkWidget *u = sp_unit_selector_new (SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE);
-                sp_unit_selector_set_unit (SP_UNIT_SELECTOR(u), sp_desktop_namedview(SP_ACTIVE_DESKTOP)->doc_units);
+                unit_menu = new Inkscape::UI::Widget::UnitMenu();
+                unit_menu->setUnitType(Inkscape::Util::UNIT_TYPE_LINEAR);
+                unit_menu->setUnit(sp_desktop_namedview(SP_ACTIVE_DESKTOP)->doc_units->abbr);
+                unitChangedConn = unit_menu->signal_changed().connect(sigc::mem_fun(*this, &CloneTiler::clonetiler_unit_changed));
 
                 {
                     // Width spinbutton
 #if WITH_GTKMM_3_0
-                    Glib::RefPtr<Gtk::Adjustment> a = Gtk::Adjustment::create(0.0, -1e6, 1e6, 1.0, 10.0, 0);
+                    fill_width = Gtk::Adjustment::create(0.0, -1e6, 1e6, 1.0, 10.0, 0);
 #else
-                    Gtk::Adjustment *a = new Gtk::Adjustment (0.0, -1e6, 1e6, 1.0, 10.0, 0);
+                    fill_width = new Gtk::Adjustment (0.0, -1e6, 1e6, 1.0, 10.0, 0);
 #endif
-                    sp_unit_selector_add_adjustment (SP_UNIT_SELECTOR (u), GTK_ADJUSTMENT (a->gobj()));
 
                     double value = prefs->getDouble(prefs_path + "fillwidth", 50.0);
-                    SPUnit const &unit = *sp_unit_selector_get_unit(SP_UNIT_SELECTOR(u));
-                    gdouble const units = sp_pixels_get_units (value, unit);
-                    a->set_value (units);
+                    Inkscape::Util::Unit const unit = unit_menu->getUnit();
+                    gdouble const units = Inkscape::Util::Quantity::convert(value, "px", unit);
+                    fill_width->set_value (units);
 
 #if WITH_GTKMM_3_0
-                    Inkscape::UI::Widget::SpinButton *e = new Inkscape::UI::Widget::SpinButton(a, 1.0, 2);
+                    Inkscape::UI::Widget::SpinButton *e = new Inkscape::UI::Widget::SpinButton(fill_width, 1.0, 2);
 #else
-                    Inkscape::UI::Widget::SpinButton *e = new Inkscape::UI::Widget::SpinButton (*a, 1.0, 2);
+                    Inkscape::UI::Widget::SpinButton *e = new Inkscape::UI::Widget::SpinButton (*fill_width, 1.0, 2);
 #endif
                     e->set_tooltip_text (_("Width of the rectangle to be filled"));
                     e->set_width_chars (7);
                     e->set_digits (4);
                     gtk_box_pack_start (GTK_BOX (hb), GTK_WIDGET(e->gobj()), TRUE, TRUE, 0);
                     // TODO: C++ification
-            g_signal_connect(G_OBJECT(a->gobj()), "value_changed",
-                                       G_CALLBACK(clonetiler_fill_width_changed), u);
+            g_signal_connect(G_OBJECT(fill_width->gobj()), "value_changed",
+                                       G_CALLBACK(clonetiler_fill_width_changed), unit_menu);
                 }
                 {
                     GtkWidget *l = gtk_label_new ("");
@@ -1132,32 +1134,31 @@
                 {
                     // Height spinbutton
 #if WITH_GTKMM_3_0
-                    Glib::RefPtr<Gtk::Adjustment> a = Gtk::Adjustment::create(0.0, -1e6, 1e6, 1.0, 10.0, 0);
+                    fill_height = Gtk::Adjustment::create(0.0, -1e6, 1e6, 1.0, 10.0, 0);
 #else
-                    Gtk::Adjustment *a = new Gtk::Adjustment (0.0, -1e6, 1e6, 1.0, 10.0, 0);
+                    fill_height = new Gtk::Adjustment (0.0, -1e6, 1e6, 1.0, 10.0, 0);
 #endif
-                    sp_unit_selector_add_adjustment (SP_UNIT_SELECTOR (u), GTK_ADJUSTMENT (a->gobj()));
 
                     double value = prefs->getDouble(prefs_path + "fillheight", 50.0);
-                    SPUnit const &unit = *sp_unit_selector_get_unit(SP_UNIT_SELECTOR(u));
-                    gdouble const units = sp_pixels_get_units (value, unit);
-                    a->set_value (units);
+                    Inkscape::Util::Unit const unit = unit_menu->getUnit();
+                    gdouble const units = Inkscape::Util::Quantity::convert(value, "px", unit);
+                    fill_height->set_value (units);
 
 #if WITH_GTKMM_3_0
-                    Inkscape::UI::Widget::SpinButton *e = new Inkscape::UI::Widget::SpinButton(a, 1.0, 2);
+                    Inkscape::UI::Widget::SpinButton *e = new Inkscape::UI::Widget::SpinButton(fill_height, 1.0, 2);
 #else
-                    Inkscape::UI::Widget::SpinButton *e = new Inkscape::UI::Widget::SpinButton (*a, 1.0, 2);
+                    Inkscape::UI::Widget::SpinButton *e = new Inkscape::UI::Widget::SpinButton (*fill_height, 1.0, 2);
 #endif
                     e->set_tooltip_text (_("Height of the rectangle to be filled"));
                     e->set_width_chars (7);
                     e->set_digits (4);
                     gtk_box_pack_start (GTK_BOX (hb), GTK_WIDGET(e->gobj()), TRUE, TRUE, 0);
                     // TODO: C++ification
-            g_signal_connect(G_OBJECT(a->gobj()), "value_changed",
-                                       G_CALLBACK(clonetiler_fill_height_changed), u);
+            g_signal_connect(G_OBJECT(fill_height->gobj()), "value_changed",
+                                       G_CALLBACK(clonetiler_fill_height_changed), unit_menu);
                 }
 
-                gtk_box_pack_start (GTK_BOX (hb), u, TRUE, TRUE, 0);
+                gtk_box_pack_start (GTK_BOX (hb), (GtkWidget*) unit_menu->gobj(), TRUE, TRUE, 0);
                 clonetiler_table_attach (table, hb, 0.0, 2, 2);
 
             }
@@ -2944,26 +2945,39 @@
 
 
 
-void CloneTiler::clonetiler_fill_width_changed(GtkAdjustment *adj, GtkWidget *u)
+void CloneTiler::clonetiler_fill_width_changed(GtkAdjustment *adj, Inkscape::UI::Widget::UnitMenu *u)
 {
     gdouble const raw_dist = gtk_adjustment_get_value (adj);
-    SPUnit const &unit = *sp_unit_selector_get_unit(SP_UNIT_SELECTOR(u));
-    gdouble const pixels = sp_units_get_pixels (raw_dist, unit);
+    Inkscape::Util::Unit const unit = u->getUnit();
+    gdouble const pixels = Inkscape::Util::Quantity::convert(raw_dist, unit, "px");
 
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     prefs->setDouble(prefs_path + "fillwidth", pixels);
 }
 
-void CloneTiler::clonetiler_fill_height_changed(GtkAdjustment *adj, GtkWidget *u)
+void CloneTiler::clonetiler_fill_height_changed(GtkAdjustment *adj, Inkscape::UI::Widget::UnitMenu *u)
 {
     gdouble const raw_dist = gtk_adjustment_get_value (adj);
-    SPUnit const &unit = *sp_unit_selector_get_unit(SP_UNIT_SELECTOR(u));
-    gdouble const pixels = sp_units_get_pixels (raw_dist, unit);
+    Inkscape::Util::Unit const unit = u->getUnit();
+    gdouble const pixels = Inkscape::Util::Quantity::convert(raw_dist, unit, "px");
 
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     prefs->setDouble(prefs_path + "fillheight", pixels);
 }
 
+void CloneTiler::clonetiler_unit_changed()
+{
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    gdouble width_pixels = prefs->getDouble(prefs_path + "fillwidth");
+    gdouble height_pixels = prefs->getDouble(prefs_path + "fillheight");
+    
+    Inkscape::Util::Unit unit = unit_menu->getUnit();
+    
+    gdouble width_value = Inkscape::Util::Quantity::convert(width_pixels, "px", unit);
+    gdouble height_value = Inkscape::Util::Quantity::convert(height_pixels, "px", unit);
+    gtk_adjustment_set_value(fill_width->gobj(), width_value);
+    gtk_adjustment_set_value(fill_height->gobj(), height_value);
+}
 
 void CloneTiler::clonetiler_do_pick_toggled(GtkToggleButton *tb, GtkWidget *dlg)
 {
@@ -2977,7 +2991,6 @@
     }
 }
 
-
 }
 }
 }
 
=== modified file 'src/ui/dialog/clonetiler.h'
--- src/ui/dialog/clonetiler.h	2013-03-29 11:00:19 +0000
+++ src/ui/dialog/clonetiler.h	2013-08-06 18:46:25 +0000
@@ -19,6 +19,11 @@
 
 namespace Inkscape {
 namespace UI {
+
+namespace Widget {
+    class UnitMenu;
+}
+
 namespace Dialog {
 
 class CloneTiler : public Widget::Panel {
@@ -45,8 +50,9 @@
     static void clonetiler_do_pick_toggled(GtkToggleButton *tb, GtkWidget *dlg);
     static void clonetiler_pick_to(GtkToggleButton *tb, gpointer data);
     static void clonetiler_xy_changed(GtkAdjustment *adj, gpointer data);
-    static void clonetiler_fill_width_changed(GtkAdjustment *adj, GtkWidget *u);
-    static void clonetiler_fill_height_changed(GtkAdjustment *adj, GtkWidget *u);
+    static void clonetiler_fill_width_changed(GtkAdjustment *adj, Inkscape::UI::Widget::UnitMenu *u);
+    static void clonetiler_fill_height_changed(GtkAdjustment *adj, Inkscape::UI::Widget::UnitMenu *u);
+    void clonetiler_unit_changed();
     static void clonetiler_switch_to_create(GtkToggleButton */*tb*/, GtkWidget *dlg);
     static void clonetiler_switch_to_fill(GtkToggleButton */*tb*/, GtkWidget *dlg);
     static void clonetiler_keep_bbox_toggled(GtkToggleButton *tb, gpointer /*data*/);
@@ -112,12 +118,22 @@
     DesktopTracker deskTrack;
     Inkscape::UI::Widget::ColorPicker *color_picker;
     GtkSizeGroup* table_row_labels;
+    Inkscape::UI::Widget::UnitMenu *unit_menu;
+
+#if WITH_GTKMM_3_0
+    Glib::RefPtr<Gtk::Adjustment> fill_width;
+    Glib::RefPtr<Gtk::Adjustment> fill_height;
+#else
+    Gtk::Adjustment *fill_width;
+    Gtk::Adjustment *fill_height;
+#endif
 
     sigc::connection desktopChangeConn;
     sigc::connection selectChangedConn;
     sigc::connection subselChangedConn;
     sigc::connection selectModifiedConn;
     sigc::connection color_changed_connection;
+    sigc::connection unitChangedConn;
 
     /**
      * Can be invoked for setting the desktop. Currently not used.
 
=== modified file 'src/ui/dialog/document-properties.cpp'
--- src/ui/dialog/document-properties.cpp	2013-03-16 19:42:47 +0000
+++ src/ui/dialog/document-properties.cpp	2013-08-06 18:46:25 +0000
@@ -28,7 +28,6 @@
 #include "document.h"
 #include "desktop-handles.h"
 #include "desktop.h"
-#include "helper/units.h"
 #include "inkscape.h"
 #include "io/sys.h"
 #include "preferences.h"
@@ -1432,7 +1431,7 @@
     _rcb_shad.setActive (nv->showpageshadow);
 
     if (nv->doc_units)
-        _rum_deflt.setUnit (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();
 
=== modified file 'src/ui/dialog/export.cpp'
--- src/ui/dialog/export.cpp	2013-06-06 13:44:11 +0000
+++ src/ui/dialog/export.cpp	2013-08-06 18:46:25 +0000
@@ -48,9 +48,8 @@
 #include <glibmm/i18n.h>
 #include <glibmm/miscutils.h>
 
-#include "helper/unit-menu.h"
-#include "helper/units.h"
-#include "unit-constants.h"
+#include "ui/widget/unit-menu.h"
+#include "util/units.h"
 #include "helper/window.h"
 #include "inkscape-private.h"
 #include "document.h"
@@ -98,7 +97,7 @@
 
 #define SP_EXPORT_MIN_SIZE 1.0
 
-#define DPI_BASE PX_PER_IN
+#define DPI_BASE Inkscape::Util::Quantity::convert(1, "in", "px")
 
 #define EXPORT_COORD_PRECISION 3
 
@@ -108,6 +107,8 @@
 #include "verbs.h"
 #include "export.h"
 
+using Inkscape::Util::unit_table;
+
 namespace {
 
 class MessageCleaner
@@ -198,10 +199,13 @@
         /* Units box */
         /* gets added to the vbox later, but the unit selector is needed
            earlier than that */
-        unit_selector = Glib::wrap(sp_unit_selector_new (SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE));
+        unit_selector = new Inkscape::UI::Widget::UnitMenu();
+        unit_selector->setUnitType(Inkscape::Util::UNIT_TYPE_LINEAR);
+        unitChangedConn = unit_selector->signal_changed().connect(sigc::mem_fun(*this, &Export::onUnitChanged));
+        
         SPDesktop *desktop = SP_ACTIVE_DESKTOP;
         if (desktop)
-            sp_unit_selector_set_unit (SP_UNIT_SELECTOR(unit_selector->gobj()), sp_desktop_namedview(desktop)->doc_units);
+            unit_selector->setUnit(sp_desktop_namedview(desktop)->doc_units->abbr);
         unitbox.pack_end(*unit_selector, false, false, 0);
         unitbox.pack_end(units_label, false, false, 3);
 
@@ -226,28 +230,28 @@
         t->set_col_spacings (4);
 #endif
 
-        x0_adj = createSpinbutton ( "x0", 0.0, -1000000.0, 1000000.0, 0.1, 1.0, unit_selector->gobj(),
+        x0_adj = createSpinbutton ( "x0", 0.0, -1000000.0, 1000000.0, 0.1, 1.0, ((Gtk::Widget*) unit_selector)->gobj(),
                                    t, 0, 0, _("_x0:"), "", EXPORT_COORD_PRECISION, 1,
                                    &Export::onAreaX0Change);
 
-        x1_adj = createSpinbutton ( "x1", 0.0, -1000000.0, 1000000.0, 0.1, 1.0, unit_selector->gobj(),
+        x1_adj = createSpinbutton ( "x1", 0.0, -1000000.0, 1000000.0, 0.1, 1.0, ((Gtk::Widget*) unit_selector)->gobj(),
                                    t, 0, 1, _("x_1:"), "", EXPORT_COORD_PRECISION, 1,
                                    &Export::onAreaX1Change);
 
         width_adj = createSpinbutton ( "width", 0.0, 0.0, PNG_UINT_31_MAX, 0.1, 1.0,
-                                   unit_selector->gobj(), t, 0, 2, _("Wid_th:"), "", EXPORT_COORD_PRECISION, 1,
+                                   ((Gtk::Widget*) unit_selector)->gobj(), t, 0, 2, _("Wid_th:"), "", EXPORT_COORD_PRECISION, 1,
                                    &Export::onAreaWidthChange);
 
-        y0_adj = createSpinbutton ( "y0", 0.0, -1000000.0, 1000000.0, 0.1, 1.0, unit_selector->gobj(),
+        y0_adj = createSpinbutton ( "y0", 0.0, -1000000.0, 1000000.0, 0.1, 1.0, ((Gtk::Widget*) unit_selector)->gobj(),
                                    t, 2, 0, _("_y0:"), "", EXPORT_COORD_PRECISION, 1,
                                    &Export::onAreaY0Change);
 
-        y1_adj = createSpinbutton ( "y1", 0.0, -1000000.0, 1000000.0, 0.1, 1.0, unit_selector->gobj(),
+        y1_adj = createSpinbutton ( "y1", 0.0, -1000000.0, 1000000.0, 0.1, 1.0, ((Gtk::Widget*) unit_selector)->gobj(),
                                    t, 2, 1, _("y_1:"), "", EXPORT_COORD_PRECISION, 1,
                                    &Export::onAreaY1Change);
 
         height_adj = createSpinbutton ( "height", 0.0, 0.0, PNG_UINT_31_MAX, 0.1, 1.0,
-                                   unit_selector->gobj(), t, 2, 2, _("Hei_ght:"), "", EXPORT_COORD_PRECISION, 1,
+                                   ((Gtk::Widget*) unit_selector)->gobj(), t, 2, 2, _("Hei_ght:"), "", EXPORT_COORD_PRECISION, 1,
                                    &Export::onAreaHeightChange);
 
         area_box.pack_start(togglebox, false, false, 3);
@@ -496,9 +500,6 @@
 #else
     Gtk::Adjustment *adj = new Gtk::Adjustment  ( val, min, max, step, page, 0 );
 #endif
-    if (us) {
-        sp_unit_selector_add_adjustment ( SP_UNIT_SELECTOR (us), GTK_ADJUSTMENT (adj->gobj()) );
-    }
 
     int pos = 0;
     Gtk::Label *l = NULL;
@@ -979,6 +980,12 @@
     return path;
 }
 
+// Called when unit is changed
+void Export::onUnitChanged()
+{
+    onAreaToggled();
+}
+
 void Export::onHideExceptSelected ()
 {
     prefs->setBool("/dialogs/export/hideexceptselected/value", hide_export.get_active());
@@ -1042,8 +1049,8 @@
 
             Geom::OptRect area = item->desktopVisualBounds();
             if (area) {
-                gint width = (gint) (area->width() * dpi / PX_PER_IN + 0.5);
-                gint height = (gint) (area->height() * dpi / PX_PER_IN + 0.5);
+                gint width = (gint) (area->width() * dpi / DPI_BASE + 0.5);
+                gint height = (gint) (area->height() * dpi / DPI_BASE + 0.5);
 
                 if (width > 1 && height > 1) {
                     // Do export
@@ -1507,10 +1514,6 @@
         return;
     }
 
-    if (sp_unit_selector_update_test(SP_UNIT_SELECTOR(unit_selector->gobj()))) {
-        return;
-    }
-
     update = true;
 
     x0 = getValuePx(x0_adj);
@@ -1554,10 +1557,6 @@
         return;
     }
 
-    if (sp_unit_selector_update_test (SP_UNIT_SELECTOR(unit_selector->gobj())))  {
-        return;
-    }
-
     update = true;
 
     y0 = getValuePx(y0_adj);
@@ -1597,10 +1596,6 @@
         return;
     }
 
-    if (sp_unit_selector_update_test(reinterpret_cast<SPUnitSelector *>(unit_selector->gobj()))) {
-        return;
-    }
-
     update = true;
 
     float x0 = getValuePx(x0_adj);
@@ -1630,10 +1625,6 @@
         return;
     }
 
-    if (sp_unit_selector_update_test(reinterpret_cast<SPUnitSelector *>(unit_selector->gobj()))) {
-        return;
-    }
-
     update = true;
 
     float y0 = getValuePx(y0_adj);
@@ -1709,10 +1700,6 @@
         return;
     }
 
-    if (sp_unit_selector_update_test(SP_UNIT_SELECTOR(unit_selector->gobj()))) {
-       return;
-    }
-
     update = true;
 
     x0 = getValuePx(x0_adj);
@@ -1743,10 +1730,6 @@
         return;
     }
 
-    if (sp_unit_selector_update_test(SP_UNIT_SELECTOR(unit_selector->gobj()))) {
-       return;
-    }
-
     update = true;
 
     y0 = getValuePx(y0_adj);
@@ -1803,10 +1786,6 @@
         return;
     }
 
-    if (sp_unit_selector_update_test(SP_UNIT_SELECTOR(unit_selector->gobj()))) {
-       return;
-    }
-
     update = true;
 
     x0 = getValuePx(x0_adj);
@@ -1905,9 +1884,9 @@
 void Export::setValuePx( Gtk::Adjustment *adj, double val)
 #endif
 {
-    const SPUnit *unit = sp_unit_selector_get_unit(SP_UNIT_SELECTOR(unit_selector->gobj()) );
+    const Unit unit = unit_selector->getUnit();
 
-    setValue(adj, sp_pixels_get_units (val, *unit));
+    setValue(adj, Inkscape::Util::Quantity::convert(val, "px", unit));
 
     return;
 }
@@ -1955,9 +1934,9 @@
 #endif
 {
     float value = getValue( adj);
-    const SPUnit *unit = sp_unit_selector_get_unit(SP_UNIT_SELECTOR(unit_selector->gobj()));
+    const Unit unit = unit_selector->getUnit();
 
-    return sp_units_get_pixels (value, *unit);
+    return Inkscape::Util::Quantity::convert(value, unit, "px");
 } // end of sp_export_value_get_px()
 
 /**
 
=== modified file 'src/ui/dialog/export.h'
--- src/ui/dialog/export.h	2013-03-16 12:20:26 +0000
+++ src/ui/dialog/export.h	2013-08-06 18:46:25 +0000
@@ -172,6 +172,11 @@
 #endif
 
     /**
+     * Unit changed callback
+     */
+    void onUnitChanged();
+
+    /**
      * Hide except selected callback
      */
     void onHideExceptSelected ();
@@ -330,7 +335,7 @@
 
     /* Unit selector widgets */
     Gtk::HBox unitbox;
-    Gtk::Widget* unit_selector;
+    Inkscape::UI::Widget::UnitMenu *unit_selector;
     Gtk::Label units_label;
 
     /* Filename widgets  */
@@ -365,6 +370,7 @@
     sigc::connection selectChangedConn;
     sigc::connection subselChangedConn;
     sigc::connection selectModifiedConn;
+    sigc::connection unitChangedConn;
 
 };
 
 
=== modified file 'src/ui/dialog/guides.cpp'
--- src/ui/dialog/guides.cpp	2013-03-09 17:43:14 +0000
+++ src/ui/dialog/guides.cpp	2013-08-06 18:46:25 +0000
@@ -230,7 +230,7 @@
     _unit_menu.setUnitType(UNIT_TYPE_LINEAR);
     _unit_menu.setUnit("px");
     if (_desktop->namedview->doc_units) {
-        _unit_menu.setUnit( sp_unit_get_abbreviation(_desktop->namedview->doc_units) );
+        _unit_menu.setUnit( _desktop->namedview->doc_units->abbr );
     }
     _spin_angle.setUnit(_angle_unit_status);
 
 
=== modified file 'src/ui/dialog/inkscape-preferences.cpp'
--- src/ui/dialog/inkscape-preferences.cpp	2013-05-13 06:27:27 +0000
+++ src/ui/dialog/inkscape-preferences.cpp	2013-08-06 18:46:25 +0000
@@ -28,7 +28,7 @@
 #include "preferences.h"
 #include "verbs.h"
 #include "selcue.h"
-#include "unit-constants.h"
+#include "util/units.h"
 #include <iostream>
 #include "enums.h"
 #include "desktop-handles.h"
@@ -1428,10 +1428,10 @@
                            _("Automatically reload linked images when file is changed on disk"));
     _misc_bitmap_editor.init("/options/bitmapeditor/value", true);
     _page_bitmaps.add_line( false, _("_Bitmap editor:"), _misc_bitmap_editor, "", "", true);
-    _importexport_export_res.init("/dialogs/export/defaultxdpi/value", 0.0, 6000.0, 1.0, 1.0, PX_PER_IN, true, false);
+    _importexport_export_res.init("/dialogs/export/defaultxdpi/value", 0.0, 6000.0, 1.0, 1.0, Inkscape::Util::Quantity::convert(1, "in", "px"), true, false);
     _page_bitmaps.add_line( false, _("Default export _resolution:"), _importexport_export_res, _("dpi"),
                             _("Default bitmap resolution (in dots per inch) in the Export dialog"), false);
-    _bitmap_copy_res.init("/options/createbitmap/resolution", 1.0, 6000.0, 1.0, 1.0, PX_PER_IN, true, false);
+    _bitmap_copy_res.init("/options/createbitmap/resolution", 1.0, 6000.0, 1.0, 1.0, Inkscape::Util::Quantity::convert(1, "in", "px"), true, false);
     _page_bitmaps.add_line( false, _("Resolution for Create Bitmap _Copy:"), _bitmap_copy_res, _("dpi"),
                             _("Resolution used by the Create Bitmap Copy command"), false);
     {
@@ -1443,7 +1443,7 @@
         _bitmap_import_quality.init("/dialogs/import/quality", 1, 100, 1, 1, 100, true, false);
         _page_bitmaps.add_line( false, _("Bitmap import quality:"), _bitmap_import_quality, "%", "Bitmap import quality (jpeg only). 100 is best quality", false);
     }
-    _importexport_import_res.init("/dialogs/import/defaultxdpi/value", 0.0, 6000.0, 1.0, 1.0, PX_PER_IN, true, false);
+    _importexport_import_res.init("/dialogs/import/defaultxdpi/value", 0.0, 6000.0, 1.0, 1.0, Inkscape::Util::Quantity::convert(1, "in", "px"), true, false);
     _page_bitmaps.add_line( false, _("Default _import resolution:"), _importexport_import_res, _("dpi"),
                             _("Default bitmap resolution (in dots per inch) for bitmap import"), false);
     _importexport_import_res_override.init(_("Override file resolution"), "/dialogs/import/forcexdpi", false);
 
=== modified file 'src/ui/dialog/print.cpp'
--- src/ui/dialog/print.cpp	2012-10-28 14:10:22 +0000
+++ src/ui/dialog/print.cpp	2013-08-06 18:46:25 +0000
@@ -26,7 +26,7 @@
 #include "ui/widget/rendering-options.h"
 #include "document.h"
 
-#include "unit-constants.h"
+#include "util/units.h"
 #include "helper/png-write.h"
 #include "svg/svg-color.h"
 #include "io/sys.h"
@@ -72,8 +72,8 @@
 
             sp_export_png_file(junk->_doc, tmp_png.c_str(), 0.0, 0.0,
                 width, height,
-                (unsigned long)(width * dpi / PX_PER_IN),
-                (unsigned long)(height * dpi / PX_PER_IN),
+                (unsigned long)(width * dpi / Inkscape::Util::Quantity::convert(1, "in", "px")),
+                (unsigned long)(height * dpi / Inkscape::Util::Quantity::convert(1, "in", "px")),
                 dpi, dpi, bgcolor, NULL, NULL, true, NULL);
 
             // This doesn't seem to work:
@@ -90,7 +90,7 @@
                 cairo_t *cr = gtk_print_context_get_cairo_context (context);
                 cairo_matrix_t m;
                 cairo_get_matrix(cr, &m);
-                cairo_scale(cr, PT_PER_IN / dpi, PT_PER_IN / dpi);
+                cairo_scale(cr, Inkscape::Util::Quantity::convert(1, "in", "pt") / dpi, Inkscape::Util::Quantity::convert(1, "in", "pt") / dpi);
                 // FIXME: why is the origin offset??
                 cairo_set_source_surface(cr, png->cobj(), -16.0, -16.0);
                 cairo_paint(cr);
@@ -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() * PT_PER_PX;
-    gdouble doc_height = _doc->getHeight() * PT_PER_PX;
+    gdouble doc_width = _doc->getWidth() * Inkscape::Util::Quantity::convert(1, "px", "pt");
+    gdouble doc_height = _doc->getHeight() * Inkscape::Util::Quantity::convert(1, "px", "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-04-28 18:38:55 +0000
+++ src/ui/dialog/text-edit.cpp	2013-08-06 18:46:25 +0000
@@ -58,7 +58,7 @@
 #include "widgets/font-selector.h"
 #include <glibmm/i18n.h>
 #include <glibmm/markup.h>
-#include "unit-constants.h"
+#include "util/units.h"
 #include "sp-textpath.h"
 
 namespace Inkscape {
@@ -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) * PT_PER_PX;
+    double pt_size = sp_style_css_size_units_to_px(sp_font_selector_get_size(fsel), unit) * Inkscape::Util::Quantity::convert(1, "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/tool/node.cpp'
--- src/ui/tool/node.cpp	2012-10-13 21:38:45 +0000
+++ src/ui/tool/node.cpp	2013-08-06 18:46:25 +0000
@@ -22,7 +22,6 @@
 #include "preferences.h"
 #include "snap.h"
 #include "snap-preferences.h"
-#include "sp-metrics.h"
 #include "sp-namedview.h"
 #include "ui/control-manager.h"
 #include "ui/tool/control-point-selection.h"
@@ -490,9 +489,13 @@
     double angle = Geom::angle_between(Geom::Point(-1,0), position() - _parent->position());
     angle += M_PI; // angle is (-M_PI...M_PI] - offset by +pi and scale to 0...360
     angle *= 360.0 / (2 * M_PI);
-    GString *x = SP_PX_TO_METRIC_STRING(dist[Geom::X], _desktop->namedview->getDefaultMetric());
-    GString *y = SP_PX_TO_METRIC_STRING(dist[Geom::Y], _desktop->namedview->getDefaultMetric());
-    GString *len = SP_PX_TO_METRIC_STRING(length(), _desktop->namedview->getDefaultMetric());
+    
+    Inkscape::Util::Quantity x_q = Inkscape::Util::Quantity(dist[Geom::X], "px");
+    Inkscape::Util::Quantity y_q = Inkscape::Util::Quantity(dist[Geom::Y], "px");
+    Inkscape::Util::Quantity len_q = Inkscape::Util::Quantity(length(), "px");
+    GString *x = g_string_new(x_q.string(*_desktop->namedview->doc_units).c_str());
+    GString *y = g_string_new(y_q.string(*_desktop->namedview->doc_units).c_str());
+    GString *len = g_string_new(len_q.string(*_desktop->namedview->doc_units).c_str());
     Glib::ustring ret = format_tip(C_("Path handle tip",
         "Move handle by %s, %s; angle %.2f°, length %s"), x->str, y->str, angle, len->str);
     g_string_free(x, TRUE);
@@ -1294,8 +1297,11 @@
 Glib::ustring Node::_getDragTip(GdkEventMotion */*event*/) const
 {
     Geom::Point dist = position() - _last_drag_origin();
-    GString *x = SP_PX_TO_METRIC_STRING(dist[Geom::X], _desktop->namedview->getDefaultMetric());
-    GString *y = SP_PX_TO_METRIC_STRING(dist[Geom::Y], _desktop->namedview->getDefaultMetric());
+    
+    Inkscape::Util::Quantity x_q = Inkscape::Util::Quantity(dist[Geom::X], "px");
+    Inkscape::Util::Quantity y_q = Inkscape::Util::Quantity(dist[Geom::Y], "px");
+    GString *x = g_string_new(x_q.string(*_desktop->namedview->doc_units).c_str());
+    GString *y = g_string_new(y_q.string(*_desktop->namedview->doc_units).c_str());
     Glib::ustring ret = format_tip(C_("Path node tip", "Move node by %s, %s"),
         x->str, y->str);
     g_string_free(x, TRUE);
 
=== modified file 'src/ui/widget/Makefile_insert'
--- src/ui/widget/Makefile_insert	2013-01-08 12:06:44 +0000
+++ src/ui/widget/Makefile_insert	2013-08-06 18:46:25 +0000
@@ -79,5 +79,7 @@
 	ui/widget/tolerance-slider.cpp  \
 	ui/widget/tolerance-slider.h    \
 	ui/widget/unit-menu.cpp		\
-	ui/widget/unit-menu.h
+	ui/widget/unit-menu.h \
+	ui/widget/unit-tracker.h \
+	ui/widget/unit-tracker.cpp
 
 
=== modified file 'src/ui/widget/page-sizer.cpp'
--- src/ui/widget/page-sizer.cpp	2013-07-01 20:04:32 +0000
+++ src/ui/widget/page-sizer.cpp	2013-08-06 18:46:25 +0000
@@ -37,7 +37,7 @@
 #include "desktop.h"
 #include "helper/action.h"
 #include "helper/action-context.h"
-#include "helper/units.h"
+#include "util/units.h"
 #include "inkscape.h"
 #include "sp-namedview.h"
 #include "sp-root.h"
@@ -48,6 +48,7 @@
 #include "xml/repr.h"
 
 using std::pair;
+using Inkscape::Util::unit_table;
 
 namespace Inkscape {
 namespace UI {
@@ -96,7 +97,7 @@
     char const * const name;  //name
     double const smaller;     //lesser dimension
     double const larger;      //greater dimension
-    SPUnitId const unit;      //units
+    Glib::ustring const unit;      //units
 };
 
 // list of page formats that should be in landscape automatically
@@ -114,31 +115,31 @@
 }
 
 static PaperSizeRec const inkscape_papers[] = {
-    { "A4",                210,  297, SP_UNIT_MM },
-    { "US Letter",         8.5,   11, SP_UNIT_IN },
-    { "US Legal",          8.5,   14, SP_UNIT_IN },
-    { "US Executive",     7.25, 10.5, SP_UNIT_IN },
-    { "A0",                841, 1189, SP_UNIT_MM },
-    { "A1",                594,  841, SP_UNIT_MM },
-    { "A2",                420,  594, SP_UNIT_MM },
-    { "A3",                297,  420, SP_UNIT_MM },
-    { "A5",                148,  210, SP_UNIT_MM },
-    { "A6",                105,  148, SP_UNIT_MM },
-    { "A7",                 74,  105, SP_UNIT_MM },
-    { "A8",                 52,   74, SP_UNIT_MM },
-    { "A9",                 37,   52, SP_UNIT_MM },
-    { "A10",                26,   37, SP_UNIT_MM },
-    { "B0",               1000, 1414, SP_UNIT_MM },
-    { "B1",                707, 1000, SP_UNIT_MM },
-    { "B2",                500,  707, SP_UNIT_MM },
-    { "B3",                353,  500, SP_UNIT_MM },
-    { "B4",                250,  353, SP_UNIT_MM },
-    { "B5",                176,  250, SP_UNIT_MM },
-    { "B6",                125,  176, SP_UNIT_MM },
-    { "B7",                 88,  125, SP_UNIT_MM },
-    { "B8",                 62,   88, SP_UNIT_MM },
-    { "B9",                 44,   62, SP_UNIT_MM },
-    { "B10",                31,   44, SP_UNIT_MM },
+    { "A4",                210,  297, "mm" },
+    { "US Letter",         8.5,   11, "in" },
+    { "US Legal",          8.5,   14, "in" },
+    { "US Executive",     7.25, 10.5, "in" },
+    { "A0",                841, 1189, "mm" },
+    { "A1",                594,  841, "mm" },
+    { "A2",                420,  594, "mm" },
+    { "A3",                297,  420, "mm" },
+    { "A5",                148,  210, "mm" },
+    { "A6",                105,  148, "mm" },
+    { "A7",                 74,  105, "mm" },
+    { "A8",                 52,   74, "mm" },
+    { "A9",                 37,   52, "mm" },
+    { "A10",                26,   37, "mm" },
+    { "B0",               1000, 1414, "mm" },
+    { "B1",                707, 1000, "mm" },
+    { "B2",                500,  707, "mm" },
+    { "B3",                353,  500, "mm" },
+    { "B4",                250,  353, "mm" },
+    { "B5",                176,  250, "mm" },
+    { "B6",                125,  176, "mm" },
+    { "B7",                 88,  125, "mm" },
+    { "B8",                 62,   88, "mm" },
+    { "B9",                 44,   62, "mm" },
+    { "B10",                31,   44, "mm" },
 
 
 
@@ -150,63 +151,63 @@
          don't know what D and E series are used for.
          */
 
-    { "C0",                917, 1297, SP_UNIT_MM },
-    { "C1",                648,  917, SP_UNIT_MM },
-    { "C2",                458,  648, SP_UNIT_MM },
-    { "C3",                324,  458, SP_UNIT_MM },
-    { "C4",                229,  324, SP_UNIT_MM },
-    { "C5",                162,  229, SP_UNIT_MM },
-    { "C6",                114,  162, SP_UNIT_MM },
-    { "C7",                 81,  114, SP_UNIT_MM },
-    { "C8",                 57,   81, SP_UNIT_MM },
-    { "C9",                 40,   57, SP_UNIT_MM },
-    { "C10",                28,   40, SP_UNIT_MM },
-    { "D1",                545,  771, SP_UNIT_MM },
-    { "D2",                385,  545, SP_UNIT_MM },
-    { "D3",                272,  385, SP_UNIT_MM },
-    { "D4",                192,  272, SP_UNIT_MM },
-    { "D5",                136,  192, SP_UNIT_MM },
-    { "D6",                 96,  136, SP_UNIT_MM },
-    { "D7",                 68,   96, SP_UNIT_MM },
-    { "E3",                400,  560, SP_UNIT_MM },
-    { "E4",                280,  400, SP_UNIT_MM },
-    { "E5",                200,  280, SP_UNIT_MM },
-    { "E6",                140,  200, SP_UNIT_MM },
+    { "C0",                917, 1297, "mm" },
+    { "C1",                648,  917, "mm" },
+    { "C2",                458,  648, "mm" },
+    { "C3",                324,  458, "mm" },
+    { "C4",                229,  324, "mm" },
+    { "C5",                162,  229, "mm" },
+    { "C6",                114,  162, "mm" },
+    { "C7",                 81,  114, "mm" },
+    { "C8",                 57,   81, "mm" },
+    { "C9",                 40,   57, "mm" },
+    { "C10",                28,   40, "mm" },
+    { "D1",                545,  771, "mm" },
+    { "D2",                385,  545, "mm" },
+    { "D3",                272,  385, "mm" },
+    { "D4",                192,  272, "mm" },
+    { "D5",                136,  192, "mm" },
+    { "D6",                 96,  136, "mm" },
+    { "D7",                 68,   96, "mm" },
+    { "E3",                400,  560, "mm" },
+    { "E4",                280,  400, "mm" },
+    { "E5",                200,  280, "mm" },
+    { "E6",                140,  200, "mm" },
 //#endif
 
 
 
-    { "CSE",               462,  649, SP_UNIT_PT },
-    { "US #10 Envelope", 4.125,  9.5, SP_UNIT_IN },
+    { "CSE",               462,  649, "pt" },
+    { "US #10 Envelope", 4.125,  9.5, "in" },
     /* See http://www.hbp.com/content/PCR_envelopes.cfm for a much larger list of US envelope
        sizes. */
-    { "DL Envelope",       110,  220, SP_UNIT_MM },
-    { "Ledger/Tabloid",     11,   17, SP_UNIT_IN },
+    { "DL Envelope",       110,  220, "mm" },
+    { "Ledger/Tabloid",     11,   17, "in" },
     /* Note that `Folio' (used in QPrinter/KPrinter) is deliberately absent from this list, as it
        means different sizes to different people: different people may expect the width to be
        either 8, 8.25 or 8.5 inches, and the height to be either 13 or 13.5 inches, even
        restricting our interpretation to foolscap folio.  If you wish to introduce a folio-like
        page size to the list, then please consider using a name more specific than just `Folio' or
        `Foolscap Folio'. */
-    { "Banner 468x60",      60,  468, SP_UNIT_PX },
-    { "Icon 16x16",         16,   16, SP_UNIT_PX },
-    { "Icon 32x32",         32,   32, SP_UNIT_PX },
-    { "Icon 48x48",         48,   48, SP_UNIT_PX },
+    { "Banner 468x60",      60,  468, "px" },
+    { "Icon 16x16",         16,   16, "px" },
+    { "Icon 32x32",         32,   32, "px" },
+    { "Icon 48x48",         48,   48, "px" },
     /* business cards */
-    { "Business Card (ISO 7810)", 53.98, 85.60, SP_UNIT_MM },
-    { "Business Card (US)",             2,     3.5,  SP_UNIT_IN },
-    { "Business Card (Europe)",        55,    85,    SP_UNIT_MM },
-    { "Business Card (Aus/NZ)",        55,    90,    SP_UNIT_MM },
+    { "Business Card (ISO 7810)", 53.98, 85.60, "mm" },
+    { "Business Card (US)",             2,     3.5,  "in" },
+    { "Business Card (Europe)",        55,    85,    "mm" },
+    { "Business Card (Aus/NZ)",        55,    90,    "mm" },
 
     // Start Arch Series List
 
 
-    { "Arch A",         9,    12,    SP_UNIT_IN },  // 229 x 305 mm
-    { "Arch B",        12,    18,    SP_UNIT_IN },  // 305 x 457 mm
-    { "Arch C",        18,    24,    SP_UNIT_IN },  // 457 x 610 mm
-    { "Arch D",        24,    36,    SP_UNIT_IN },  // 610 x 914 mm
-    { "Arch E",        36,    48,    SP_UNIT_IN },  // 914 x 1219 mm
-    { "Arch E1",       30,    42,    SP_UNIT_IN },  // 762 x 1067 mm
+    { "Arch A",         9,    12,    "in" },  // 229 x 305 mm
+    { "Arch B",        12,    18,    "in" },  // 305 x 457 mm
+    { "Arch C",        18,    24,    "in" },  // 457 x 610 mm
+    { "Arch D",        24,    36,    "in" },  // 610 x 914 mm
+    { "Arch E",        36,    48,    "in" },  // 914 x 1219 mm
+    { "Arch E1",       30,    42,    "in" },  // 762 x 1067 mm
 
     /*
      * The above list of Arch sizes were taken from the following site:
@@ -217,7 +218,7 @@
      * September 2009 - DAK
      */
 
-    { NULL,                     0,    0, SP_UNIT_PX },
+    { NULL,                     0,    0, "px" },
 };
 
 
@@ -226,10 +227,6 @@
 //# P A G E    S I Z E R
 //########################################################################
 
-//The default unit for this widget and its calculations
-static const SPUnit _px_unit = sp_unit_get_by_id (SP_UNIT_PX);
-
-
 /**
  * Constructor
  */
@@ -280,13 +277,8 @@
         char formatBuf[80];
         snprintf(formatBuf, 79, "%0.1f x %0.1f", p->smaller, p->larger);
         Glib::ustring desc = formatBuf;
-        if (p->unit == SP_UNIT_IN)
-            desc.append(" in");
-        else if (p->unit == SP_UNIT_MM)
-             desc.append(" mm");
-        else if (p->unit == SP_UNIT_PX)
-            desc.append(" px");
-        PaperSize paper(name, p->smaller, p->larger, p->unit);
+        desc.append(" " + p->unit);
+        PaperSize paper(name, p->smaller, p->larger, unit_table.getUnit(p->unit));
         _paperSizeTable[name] = paper;
         Gtk::TreeModel::Row row = *(_paperSizeListStore->append());
         row[_paperSizeListColumns.nameColumn] = name;
@@ -320,9 +312,9 @@
     SPNamedView *nv = sp_desktop_namedview(dt);
     _wr.setUpdating (true);
     if (nv->units) {
-        _dimensionUnits.setUnit(nv->units);
+        _dimensionUnits.setUnit(nv->units->abbr);
     } else if (nv->doc_units) {
-        _dimensionUnits.setUnit(nv->doc_units);
+        _dimensionUnits.setUnit(nv->doc_units->abbr);
     }
     _wr.setUpdating (false);
     
@@ -484,8 +476,8 @@
     if (SP_ACTIVE_DESKTOP && !_widgetRegistry->isUpdating()) {
         SPDocument *doc = sp_desktop_document(SP_ACTIVE_DESKTOP);
         double const old_height = doc->getHeight();
-        doc->setWidth (w, &_px_unit);
-        doc->setHeight (h, &_px_unit);
+        doc->setWidth (Inkscape::Util::Quantity(w, "px"));
+        doc->setHeight (Inkscape::Util::Quantity(h, "px"));
         // 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)));
@@ -569,9 +561,9 @@
     for (iter = _paperSizeTable.begin() ;
          iter != _paperSizeTable.end() ; ++iter) {
         PaperSize paper = iter->second;
-        SPUnit const &i_unit = sp_unit_get_by_id(paper.unit);
-        double smallX = sp_units_get_pixels(paper.smaller, i_unit);
-        double largeX = sp_units_get_pixels(paper.larger,  i_unit);
+        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");
 
         g_return_val_if_fail(smallX <= largeX, _paperSizeListStore->children().end());
 
@@ -662,9 +654,8 @@
         _landscape = _landscapeButton.get_active();
     }
 
-    SPUnit const &src_unit = sp_unit_get_by_id (paper.unit);
-    sp_convert_distance (&w, &src_unit, &_px_unit);
-    sp_convert_distance (&h, &src_unit, &_px_unit);
+    w = Inkscape::Util::Quantity::convert(w, paper.unit, "px");
+    h = Inkscape::Util::Quantity::convert(h, paper.unit, "px");
 
     if (_landscape)
         setDim (h, w, false);
 
=== modified file 'src/ui/widget/page-sizer.h'
--- src/ui/widget/page-sizer.h	2012-12-16 11:57:38 +0000
+++ src/ui/widget/page-sizer.h	2013-08-06 18:46:25 +0000
@@ -18,7 +18,7 @@
 #include "ui/widget/registered-widget.h"
 #include <sigc++/sigc++.h>
 
-#include "helper/units.h"
+#include "util/units.h"
 
 #include <gtkmm/alignment.h>
 #include <gtkmm/expander.h>
@@ -64,7 +64,7 @@
     PaperSize(const Glib::ustring &nameArg,
 	          double smallerArg,
 	          double largerArg,
-			  SPUnitId unitArg)
+			  Inkscape::Util::Unit unitArg)
 	    {
 	    name    = nameArg;
 	    smaller = smallerArg;
@@ -108,7 +108,7 @@
     /**
      * The units (px, pt, mm, etc) of this specification
      */	     
-    SPUnitId unit;
+    Inkscape::Util::Unit unit;
 
 private:
 
@@ -117,7 +117,7 @@
 	    name    = "";
 	    smaller = 0.0;
 	    larger  = 0.0;
-	    unit    = SP_UNIT_PX;
+	    unit    = unit_table.getUnit("px");
 	    }
 
 	void assign(const PaperSize &other)
 
=== modified file 'src/ui/widget/registered-widget.cpp'
--- src/ui/widget/registered-widget.cpp	2012-04-28 15:49:30 +0000
+++ src/ui/widget/registered-widget.cpp	2013-08-06 18:46:25 +0000
@@ -27,7 +27,6 @@
 #include "ui/widget/random.h"
 #include "widgets/spinbutton-events.h"
 
-#include "helper/units.h"
 #include "xml/repr.h"
 #include "svg/svg-color.h"
 #include "svg/stringstream.h"
@@ -118,9 +117,9 @@
 }
 
 void
-RegisteredUnitMenu::setUnit (const SPUnit* unit)
+RegisteredUnitMenu::setUnit (Glib::ustring unit)
 {
-    getUnitMenu()->setUnit (sp_unit_get_abbreviation (unit));
+    getUnitMenu()->setUnit(unit);
 }
 
 void
 
=== modified file 'src/ui/widget/registered-widget.h'
--- src/ui/widget/registered-widget.h	2013-08-03 20:45:01 +0000
+++ src/ui/widget/registered-widget.h	2013-08-06 18:46:25 +0000
@@ -32,7 +32,6 @@
 
 #include <gtkmm/checkbutton.h>
 
-struct SPUnit;
 class SPDocument;
 
 namespace Gtk {
@@ -167,7 +166,7 @@
                          Inkscape::XML::Node* repr_in = NULL,
                          SPDocument *doc_in = NULL );
 
-    void setUnit (const SPUnit*);
+    void setUnit (const Glib::ustring);
     Unit getUnit() const { return static_cast<UnitMenu*>(_widget)->getUnit(); };
     UnitMenu* getUnitMenu() const { return static_cast<UnitMenu*>(_widget); };
     sigc::connection _changed_connection;
 
=== modified file 'src/ui/widget/rendering-options.cpp'
--- src/ui/widget/rendering-options.cpp	2013-03-25 17:42:31 +0000
+++ src/ui/widget/rendering-options.cpp	2013-08-06 18:46:25 +0000
@@ -13,7 +13,7 @@
 #endif
 
 #include "rendering-options.h"
-#include "unit-constants.h"
+#include "util/units.h"
 #include <glibmm/i18n.h>
 
 namespace Inkscape {
@@ -59,8 +59,8 @@
     _radio_bitmap.signal_toggled().connect(sigc::mem_fun(*this, &RenderingOptions::_toggled));
 
     // configure default DPI
-    _dpi.setRange(PT_PER_IN,2400.0);
-    _dpi.setValue(PT_PER_IN);
+    _dpi.setRange(Inkscape::Util::Quantity::convert(1, "in", "pt"),2400.0);
+    _dpi.setValue(Inkscape::Util::Quantity::convert(1, "in", "pt"));
     _dpi.setIncrements(1.0,10.0);
     _dpi.setDigits(0);
     _dpi.update();
 
=== modified file 'src/ui/widget/scalar-unit.cpp'
--- src/ui/widget/scalar-unit.cpp	2011-10-27 04:55:51 +0000
+++ src/ui/widget/scalar-unit.cpp	2013-08-06 18:46:25 +0000
@@ -16,6 +16,8 @@
 #include "scalar-unit.h"
 #include "spinbutton.h"
 
+using Inkscape::Util::unit_table;
+
 namespace Inkscape {
 namespace UI {
 namespace Widget {
@@ -226,9 +228,8 @@
     Glib::ustring abbr = _unit_menu->getUnitAbbr();
     _suffix->set_label(abbr);
 
-    Inkscape::Util::UnitTable &table = _unit_menu->getUnitTable();
-    Inkscape::Util::Unit new_unit = (table.getUnit(abbr));
-    Inkscape::Util::Unit old_unit = (table.getUnit(lastUnits));
+    Inkscape::Util::Unit new_unit = (unit_table.getUnit(abbr));
+    Inkscape::Util::Unit old_unit = (unit_table.getUnit(lastUnits));
 
     double convertedVal = 0;
     if (old_unit.type == UNIT_TYPE_DIMENSIONLESS && new_unit.type == UNIT_TYPE_LINEAR) {
 
=== modified file 'src/ui/widget/selected-style.cpp'
--- src/ui/widget/selected-style.cpp	2013-03-09 13:24:32 +0000
+++ src/ui/widget/selected-style.cpp	2013-08-06 18:46:25 +0000
@@ -50,6 +50,9 @@
 #include "pixmaps/cursor-adj-a.xpm"
 #include "sp-cursor.h"
 #include "gradient-chemistry.h"
+#include "util/units.h"
+
+using Inkscape::Util::unit_table;
 
 static gdouble const _sw_presets[]     = { 32 ,  16 ,  10 ,  8 ,  6 ,  4 ,  3 ,  2 ,  1.5 ,  1 ,  0.75 ,  0.5 ,  0.25 ,  0.1 };
 static gchar const *const _sw_presets_str[] = {"32", "16", "10", "8", "6", "4", "3", "2", "1.5", "1", "0.75", "0.5", "0.25", "0.1"};
@@ -306,15 +309,17 @@
     {
         int row = 0;
 
-        // List of units should match with Fill/Stroke dialog stroke style width list
-        for (GSList *l = sp_unit_get_list(SP_UNIT_ABSOLUTE | SP_UNIT_DEVICE); l != NULL; l = l->next) {
-            SPUnit const *u = static_cast<SPUnit*>(l->data);
+        Inkscape::Util::UnitTable::UnitMap m = unit_table.units(Inkscape::Util::UNIT_TYPE_LINEAR);
+        Inkscape::Util::UnitTable::UnitMap::iterator iter = m.begin();
+        while(iter != m.end()) {
             Gtk::RadioMenuItem *mi = Gtk::manage(new Gtk::RadioMenuItem(_sw_group));
-            mi->add(*(new Gtk::Label(u->abbr, 0.0, 0.5)));
+            mi->add(*(new Gtk::Label((*iter).first, 0.0, 0.5)));
             _unit_mis = g_slist_append(_unit_mis, mi);
-            mi->signal_activate().connect(sigc::bind<SPUnitId>(sigc::mem_fun(*this, &SelectedStyle::on_popup_units), u->unit_id));
+            Inkscape::Util::Unit const *u = new Inkscape::Util::Unit(unit_table.getUnit(iter->first));
+            mi->signal_activate().connect(sigc::bind<Inkscape::Util::Unit>(sigc::mem_fun(*this, &SelectedStyle::on_popup_units), *u));
             _popup_sw.attach(*mi, 0,1, row, row+1);
             row++;
+            ++iter;
         }
 
         _popup_sw.attach(*(new Gtk::SeparatorMenuItem()), 0,1, row, row+1);
@@ -476,13 +481,13 @@
             this )
     ));
 
-    _sw_unit = const_cast<SPUnit*>(sp_desktop_namedview(desktop)->doc_units);