summaryrefslogtreecommitdiffstats
path: root/share/attributes
diff options
context:
space:
mode:
authorJabiertxof <jtx@jtx>2017-01-24 14:16:06 +0000
committerJabiertxof <jtx@jtx>2017-01-24 14:16:06 +0000
commitb25ebda10578c5d697db9716e3c2b70950d33e45 (patch)
tree4635b8b3f65600cfd54b5465b906ae42165b0674 /share/attributes
parentFix some bugs (diff)
parentfix nodes reverting back during editing (diff)
downloadinkscape-b25ebda10578c5d697db9716e3c2b70950d33e45.tar.gz
inkscape-b25ebda10578c5d697db9716e3c2b70950d33e45.zip
fixing to new trunk
(bzr r15142.1.38)
Diffstat (limited to 'share/attributes')
-rw-r--r--share/attributes/CMakeLists.txt2
-rw-r--r--share/attributes/cssprops2
-rwxr-xr-xshare/attributes/genMapDataCSS.pl2
3 files changed, 3 insertions, 3 deletions
diff --git a/share/attributes/CMakeLists.txt b/share/attributes/CMakeLists.txt
index 9b6b0de0a..7235a5ef0 100644
--- a/share/attributes/CMakeLists.txt
+++ b/share/attributes/CMakeLists.txt
@@ -1,2 +1,2 @@
set(_FILES "svgprops" "cssprops" "css_defaults" "README")
-install(FILES ${_FILES} DESTINATION ${SHARE_INSTALL}/inkscape/attributes)
+install(FILES ${_FILES} DESTINATION ${INKSCAPE_SHARE_INSTALL}/attributes)
diff --git a/share/attributes/cssprops b/share/attributes/cssprops
index fb7397c4e..5e796235e 100644
--- a/share/attributes/cssprops
+++ b/share/attributes/cssprops
@@ -86,7 +86,7 @@
"lighting-color" - "feDiffuseLighting","feSpecularLighting"
-"line-height" - "text","flowRoot","flowPara"
+"line-height" - "text","tspan","flowRoot","flowPara"
"marker" - "path","line","polyline","polygon","a","defs","glyph","g","marker","mask","missing-glyph","pattern","svg","switch","symbol","use"
diff --git a/share/attributes/genMapDataCSS.pl b/share/attributes/genMapDataCSS.pl
index 46b0dd120..a6f432a47 100755
--- a/share/attributes/genMapDataCSS.pl
+++ b/share/attributes/genMapDataCSS.pl
@@ -173,7 +173,7 @@ $properties{ "marker-mid" }->{inherit} = $properties{ "marker-start" }->{inherit
# Inkscape uses CSS property 'line-height' even though this is not part of SVG spec.
-push @{$properties{ "line-height" }->{elements}}, "text", "flowRoot", "flowPara";
+push @{$properties{ "line-height" }->{elements}}, "text", "tspan", "flowRoot", "flowPara";
$properties{ "line-height" }->{default} = "NO DEFAULT";
$properties{ "line-height" }->{inherit} = "no";