![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/sp-flowtext.cpp b/src/sp-flowtext.cpp
index f54e60dab578434ba9160f32a9f2d75e044c494e..b01146d60a3797408a608e4f7f058e717e0aa9fc 100644 (file)
--- a/src/sp-flowtext.cpp
+++ b/src/sp-flowtext.cpp
# include "config.h"
#endif
#include <glibmm/i18n.h>
+#include <cstring>
+#include <string>
#include "attributes.h"
#include "xml/repr.h"
#include "selection.h"
#include "desktop-handles.h"
#include "desktop.h"
-#include "desktop-affine.h"
#include "xml/repr.h"
#include "sp-use.h"
#include "sp-rect.h"
#include "text-tag-attributes.h"
-
+#include "text-chemistry.h"
+#include "text-editing.h"
#include "livarot/Shape.h"
@@ -40,13 +42,14 @@ static void sp_flowtext_child_added(SPObject *object, Inkscape::XML::Node *child
static void sp_flowtext_remove_child(SPObject *object, Inkscape::XML::Node *child);
static void sp_flowtext_update(SPObject *object, SPCtx *ctx, guint flags);
static void sp_flowtext_modified(SPObject *object, guint flags);
-static Inkscape::XML::Node *sp_flowtext_write(SPObject *object, Inkscape::XML::Node *repr, guint flags);
+static Inkscape::XML::Node *sp_flowtext_write(SPObject *object, Inkscape::XML::Document *doc, Inkscape::XML::Node *repr, guint flags);
static void sp_flowtext_build(SPObject *object, SPDocument *document, Inkscape::XML::Node *repr);
static void sp_flowtext_set(SPObject *object, unsigned key, gchar const *value);
-static void sp_flowtext_bbox(SPItem const *item, NRRect *bbox, NR::Matrix const &transform, unsigned const flags);
+static void sp_flowtext_bbox(SPItem const *item, NRRect *bbox, Geom::Matrix const &transform, unsigned const flags);
static void sp_flowtext_print(SPItem *item, SPPrintContext *ctx);
static gchar *sp_flowtext_description(SPItem *item);
+static void sp_flowtext_snappoints(SPItem const *item, std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape::SnapPreferences const *snapprefs);
static NRArenaItem *sp_flowtext_show(SPItem *item, NRArena *arena, unsigned key, unsigned flags);
static void sp_flowtext_hide(SPItem *item, unsigned key);
item_class->bbox = sp_flowtext_bbox;
item_class->print = sp_flowtext_print;
item_class->description = sp_flowtext_description;
+ item_class->snappoints = sp_flowtext_snappoints;
item_class->show = sp_flowtext_show;
item_class->hide = sp_flowtext_hide;
}
group->rebuildLayout();
- // pass the bbox of the flowtext object as paintbox (used for paintserver fills)
NRRect paintbox;
- sp_item_invoke_bbox(group, &paintbox, NR::identity(), TRUE);
+ sp_item_invoke_bbox(group, &paintbox, Geom::identity(), TRUE);
for (SPItemView *v = group->display; v != NULL; v = v->next) {
group->_clearFlow(NR_ARENA_GROUP(v->arenaitem));
+ nr_arena_group_set_style(NR_ARENA_GROUP(v->arenaitem), SP_OBJECT_STYLE(object));
+ // pass the bbox of the flowtext object as paintbox (used for paintserver fills)
group->layout.show(NR_ARENA_GROUP(v->arenaitem), &paintbox);
}
}
if (flags & SP_OBJECT_MODIFIED_FLAG) flags |= SP_OBJECT_PARENT_MODIFIED_FLAG;
flags &= SP_OBJECT_MODIFIED_CASCADE;
+ // FIXME: the below stanza is copied over from sp_text_modified, consider factoring it out
+ if (flags & ( SP_OBJECT_STYLE_MODIFIED_FLAG )) {
+ SPFlowtext *text = SP_FLOWTEXT(object);
+ NRRect paintbox;
+ sp_item_invoke_bbox(text, &paintbox, Geom::identity(), TRUE);
+ for (SPItemView* v = text->display; v != NULL; v = v->next) {
+ text->_clearFlow(NR_ARENA_GROUP(v->arenaitem));
+ nr_arena_group_set_style(NR_ARENA_GROUP(v->arenaitem), SP_OBJECT_STYLE(object));
+ text->layout.show(NR_ARENA_GROUP(v->arenaitem), &paintbox);
+ }
+ }
+
for (SPObject *o = sp_object_first_child(SP_OBJECT(ft)) ; o != NULL ; o = SP_OBJECT_NEXT(o) ) {
if (SP_IS_FLOWREGION(o)) {
region = o;
}
static Inkscape::XML::Node *
-sp_flowtext_write(SPObject *object, Inkscape::XML::Node *repr, guint flags)
+sp_flowtext_write(SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags)
{
if ( flags & SP_OBJECT_WRITE_BUILD ) {
- if ( repr == NULL ) repr = sp_repr_new("svg:flowRoot");
+ if ( repr == NULL ) repr = xml_doc->createElement("svg:flowRoot");
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_FLOWDIV(child) || SP_IS_FLOWPARA(child) || SP_IS_FLOWREGION(child) || SP_IS_FLOWREGIONEXCLUDE(child)) {
- c_repr = child->updateRepr(NULL, flags);
- }
+ c_repr = child->updateRepr(xml_doc, NULL, flags);
+ }
if ( c_repr ) l = g_slist_prepend(l, c_repr);
}
while ( l ) {
}
if (((SPObjectClass *) (parent_class))->write)
- ((SPObjectClass *) (parent_class))->write(object, repr, flags);
+ ((SPObjectClass *) (parent_class))->write(object, xml_doc, repr, flags);
return repr;
}
static void
-sp_flowtext_bbox(SPItem const *item, NRRect *bbox, NR::Matrix const &transform, unsigned const /*flags*/)
+sp_flowtext_bbox(SPItem const *item, NRRect *bbox, Geom::Matrix const &transform, unsigned const /*flags*/)
{
SPFlowtext *group = SP_FLOWTEXT(item);
group->layout.getBoundingBox(bbox, transform);
+
+ // Add stroke width
+ SPStyle* style=SP_OBJECT_STYLE (item);
+ if ( !style->stroke.isNone() ) {
+ double const scale = transform.descrim();
+ 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);
+ if ( fabs(bbox->x1 - bbox->x0) > -0.00001 && fabs(bbox->y1 - bbox->y0) > -0.00001 ) {
+ bbox->x0-=0.5*width;
+ bbox->x1+=0.5*width;
+ bbox->y0-=0.5*width;
+ bbox->y1+=0.5*width;
+ }
+ }
+ }
}
static void
SPFlowtext *group = SP_FLOWTEXT(item);
NRRect pbox;
- sp_item_invoke_bbox(item, &pbox, NR::identity(), TRUE);
+ sp_item_invoke_bbox(item, &pbox, Geom::identity(), TRUE);
NRRect bbox;
- sp_item_bbox_desktop(item, &bbox);
+ Geom::OptRect bbox_maybe = sp_item_bbox_desktop(item);
+ if (!bbox_maybe) {
+ return;
+ }
+ bbox = NRRect(from_2geom(*bbox_maybe));
+
NRRect dbox;
dbox.x0 = 0.0;
dbox.y0 = 0.0;
dbox.x1 = sp_document_width(SP_OBJECT_DOCUMENT(item));
dbox.y1 = sp_document_height(SP_OBJECT_DOCUMENT(item));
- NR::Matrix const ctm = sp_item_i2d_affine(item);
+ Geom::Matrix const ctm (sp_item_i2d_affine(item));
group->layout.print(ctx, &pbox, &dbox, &bbox, ctm);
}
{
Inkscape::Text::Layout const &layout = SP_FLOWTEXT(item)->layout;
int const nChars = layout.iteratorToCharIndex(layout.end());
- if (SP_FLOWTEXT(item)->has_internal_frame())
- return g_strdup_printf(_("<b>Flowed text</b> (%d characters)"), nChars);
- else
- return g_strdup_printf(_("<b>Linked flowed text</b> (%d characters)"), nChars);
+
+ char const *trunc = (layout.inputTruncated()) ? _(" [truncated]") : "";
+
+ if (SP_FLOWTEXT(item)->has_internal_frame()) {
+ return g_strdup_printf(ngettext("<b>Flowed text</b> (%d character%s)", "<b>Flowed text</b> (%d characters%s)", nChars), nChars, trunc);
+ } else {
+ return g_strdup_printf(ngettext("<b>Linked flowed text</b> (%d character%s)", "<b>Linked flowed text</b> (%d characters%s)", nChars), nChars, trunc);
+ }
+}
+
+static void sp_flowtext_snappoints(SPItem const *item, std::vector<Inkscape::SnapCandidatePoint> &p, Inkscape::SnapPreferences const */*snapprefs*/)
+{
+ // Choose a point on the baseline for snapping from or to, with the horizontal position
+ // of this point depending on the text alignment (left vs. right)
+ Inkscape::Text::Layout const *layout = te_get_layout((SPItem *) item);
+ if (layout != NULL && layout->outputExists()) {
+ boost::optional<Geom::Point> pt = layout->baselineAnchorPoint();
+ if (pt) {
+ p.push_back(Inkscape::SnapCandidatePoint((*pt) * sp_item_i2d_affine(item), Inkscape::SNAPSOURCE_TEXT_BASELINE, Inkscape::SNAPTARGET_TEXT_BASELINE));
+ }
+ }
}
static NRArenaItem *
@@ -350,9 +404,11 @@ sp_flowtext_show(SPItem *item, NRArena *arena, unsigned/* key*/, unsigned /*flag
NRArenaGroup *flowed = NRArenaGroup::create(arena);
nr_arena_group_set_transparent(flowed, FALSE);
+ nr_arena_group_set_style(flowed, group->style);
+
// pass the bbox of the flowtext object as paintbox (used for paintserver fills)
NRRect paintbox;
- sp_item_invoke_bbox(item, &paintbox, NR::identity(), TRUE);
+ sp_item_invoke_bbox(item, &paintbox, Geom::identity(), TRUE);
group->layout.show(flowed, &paintbox);
return flowed;
@@ -378,7 +434,7 @@ void SPFlowtext::_buildLayoutInput(SPObject *root, Shape const *exclusion_shape,
if (SP_IS_FLOWPARA(root)) {
// emulate par-indent with the first char's kern
SPObject *t = root;
- for ( ; t != NULL && !SP_IS_FLOWTEXT(t); t = SP_OBJECT_PARENT(t));
+ for ( ; t != NULL && !SP_IS_FLOWTEXT(t); t = SP_OBJECT_PARENT(t)){};
if (SP_IS_FLOWTEXT(t)) {
double indent = SP_FLOWTEXT(t)->par_indent;
if (indent != 0) {
@@ -412,7 +468,7 @@ void SPFlowtext::_buildLayoutInput(SPObject *root, Shape const *exclusion_shape,
}
if (with_indent)
layout.appendText(SP_STRING(child)->string, root->style, child, &pi);
- else
+ else
layout.appendText(SP_STRING(child)->string, root->style, child);
} else if (SP_IS_FLOWREGION(child)) {
std::vector<Shape*> const &computed = SP_FLOWREGION(child)->computed;
@@ -425,7 +481,7 @@ void SPFlowtext::_buildLayoutInput(SPObject *root, Shape const *exclusion_shape,
layout.appendWrapShape(&shapes->back());
}
}
- else if (!SP_IS_FLOWREGIONEXCLUDE(child))
+ else if (!SP_IS_FLOWREGIONEXCLUDE(child) && !sp_repr_is_meta_element(child->repr))
_buildLayoutInput(child, exclusion_shape, shapes, pending_line_break_object);
}
}
}
-void SPFlowtext::convert_to_text()
+Inkscape::XML::Node *
+SPFlowtext::getAsText()
{
- SPDesktop *desktop = SP_ACTIVE_DESKTOP;
- Inkscape::Selection *selection = SP_DT_SELECTION(desktop);
- SPItem *item = selection->singleItem();
- if (!SP_IS_FLOWTEXT(item)) return;
-
- SPFlowtext *group = SP_FLOWTEXT(item);
+ if (!this->layout.outputExists()) return NULL;
- if (!group->layout.outputExists()) return;
+ SPItem *item = SP_ITEM(this);
- Inkscape::XML::Node *repr = sp_repr_new("svg:text");
+ Inkscape::XML::Document *xml_doc = sp_document_repr_doc(SP_OBJECT_DOCUMENT(this));
+ Inkscape::XML::Node *repr = xml_doc->createElement("svg:text");
repr->setAttribute("xml:space", "preserve");
- repr->setAttribute("style", SP_OBJECT_REPR(group)->attribute("style"));
- NR::Point anchor_point = group->layout.characterAnchorPoint(group->layout.begin());
- sp_repr_set_svg_double(repr, "x", anchor_point[NR::X]);
- sp_repr_set_svg_double(repr, "y", anchor_point[NR::Y]);
+ repr->setAttribute("style", SP_OBJECT_REPR(this)->attribute("style"));
+ Geom::Point anchor_point = this->layout.characterAnchorPoint(this->layout.begin());
+ sp_repr_set_svg_double(repr, "x", anchor_point[Geom::X]);
+ sp_repr_set_svg_double(repr, "y", anchor_point[Geom::Y]);
- for (Inkscape::Text::Layout::iterator it = group->layout.begin() ; it != group->layout.end() ; ) {
-
- Inkscape::XML::Node *line_tspan = sp_repr_new("svg:tspan");
+ for (Inkscape::Text::Layout::iterator it = this->layout.begin() ; it != this->layout.end() ; ) {
+ Inkscape::XML::Node *line_tspan = xml_doc->createElement("svg:tspan");
line_tspan->setAttribute("sodipodi:role", "line");
Inkscape::Text::Layout::iterator it_line_end = it;
it_line_end.nextStartOfLine();
+
while (it != it_line_end) {
- Inkscape::XML::Node *span_tspan = sp_repr_new("svg:tspan");
- NR::Point anchor_point = group->layout.characterAnchorPoint(it);
+ Inkscape::XML::Node *span_tspan = xml_doc->createElement("svg:tspan");
+ Geom::Point anchor_point = this->layout.characterAnchorPoint(it);
// use kerning to simulate justification and whatnot
Inkscape::Text::Layout::iterator it_span_end = it;
it_span_end.nextStartOfSpan();
Inkscape::Text::Layout::OptionalTextTagAttrs attrs;
- group->layout.simulateLayoutUsingKerning(it, it_span_end, &attrs);
+ this->layout.simulateLayoutUsingKerning(it, it_span_end, &attrs);
// set x,y attributes only when we need to
bool set_x = false;
bool set_y = false;
- if (!item->transform.test_identity()) {
+ if (!item->transform.isIdentity()) {
set_x = set_y = true;
} else {
Inkscape::Text::Layout::iterator it_chunk_start = it;
attrs.dx[0] = 0.0;
TextTagAttributes(attrs).writeTo(span_tspan);
if (set_x)
- sp_repr_set_svg_double(span_tspan, "x", anchor_point[NR::X]); // FIXME: this will pick up the wrong end of counter-directional runs
+ sp_repr_set_svg_double(span_tspan, "x", anchor_point[Geom::X]); // FIXME: this will pick up the wrong end of counter-directional runs
if (set_y)
- sp_repr_set_svg_double(span_tspan, "y", anchor_point[NR::Y]);
+ sp_repr_set_svg_double(span_tspan, "y", anchor_point[Geom::Y]);
+ if (line_tspan->childCount() == 0) {
+ sp_repr_set_svg_double(line_tspan, "x", anchor_point[Geom::X]); // FIXME: this will pick up the wrong end of counter-directional runs
+ sp_repr_set_svg_double(line_tspan, "y", anchor_point[Geom::Y]);
+ }
- SPObject *source_obj;
+ SPObject *source_obj = 0;
+ void *rawptr = 0;
Glib::ustring::iterator span_text_start_iter;
- group->layout.getSourceOfCharacter(it, (void**)&source_obj, &span_text_start_iter);
- gchar *style_text = sp_style_write_difference((SP_IS_STRING(source_obj) ? source_obj->parent : source_obj)->style, group->style);
+ this->layout.getSourceOfCharacter(it, &rawptr, &span_text_start_iter);
+ source_obj = SP_OBJECT (rawptr);
+ gchar *style_text = sp_style_write_difference((SP_IS_STRING(source_obj) ? source_obj->parent : source_obj)->style, this->style);
if (style_text && *style_text) {
span_tspan->setAttribute("style", style_text);
g_free(style_text);
if (SP_IS_STRING(source_obj)) {
Glib::ustring *string = &SP_STRING(source_obj)->string;
- SPObject *span_end_obj;
+ SPObject *span_end_obj = 0;
+ void *rawptr = 0;
Glib::ustring::iterator span_text_end_iter;
- group->layout.getSourceOfCharacter(it_span_end, (void**)&span_end_obj, &span_text_end_iter);
+ this->layout.getSourceOfCharacter(it_span_end, &rawptr, &span_text_end_iter);
+ span_end_obj = SP_OBJECT(rawptr);
if (span_end_obj != source_obj) {
- if (it_span_end == group->layout.end()) {
+ if (it_span_end == this->layout.end()) {
span_text_end_iter = span_text_start_iter;
- for (int i = group->layout.iteratorToCharIndex(it_span_end) - group->layout.iteratorToCharIndex(it) ; i ; --i)
+ for (int i = this->layout.iteratorToCharIndex(it_span_end) - this->layout.iteratorToCharIndex(it) ; i ; --i)
++span_text_end_iter;
} else
span_text_end_iter = string->end(); // spans will never straddle a source boundary
Glib::ustring new_string;
while (span_text_start_iter != span_text_end_iter)
new_string += *span_text_start_iter++; // grr. no substr() with iterators
- Inkscape::XML::Node *new_text = sp_repr_new_text(new_string.c_str());
+ Inkscape::XML::Node *new_text = xml_doc->createTextNode(new_string.c_str());
span_tspan->appendChild(new_text);
Inkscape::GC::release(new_text);
}
it = it_span_end;
line_tspan->appendChild(span_tspan);
- Inkscape::GC::release(span_tspan);
+ Inkscape::GC::release(span_tspan);
}
repr->appendChild(line_tspan);
- Inkscape::GC::release(line_tspan);
+ Inkscape::GC::release(line_tspan);
}
- Inkscape::XML::Node *parent = SP_OBJECT_REPR(item)->parent();
- parent->appendChild(repr);
- SPItem *new_item = (SPItem *) SP_DT_DOCUMENT(desktop)->getObjectByRepr(repr);
- sp_item_write_transform(new_item, repr, item->transform);
- SP_OBJECT(new_item)->updateRepr();
-
- Inkscape::GC::release(repr);
- selection->set(new_item);
- item->deleteObject();
-
- sp_document_done(SP_DT_DOCUMENT(desktop));
+ return repr;
}
SPItem *SPFlowtext::get_frame(SPItem *after)
}
-SPItem *create_flowtext_with_internal_frame (SPDesktop *desktop, NR::Point p0, NR::Point p1)
+SPItem *create_flowtext_with_internal_frame (SPDesktop *desktop, Geom::Point p0, Geom::Point p1)
{
- SPDocument *doc = SP_DT_DOCUMENT (desktop);
+ SPDocument *doc = sp_desktop_document (desktop);
- Inkscape::XML::Node *root_repr = sp_repr_new("svg:flowRoot");
+ Inkscape::XML::Document *xml_doc = sp_document_repr_doc(doc);
+ Inkscape::XML::Node *root_repr = xml_doc->createElement("svg:flowRoot");
root_repr->setAttribute("xml:space", "preserve"); // we preserve spaces in the text objects we create
SPItem *ft_item = SP_ITEM(desktop->currentLayer()->appendChildRepr(root_repr));
SPObject *root_object = doc->getObjectByRepr(root_repr);
g_assert(SP_IS_FLOWTEXT(root_object));
- Inkscape::XML::Node *region_repr = sp_repr_new("svg:flowRegion");
+ Inkscape::XML::Node *region_repr = xml_doc->createElement("svg:flowRegion");
root_repr->appendChild(region_repr);
SPObject *region_object = doc->getObjectByRepr(region_repr);
g_assert(SP_IS_FLOWREGION(region_object));
- Inkscape::XML::Node *rect_repr = sp_repr_new("svg:rect"); // FIXME: use path!!! after rects are converted to use path
+ Inkscape::XML::Node *rect_repr = xml_doc->createElement("svg:rect"); // FIXME: use path!!! after rects are converted to use path
region_repr->appendChild(rect_repr);
SPObject *rect = doc->getObjectByRepr(rect_repr);
- p0 = sp_desktop_dt2root_xy_point(desktop, p0);
- p1 = sp_desktop_dt2root_xy_point(desktop, p1);
- using NR::X;
- using NR::Y;
- NR::Coord const x0 = MIN(p0[X], p1[X]);
- NR::Coord const y0 = MIN(p0[Y], p1[Y]);
- NR::Coord const x1 = MAX(p0[X], p1[X]);
- NR::Coord const y1 = MAX(p0[Y], p1[Y]);
- NR::Coord const w = x1 - x0;
- NR::Coord const h = y1 - y0;
+ p0 *= desktop->dt2doc();
+ p1 *= desktop->dt2doc();
+ using Geom::X;
+ using Geom::Y;
+ Geom::Coord const x0 = MIN(p0[X], p1[X]);
+ Geom::Coord const y0 = MIN(p0[Y], p1[Y]);
+ Geom::Coord const x1 = MAX(p0[X], p1[X]);
+ Geom::Coord const y1 = MAX(p0[Y], p1[Y]);
+ Geom::Coord const w = x1 - x0;
+ Geom::Coord const h = y1 - y0;
sp_rect_position_set(SP_RECT(rect), x0, y0, w, h);
SP_OBJECT(rect)->updateRepr();
- Inkscape::XML::Node *para_repr = sp_repr_new("svg:flowPara");
+ Inkscape::XML::Node *para_repr = xml_doc->createElement("svg:flowPara");
root_repr->appendChild(para_repr);
SPObject *para_object = doc->getObjectByRepr(para_repr);
g_assert(SP_IS_FLOWPARA(para_object));
- Inkscape::XML::Node *text = sp_repr_new_text("");
+ Inkscape::XML::Node *text = xml_doc->createTextNode("");
para_repr->appendChild(text);
Inkscape::GC::release(root_repr);
@@ -690,6 +742,8 @@ SPItem *create_flowtext_with_internal_frame (SPDesktop *desktop, NR::Point p0, N
Inkscape::GC::release(para_repr);
Inkscape::GC::release(rect_repr);
+ ft_item->transform = sp_item_i2doc_affine(SP_ITEM(desktop->currentLayer())).inverse();
+
return ft_item;
}