![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/sp-tspan.cpp b/src/sp-tspan.cpp
index f07783dbefe7db75ce65c4ac636f4d57d616c39d..a767ab1949e2d80aacecf526cfd39d132529592e 100644 (file)
--- a/src/sp-tspan.cpp
+++ b/src/sp-tspan.cpp
# include "config.h"
#endif
+#include <glibmm/i18n.h>
+
#include <livarot/Path.h>
#include "svg/stringstream.h"
#include "attributes.h"
#include "sp-use-reference.h"
#include "sp-tspan.h"
+#include "sp-tref.h"
#include "sp-textpath.h"
#include "text-editing.h"
#include "style.h"
#include "libnr/nr-matrix-fns.h"
#include "xml/repr.h"
+#include "document.h"
/*#####################################################
static void sp_tspan_modified(SPObject *object, unsigned flags);
static void sp_tspan_bbox(SPItem const *item, NRRect *bbox, NR::Matrix const &transform, unsigned const flags);
static Inkscape::XML::Node *sp_tspan_write(SPObject *object, Inkscape::XML::Node *repr, guint flags);
+static char *sp_tspan_description (SPItem *item);
static SPItemClass *tspan_parent_class;
sp_object_class->write = sp_tspan_write;
item_class->bbox = sp_tspan_bbox;
+ item_class->description = sp_tspan_description;
}
static void
SPTSpan *tspan = SP_TSPAN(object);
if (tspan->attributes.readSingleAttribute(key, value)) {
- if (tspan->role != SP_TSPAN_ROLE_LINE)
- object->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
+ object->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG);
} else {
switch (key) {
case SP_ATTR_SODIPODI_ROLE:
@@ -208,7 +213,7 @@ static void sp_tspan_bbox(SPItem const *item, NRRect *bbox, NR::Matrix const &tr
// Add stroke width
SPStyle* style=SP_OBJECT_STYLE (item);
- if (style->stroke.type != SP_PAINT_TYPE_NONE) {
+ if (!style->stroke.isNone()) {
double const scale = expansion(transform);
if ( fabs(style->stroke_width.computed * scale) > 0.01 ) { // sinon c'est 0=oon veut pas de bord
double const width = MAX(0.125, style->stroke_width.computed * scale);
sp_tspan_write(SPObject *object, Inkscape::XML::Node *repr, guint flags)
{
SPTSpan *tspan = SP_TSPAN(object);
+ Inkscape::XML::Document *xml_doc = sp_document_repr_doc(SP_OBJECT_DOCUMENT(object));
if ((flags & SP_OBJECT_WRITE_BUILD) && !repr) {
- repr = sp_repr_new("svg:tspan");
+ repr = xml_doc->createElement("svg:tspan");
}
tspan->attributes.writeTo(repr);
GSList *l = NULL;
for (SPObject* child = sp_object_first_child(object) ; child != NULL ; child = SP_OBJECT_NEXT(child) ) {
Inkscape::XML::Node* c_repr=NULL;
- if ( SP_IS_TSPAN(child) ) {
+ if ( SP_IS_TSPAN(child) || SP_IS_TREF(child) ) {
c_repr = child->updateRepr(NULL, flags);
} else if ( SP_IS_TEXTPATH(child) ) {
//c_repr = child->updateRepr(NULL, flags); // shouldn't happen
} else if ( SP_IS_STRING(child) ) {
- c_repr = sp_repr_new_text(SP_STRING(child)->string.c_str());
+ c_repr = xml_doc->createTextNode(SP_STRING(child)->string.c_str());
}
if ( c_repr ) l = g_slist_prepend(l, c_repr);
}
}
} else {
for (SPObject* child = sp_object_first_child(object) ; child != NULL ; child = SP_OBJECT_NEXT(child) ) {
- if ( SP_IS_TSPAN(child) ) {
+ if ( SP_IS_TSPAN(child) || SP_IS_TREF(child) ) {
child->updateRepr(flags);
} else if ( SP_IS_TEXTPATH(child) ) {
//c_repr = child->updateRepr(NULL, flags); // shouldn't happen
return repr;
}
+static char *
+sp_tspan_description(SPItem *item)
+{
+ g_return_val_if_fail(SP_IS_TSPAN(item), NULL);
+
+ return g_strdup(_("<b>Text span</b>"));
+}
+
+
/*#####################################################
# SPTEXTPATH
#####################################################*/
}
if ( no_content ) {
- Inkscape::XML::Node* rch = sp_repr_new_text("");
+ Inkscape::XML::Document *xml_doc = sp_document_repr_doc(doc);
+ Inkscape::XML::Node* rch = xml_doc->createTextNode("");
repr->addChild(rch, NULL);
}
tp->sourcePath->sourceDirty=false;
// finalisons
- if ( tp->sourcePath->originalPath ) {
+ if ( tp->sourcePath->originalPath ) {
if (tp->originalPath) {
delete tp->originalPath;
}
sp_textpath_write(SPObject *object, Inkscape::XML::Node *repr, guint flags)
{
SPTextPath *textpath = SP_TEXTPATH(object);
+ Inkscape::XML::Document *xml_doc = sp_document_repr_doc(SP_OBJECT_DOCUMENT(object));
if ((flags & SP_OBJECT_WRITE_BUILD) && !repr) {
- repr = sp_repr_new("svg:textPath");
+ repr = xml_doc->createElement("svg:textPath");
}
textpath->attributes.writeTo(repr);
GSList *l = NULL;
for (SPObject* child = sp_object_first_child(object) ; child != NULL ; child = SP_OBJECT_NEXT(child) ) {
Inkscape::XML::Node* c_repr=NULL;
- if ( SP_IS_TSPAN(child) ) {
+ if ( SP_IS_TSPAN(child) || SP_IS_TREF(child) ) {
c_repr = child->updateRepr(NULL, flags);
} else if ( SP_IS_TEXTPATH(child) ) {
//c_repr = child->updateRepr(NULL, flags); // shouldn't happen
} else if ( SP_IS_STRING(child) ) {
- c_repr = sp_repr_new_text(SP_STRING(child)->string.c_str());
+ c_repr = xml_doc->createTextNode(SP_STRING(child)->string.c_str());
}
if ( c_repr ) l = g_slist_prepend(l, c_repr);
}
}
} else {
for (SPObject* child = sp_object_first_child(object) ; child != NULL ; child = SP_OBJECT_NEXT(child) ) {
- if ( SP_IS_TSPAN(child) ) {
+ if ( SP_IS_TSPAN(child) || SP_IS_TREF(child) ) {
child->updateRepr(flags);
} else if ( SP_IS_TEXTPATH(child) ) {
//c_repr = child->updateRepr(NULL, flags); // shouldn't happen
for ( GSList *i = tp_reprs ; i ; i = i->next ) {
// make a copy of each textpath child
- Inkscape::XML::Node *copy = ((Inkscape::XML::Node *) i->data)->duplicate();
+ Inkscape::XML::Node *copy = ((Inkscape::XML::Node *) i->data)->duplicate(SP_OBJECT_REPR(text)->document());
// remove the old repr from under textpath
- SP_OBJECT_REPR(tp)->removeChild((Inkscape::XML::Node *) i->data);
+ SP_OBJECT_REPR(tp)->removeChild((Inkscape::XML::Node *) i->data);
// put its copy into under textPath
SP_OBJECT_REPR(text)->addChild(copy, NULL); // fixme: copy id
}
tp->deleteObject();
g_slist_free(tp_reprs);
- // set x/y on text
+ // set x/y on text
/* fixme: Yuck, is this really the right test? */
if (xy[NR::X] != 1e18 && xy[NR::Y] != 1e18) {
sp_repr_set_svg_double(SP_OBJECT_REPR(text), "x", xy[NR::X]);