From 962b4e5a31b1128cdb9dfcccac87e7449a3351f1 Mon Sep 17 00:00:00 2001
From: Alvin Penner <penner@vaxxine.com>
Date: Fri, 25 Jul 2014 17:23:13 -0400
Subject: refresh text objects when clipping (Bug 1339305)

Fixed bugs:
  - https://launchpad.net/bugs/1339305

(bzr r13470)
---
 src/sp-text.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/sp-text.cpp')

diff --git a/src/sp-text.cpp b/src/sp-text.cpp
index bbc7ec43d..9a7f0b7a0 100644
--- a/src/sp-text.cpp
+++ b/src/sp-text.cpp
@@ -278,6 +278,7 @@ Inkscape::XML::Node *SPText::write(Inkscape::XML::Document *xml_doc, Inkscape::X
     }
 
     this->attributes.writeTo(repr);
+    this->rebuildLayout();  // copied from update(), see LP Bug 1339305
 
     // deprecated attribute, but keep it around for backwards compatibility
     if (this->style->line_height.set && !this->style->line_height.inherit && !this->style->line_height.normal && this->style->line_height.unit == SP_CSS_UNIT_PERCENT) {
-- 
cgit v1.2.3


From 653be18705548ae8ab5a0358ecf77feca1b22e54 Mon Sep 17 00:00:00 2001
From: "Johan B. C. Engelen" <jbc.engelen@swissonline.ch>
Date: Mon, 28 Jul 2014 21:34:56 +0200
Subject: noop: remove commented-out code that is dangerous and should not come
 back

(bzr r13475)
---
 src/sp-text.cpp | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'src/sp-text.cpp')

diff --git a/src/sp-text.cpp b/src/sp-text.cpp
index 9a7f0b7a0..ccc5adf59 100644
--- a/src/sp-text.cpp
+++ b/src/sp-text.cpp
@@ -70,8 +70,6 @@ namespace {
 #  SPTEXT
 #####################################################*/
 SPText::SPText() : SPItem() {
-    //new (&this->layout) Inkscape::Text::Layout;
-    //new (&this->attributes) TextTagAttributes;
 }
 
 SPText::~SPText() {
@@ -90,9 +88,6 @@ void SPText::build(SPDocument *doc, Inkscape::XML::Node *repr) {
 }
 
 void SPText::release() {
-    //this->attributes.~TextTagAttributes();
-    //this->layout.~Layout();
-
     SPItem::release();
 }
 
-- 
cgit v1.2.3


From b7ebc313abd7f6aa501370d58ba54e6169e4218e Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Wed, 30 Jul 2014 10:31:31 +0200
Subject: Read CSS Text 3 'white-space' property, SVG 2 <text> 'width',
 'height' attributes.

(bzr r13341.1.110)
---
 src/sp-text.cpp | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

(limited to 'src/sp-text.cpp')

diff --git a/src/sp-text.cpp b/src/sp-text.cpp
index ccc5adf59..3bb1e16d0 100644
--- a/src/sp-text.cpp
+++ b/src/sp-text.cpp
@@ -82,6 +82,10 @@ void SPText::build(SPDocument *doc, Inkscape::XML::Node *repr) {
     this->readAttr( "dy" );
     this->readAttr( "rotate" );
 
+    // SVG 2 Auto wrapped text
+    this->readAttr( "width" );
+    this->readAttr( "height" );
+
     SPItem::build(doc, repr);
 
     this->readAttr( "sodipodi:linespacing" );    // has to happen after the styles are read
@@ -92,6 +96,8 @@ void SPText::release() {
 }
 
 void SPText::set(unsigned int key, const gchar* value) {
+    //std::cout << "SPText::set: " << sp_attribute_name( key ) << ": " << (value?value:"Null") << std::endl;
+
     if (this->attributes.readSingleAttribute(key, value)) {
         this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
     } else {
@@ -109,6 +115,22 @@ void SPText::set(unsigned int key, const gchar* value) {
                 this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG | SP_TEXT_LAYOUT_MODIFIED_FLAG);
                 break;
 
+            case SP_ATTR_WIDTH:
+                if (!this->width.read(value) || this->width.value < 0.0) {
+                    this->width.unset();
+                }
+
+                this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
+                break;
+
+            case SP_ATTR_HEIGHT:
+                if (!this->height.read(value) || this->height.value < 0.0) {
+                    this->height.unset();
+                }
+
+                this->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
+                break;
+
             default:
                 SPItem::set(key, value);
                 break;
@@ -284,6 +306,14 @@ Inkscape::XML::Node *SPText::write(Inkscape::XML::Document *xml_doc, Inkscape::X
         this->getRepr()->setAttribute("sodipodi:linespacing", NULL);
     }
 
+    // SVG 2 Auto-wrapped text
+    if( this->width.computed > 0.0 ) {
+        sp_repr_set_svg_double(repr, "width", this->width.computed);
+    }
+    if( this->height.computed > 0.0 ) {
+        sp_repr_set_svg_double(repr, "height", this->height.computed);
+    }
+
     SPItem::write(xml_doc, repr, flags);
 
     return repr;
-- 
cgit v1.2.3