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


From e186cf544131e582a43316767257f199e6af986c Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Mon, 29 Sep 2014 16:21:07 +0200
Subject: Remove NRTypePosDef class and associated cruft. More direct CSS ->
 Pango translation.

(bzr r13341.1.233)
---
 src/sp-text.cpp | 1 -
 1 file changed, 1 deletion(-)

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

diff --git a/src/sp-text.cpp b/src/sp-text.cpp
index 3bb1e16d0..5489c68b0 100644
--- a/src/sp-text.cpp
+++ b/src/sp-text.cpp
@@ -30,7 +30,6 @@
 #include <2geom/affine.h>
 #include <libnrtype/FontFactory.h>
 #include <libnrtype/font-instance.h>
-#include <libnrtype/font-style-to-pos.h>
 
 #include <glibmm/i18n.h>
 #include "svg/svg.h"
-- 
cgit v1.2.3


From ce6f2248e1c89966448dbff61f4ca92090b6fb3c Mon Sep 17 00:00:00 2001
From: Tavmjong Bah <tavmjong@free.fr>
Date: Sun, 5 Oct 2014 12:18:25 +0200
Subject: More direct way of finding font-family in SPText::description.

(bzr r13341.1.243)
---
 src/sp-text.cpp | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

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

diff --git a/src/sp-text.cpp b/src/sp-text.cpp
index 5489c68b0..21d6a42f7 100644
--- a/src/sp-text.cpp
+++ b/src/sp-text.cpp
@@ -358,19 +358,7 @@ const char* SPText::displayName() const {
 gchar* SPText::description() const {
     SPStyle *style = this->style;
 
-    font_instance *tf = font_factory::Default()->FaceFromStyle(style);
-
-    char *n;
-
-    if (tf) {
-        char name_buf[256];
-        tf->Family(name_buf, sizeof(name_buf));
-        n = xml_quote_strdup(name_buf);
-        tf->Unref();
-    } else {
-        /* TRANSLATORS: For description of font with no name. */
-        n = g_strdup(_("&lt;no name found&gt;"));
-    }
+    char *n = xml_quote_strdup( style->font_family.value );
 
     Inkscape::Util::Quantity q = Inkscape::Util::Quantity(style->font_size.computed, "px");
     GString *xs = g_string_new(q.string(sp_desktop_namedview(SP_ACTIVE_DESKTOP)->doc_units).c_str());
-- 
cgit v1.2.3