summaryrefslogtreecommitdiffstats
path: root/src/attributes.cpp
diff options
context:
space:
mode:
authorJabier Arraiza Cenoz <jabier.arraiza@marker.es>2015-01-16 16:18:45 +0000
committerJabiertxof <jtx@jtx.marker.es>2015-01-16 16:18:45 +0000
commit03cb69220632b0c674efff5be3aab8be35d23eff (patch)
tree464a1f74c57b796604ceb38c1687d579d2891800 /src/attributes.cpp
parentupdate to trunk (diff)
parentTest implementation of 'shape-padding'. (diff)
downloadinkscape-03cb69220632b0c674efff5be3aab8be35d23eff.tar.gz
inkscape-03cb69220632b0c674efff5be3aab8be35d23eff.zip
update to trunk
(bzr r13708.1.7)
Diffstat (limited to 'src/attributes.cpp')
-rw-r--r--src/attributes.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/attributes.cpp b/src/attributes.cpp
index 2b04843a7..81b12c658 100644
--- a/src/attributes.cpp
+++ b/src/attributes.cpp
@@ -195,6 +195,8 @@ static SPStyleProp const props[] = {
{SP_ATTR_DX, "dx"},
{SP_ATTR_DY, "dy"},
{SP_ATTR_ROTATE, "rotate"},
+ {SP_ATTR_TEXTLENGTH, "textLength"},
+ {SP_ATTR_LENGTHADJUST, "lengthAdjust"},
{SP_ATTR_SODIPODI_ROLE, "sodipodi:role"},
/* SPText */
{SP_ATTR_SODIPODI_LINESPACING, "sodipodi:linespacing"},
@@ -436,6 +438,11 @@ static SPStyleProp const props[] = {
{SP_PROP_KERNING, "kerning"},
{SP_PROP_TEXT_ANCHOR, "text-anchor"},
{SP_PROP_WHITE_SPACE, "white-space"},
+ /* SVG 2 Text Wrapping */
+ {SP_PROP_SHAPE_INSIDE, "shape-inside"},
+ {SP_PROP_SHAPE_OUTSIDE, "shape-outside"},
+ {SP_PROP_SHAPE_PADDING, "shape-padding"},
+ {SP_PROP_SHAPE_MARGIN, "shape-margin"},
/* Text Decoration */
{SP_PROP_TEXT_DECORATION, "text-decoration"},
{SP_PROP_TEXT_DECORATION_LINE, "text-decoration-line"},