From e9890d9640d9bb5f7dc74b377f1b220dcb1bdd96 Mon Sep 17 00:00:00 2001 From: "Johan B. C. Engelen" Date: Fri, 4 Nov 2011 20:59:10 +0100 Subject: add missing units to grid length interpretation (we have 4 different unit conversions thingies in Inkscape! ...) Fixed bugs: - https://launchpad.net/bugs/885500 (bzr r10717) --- src/display/canvas-axonomgrid.cpp | 4 ++++ src/display/canvas-grid.cpp | 4 ++++ 2 files changed, 8 insertions(+) (limited to 'src') diff --git a/src/display/canvas-axonomgrid.cpp b/src/display/canvas-axonomgrid.cpp index 4cb050b6e..a669142d1 100644 --- a/src/display/canvas-axonomgrid.cpp +++ b/src/display/canvas-axonomgrid.cpp @@ -225,6 +225,10 @@ static gboolean sp_nv_read_length(gchar const *str, guint base, gdouble *val, SP *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; } diff --git a/src/display/canvas-grid.cpp b/src/display/canvas-grid.cpp index ee3b6fe5a..8428a277e 100644 --- a/src/display/canvas-grid.cpp +++ b/src/display/canvas-grid.cpp @@ -492,6 +492,10 @@ sp_nv_read_length(gchar const *str, guint base, gdouble *val, SPUnit const **uni *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; } -- cgit v1.2.3