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


From 9a037bc21c8b98650bf5be4c4e8feaac0a067e2d Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Mon, 2 Feb 2015 11:49:18 +0100
Subject: Experimental mesh smoothing code.

(bzr r13890)
---
 src/attributes.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/attributes.cpp')

diff --git a/src/attributes.cpp b/src/attributes.cpp
index 81b12c658..0b18b80cf 100644
--- a/src/attributes.cpp
+++ b/src/attributes.cpp
@@ -291,6 +291,7 @@ static SPStyleProp const props[] = {
     {SP_ATTR_FY, "fy"},
     /* SPMeshPatch */
     {SP_ATTR_TENSOR, "tensor"},
+    {SP_ATTR_SMOOTH, "smooth"},
     /* SPPattern */
     {SP_ATTR_PATTERNUNITS, "patternUnits"},
     {SP_ATTR_PATTERNCONTENTUNITS, "patternContentUnits"},
-- 
cgit v1.2.3


From b5be22f5bd07ff14b7eade763fb9b6f755d1cf5c Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Sun, 1 Mar 2015 09:57:53 +0100
Subject: Rename <meshGradient> to <mesh>, <meshRow> to <meshrow>, <meshPatch>
 to <meshpatch>. Remove experimental smoothing types. Add new smoothing 'type'
 attribute with bicubic smoothing option. Per SVG WG decission at Sydney 2015
 face-to-face meeting.

(bzr r13956)
---
 src/attributes.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/attributes.cpp')

diff --git a/src/attributes.cpp b/src/attributes.cpp
index 0b18b80cf..3cf13d3f2 100644
--- a/src/attributes.cpp
+++ b/src/attributes.cpp
@@ -291,7 +291,7 @@ static SPStyleProp const props[] = {
     {SP_ATTR_FY, "fy"},
     /* SPMeshPatch */
     {SP_ATTR_TENSOR, "tensor"},
-    {SP_ATTR_SMOOTH, "smooth"},
+    {SP_ATTR_MESH_TYPE, "type"},
     /* SPPattern */
     {SP_ATTR_PATTERNUNITS, "patternUnits"},
     {SP_ATTR_PATTERNCONTENTUNITS, "patternContentUnits"},
-- 
cgit v1.2.3


From 77ef2ed0b37ba73bae12a602207499931a9edf13 Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Fri, 6 Mar 2015 15:11:29 +0100
Subject: Fix filter primitives using 'type' attribute. (Broken when 'type'
 attribute introduced on meshes.)

(bzr r13969)
---
 src/attributes.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/attributes.cpp')

diff --git a/src/attributes.cpp b/src/attributes.cpp
index 3cf13d3f2..568f0528a 100644
--- a/src/attributes.cpp
+++ b/src/attributes.cpp
@@ -291,7 +291,7 @@ static SPStyleProp const props[] = {
     {SP_ATTR_FY, "fy"},
     /* SPMeshPatch */
     {SP_ATTR_TENSOR, "tensor"},
-    {SP_ATTR_MESH_TYPE, "type"},
+    //{SP_ATTR_TYPE, "type"},
     /* SPPattern */
     {SP_ATTR_PATTERNUNITS, "patternUnits"},
     {SP_ATTR_PATTERNCONTENTUNITS, "patternContentUnits"},
-- 
cgit v1.2.3