From 374aa610cb550cf7dcd283ca93ad0ad844732d32 Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Mon, 5 Jan 2015 11:17:51 +0100
Subject: Implement SVG 1.1 textLength and textAdjust attributes. Code from
 Dmitry Kirsanov (buliabyak).

(bzr r13839)
---
 src/attributes.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/attributes.cpp')

diff --git a/src/attributes.cpp b/src/attributes.cpp
index 2b04843a7..f386832c7 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"},
-- 
cgit v1.2.3


From 4945f8e2b75648e4fec6b225d02ad83104601f5a Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Thu, 15 Jan 2015 17:57:00 +0100
Subject: Read properties for SVG 2 text in a shape.

(bzr r13852)
---
 src/attributes.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/attributes.cpp')

diff --git a/src/attributes.cpp b/src/attributes.cpp
index f386832c7..81b12c658 100644
--- a/src/attributes.cpp
+++ b/src/attributes.cpp
@@ -438,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"},
-- 
cgit v1.2.3