summaryrefslogtreecommitdiffstats
path: root/src/style.cpp
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2016-05-08 07:40:39 +0000
committerjabiertxof <info@marker.es>2016-05-08 07:40:39 +0000
commitd9c43e3d6f19a2f1102743b61d999b477bba4b9a (patch)
treee77ac36155e0813318be3b9e7641338d86dac733 /src/style.cpp
parentFixing page transforms (diff)
parentfix-bug-734201. stroke-to-path doesn't scale stroke width used in markers (diff)
downloadinkscape-d9c43e3d6f19a2f1102743b61d999b477bba4b9a.tar.gz
inkscape-d9c43e3d6f19a2f1102743b61d999b477bba4b9a.zip
update to trunk
(bzr r13682.1.40)
Diffstat (limited to 'src/style.cpp')
-rw-r--r--src/style.cpp3
1 files changed, 2 insertions, 1 deletions
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;