diff options
| author | Shlomi Fish <shlomif@shlomifish.org> | 2017-01-03 23:18:39 +0000 |
|---|---|---|
| committer | Shlomi Fish <shlomif@shlomifish.org> | 2017-01-03 23:18:39 +0000 |
| commit | 20124f96375afdfbf8ab58b6090db95ba0d2687b (patch) | |
| tree | 0f7e003dd9707b751c3b51e7b8133a21437ead95 /share/attributes | |
| parent | Merged. (diff) | |
| parent | Fix build on Windows (see http://inkscape.13.x6.nabble.com/compile-error-on-W... (diff) | |
| download | inkscape-20124f96375afdfbf8ab58b6090db95ba0d2687b.tar.gz inkscape-20124f96375afdfbf8ab58b6090db95ba0d2687b.zip | |
Merged.
(bzr r15369.1.5)
Diffstat (limited to 'share/attributes')
| -rw-r--r-- | share/attributes/cssprops | 2 | ||||
| -rwxr-xr-x | share/attributes/genMapDataCSS.pl | 2 |
2 files changed, 2 insertions, 2 deletions
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"; |