From fd1988584d74008516463f33fc98e819ab838f9b Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Wed, 30 Mar 2016 20:58:46 +0200
Subject: Finish fixing bug 156221 ('line-height' with non-px scaling).

(bzr r14753)
---
 src/style.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/style.cpp')

diff --git a/src/style.cpp b/src/style.cpp
index 1f98a50a3..c24818f2a 100644
--- a/src/style.cpp
+++ b/src/style.cpp
@@ -1900,8 +1900,9 @@ sp_css_attr_scale_property_single(SPCSSAttr *css, gchar const *property,
         if (w == units) {// nothing converted, non-numeric value
             return;
         }
-        if (only_with_units && (units == NULL || *units == '\0' || *units == '%')) {
+        if (only_with_units && (units == NULL || *units == '\0' || *units == '%' || *units == 'e')) {
             // only_with_units, but no units found, so do nothing.
+            // 'e' matches 'em' or 'ex'
             return;
         }
         Inkscape::CSSOStringStream os;
-- 
cgit v1.2.3