X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fsp-text.cpp;h=80eb786f28754cbfed3928c5b7cc6d5c62de92af;hb=c580a96092327174256078a5ca30582608e82be7;hp=dcf9160ff134af85f67a111d193c4783a33261e1;hpb=094dc7c249a0253b9bbed67205e341a05b59eca7;p=inkscape.git diff --git a/src/sp-text.cpp b/src/sp-text.cpp index dcf9160ff..80eb786f2 100644 --- a/src/sp-text.cpp +++ b/src/sp-text.cpp @@ -4,6 +4,8 @@ * Author: * Lauris Kaplinski * bulia byak + * Jon A. Cruz + * Abhishek Sharma * * Copyright (C) 1999-2002 Lauris Kaplinski * Copyright (C) 2000-2001 Ximian, Inc. @@ -149,16 +151,16 @@ sp_text_release (SPObject *object) static void sp_text_build (SPObject *object, SPDocument *doc, Inkscape::XML::Node *repr) { - object->readAttr( "x"); - object->readAttr( "y"); - object->readAttr( "dx"); - object->readAttr( "dy"); - object->readAttr( "rotate"); + object->readAttr( "x" ); + object->readAttr( "y" ); + object->readAttr( "dx" ); + object->readAttr( "dy" ); + object->readAttr( "rotate" ); if (((SPObjectClass *) text_parent_class)->build) ((SPObjectClass *) text_parent_class)->build(object, doc, repr); - object->readAttr( "sodipodi:linespacing"); // has to happen after the styles are read + object->readAttr( "sodipodi:linespacing" ); // has to happen after the styles are read } static void @@ -211,8 +213,7 @@ sp_text_remove_child (SPObject *object, Inkscape::XML::Node *rch) text->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG | SP_TEXT_CONTENT_MODIFIED_FLAG | SP_TEXT_LAYOUT_MODIFIED_FLAG); } -static void -sp_text_update (SPObject *object, SPCtx *ctx, guint flags) +static void sp_text_update(SPObject *object, SPCtx *ctx, guint flags) { SPText *text = SP_TEXT (object); @@ -223,9 +224,9 @@ sp_text_update (SPObject *object, SPCtx *ctx, guint flags) if (flags & SP_OBJECT_MODIFIED_FLAG) cflags |= SP_OBJECT_PARENT_MODIFIED_FLAG; - /* Create temporary list of children */ + // Create temporary list of children GSList *l = NULL; - for (SPObject *child = object->first_child() ; child != NULL ; child = SP_OBJECT_NEXT(child) ) { + for (SPObject *child = object->firstChild() ; child ; child = child->getNext() ) { sp_object_ref (SP_OBJECT (child), object); l = g_slist_prepend (l, child); } @@ -259,14 +260,16 @@ sp_text_update (SPObject *object, SPCtx *ctx, guint flags) } } -static void -sp_text_modified (SPObject *object, guint flags) +static void sp_text_modified(SPObject *object, guint flags) { - if (((SPObjectClass *) text_parent_class)->modified) + if (((SPObjectClass *) text_parent_class)->modified) { ((SPObjectClass *) text_parent_class)->modified (object, flags); + } guint cflags = (flags & SP_OBJECT_MODIFIED_CASCADE); - if (flags & SP_OBJECT_MODIFIED_FLAG) cflags |= SP_OBJECT_PARENT_MODIFIED_FLAG; + if (flags & SP_OBJECT_MODIFIED_FLAG) { + cflags |= SP_OBJECT_PARENT_MODIFIED_FLAG; + } // FIXME: all that we need to do here is nr_arena_glyphs_[group_]set_style, to set the changed // style, but there's no easy way to access the arena glyphs or glyph groups corresponding to a @@ -283,16 +286,15 @@ sp_text_modified (SPObject *object, guint flags) } } - /* Create temporary list of children */ + // Create temporary list of children GSList *l = NULL; - SPObject *child; - for (child = object->first_child() ; child != NULL ; child = SP_OBJECT_NEXT(child) ) { + for (SPObject *child = object->firstChild() ; child ; child = child->getNext() ) { sp_object_ref (SP_OBJECT (child), object); l = g_slist_prepend (l, child); } l = g_slist_reverse (l); while (l) { - child = SP_OBJECT (l->data); + SPObject *child = SP_OBJECT (l->data); l = g_slist_remove (l, child); if (cflags || (child->mflags & (SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_CHILD_MODIFIED_FLAG))) { child->emitModified(cflags); @@ -301,24 +303,28 @@ sp_text_modified (SPObject *object, guint flags) } } -static Inkscape::XML::Node * -sp_text_write (SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags) +static Inkscape::XML::Node *sp_text_write(SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::XML::Node *repr, guint flags) { SPText *text = SP_TEXT (object); if (flags & SP_OBJECT_WRITE_BUILD) { - if (!repr) + if (!repr) { repr = xml_doc->createElement("svg:text"); + } GSList *l = NULL; - for (SPObject *child = object->first_child() ; child != NULL ; child = SP_OBJECT_NEXT(child) ) { - if (SP_IS_TITLE(child) || SP_IS_DESC(child)) continue; + for (SPObject *child = object->firstChild() ; child ; child = child->getNext() ) { + if (SP_IS_TITLE(child) || SP_IS_DESC(child)) { + continue; + } Inkscape::XML::Node *crepr = NULL; if (SP_IS_STRING(child)) { crepr = xml_doc->createTextNode(SP_STRING(child)->string.c_str()); } else { crepr = child->updateRepr(xml_doc, NULL, flags); } - if (crepr) l = g_slist_prepend (l, crepr); + if (crepr) { + l = g_slist_prepend (l, crepr); + } } while (l) { repr->addChild((Inkscape::XML::Node *) l->data, NULL); @@ -326,8 +332,10 @@ sp_text_write (SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::XML l = g_slist_remove (l, l->data); } } else { - for (SPObject *child = object->first_child() ; child != NULL ; child = SP_OBJECT_NEXT(child) ) { - if (SP_IS_TITLE(child) || SP_IS_DESC(child)) continue; + for (SPObject *child = object->firstChild() ; child ; child = child->getNext() ) { + if (SP_IS_TITLE(child) || SP_IS_DESC(child)) { + continue; + } if (SP_IS_STRING(child)) { SP_OBJECT_REPR(child)->setContent(SP_STRING(child)->string.c_str()); } else { @@ -343,12 +351,13 @@ sp_text_write (SPObject *object, Inkscape::XML::Document *xml_doc, Inkscape::XML Inkscape::SVGOStringStream os; os << (text->style->line_height.value * 100.0) << "%"; SP_OBJECT_REPR(text)->setAttribute("sodipodi:linespacing", os.str().c_str()); - } - else + } else { SP_OBJECT_REPR(text)->setAttribute("sodipodi:linespacing", NULL); + } - if (((SPObjectClass *) (text_parent_class))->write) + if (((SPObjectClass *) (text_parent_class))->write) { ((SPObjectClass *) (text_parent_class))->write (object, xml_doc, repr, flags); + } return repr; } @@ -528,7 +537,7 @@ unsigned SPText::_buildLayoutInput(SPObject *root, Inkscape::Text::Layout::Optio } else if (SP_IS_TSPAN(root)) { SPTSpan *tspan = SP_TSPAN(root); - // x, y attributes are stripped from some tspans as we do our own line layout + // x, y attributes are stripped from some tspans marked with role="line" as we do our own line layout. // This should be checked carefully, as it can undo line layout in imported SVG files. bool use_xy = !in_textpath && (tspan->role == SP_TSPAN_ROLE_UNSPECIFIED || !tspan->attributes.singleXYCoordinates()); tspan->attributes.mergeInto(&optional_attrs, parent_optional_attrs, parent_attrs_offset, use_xy, true); @@ -550,14 +559,16 @@ unsigned SPText::_buildLayoutInput(SPObject *root, Inkscape::Text::Layout::Optio if (SP_IS_TSPAN(root)) if (SP_TSPAN(root)->role != SP_TSPAN_ROLE_UNSPECIFIED) { // we need to allow the first line not to have role=line, but still set the source_cookie to the right value - SPObject *prev_object = SP_OBJECT_PREV(root); + SPObject *prev_object = root->getPrev(); if (prev_object && SP_IS_TSPAN(prev_object)) { - if (!layout.inputExists()) + if (!layout.inputExists()) { layout.appendText("", prev_object->style, prev_object, &optional_attrs); + } layout.appendControlCode(Inkscape::Text::Layout::PARAGRAPH_BREAK, prev_object); } - if (!root->hasChildren()) + if (!root->hasChildren()) { layout.appendText("", root->style, root, &optional_attrs); + } length++; // interpreting line breaks as a character for the purposes of x/y/etc attributes // is a liberal interpretation of the svg spec, but a strict reading would mean // that if the first line is empty the second line would take its place at the @@ -565,7 +576,7 @@ unsigned SPText::_buildLayoutInput(SPObject *root, Inkscape::Text::Layout::Optio child_attrs_offset--; } - for (SPObject *child = root->first_child() ; child != NULL ; child = SP_OBJECT_NEXT(child) ) { + for (SPObject *child = root->firstChild() ; child ; child = child->getNext() ) { if (SP_IS_STRING(child)) { Glib::ustring const &string = SP_STRING(child)->string; layout.appendText(string, root->style, child, &optional_attrs, child_attrs_offset + length); @@ -584,7 +595,7 @@ void SPText::rebuildLayout() Inkscape::Text::Layout::OptionalTextTagAttrs optional_attrs; _buildLayoutInput(this, optional_attrs, 0, false); layout.calculateFlow(); - for (SPObject *child = firstChild() ; child != NULL ; child = SP_OBJECT_NEXT(child) ) { + for (SPObject *child = firstChild() ; child ; child = child->getNext() ) { if (SP_IS_TEXTPATH(child)) { SPTextPath const *textpath = SP_TEXTPATH(child); if (textpath->originalPath != NULL) { @@ -596,14 +607,16 @@ void SPText::rebuildLayout() //g_print(layout.dumpAsText().c_str()); // set the x,y attributes on role:line spans - for (SPObject *child = firstChild() ; child != NULL ; child = SP_OBJECT_NEXT(child) ) { - if (!SP_IS_TSPAN(child)) continue; - SPTSpan *tspan = SP_TSPAN(child); - if (tspan->role == SP_TSPAN_ROLE_UNSPECIFIED) continue; - if (!tspan->attributes.singleXYCoordinates()) continue; - Inkscape::Text::Layout::iterator iter = layout.sourceToIterator(tspan); - Geom::Point anchor_point = layout.chunkAnchorPoint(iter); - tspan->attributes.setFirstXY(anchor_point); + for (SPObject *child = firstChild() ; child ; child = child->getNext() ) { + if (SP_IS_TSPAN(child)) { + SPTSpan *tspan = SP_TSPAN(child); + if ( (tspan->role != SP_TSPAN_ROLE_UNSPECIFIED) + && tspan->attributes.singleXYCoordinates() ) { + Inkscape::Text::Layout::iterator iter = layout.sourceToIterator(tspan); + Geom::Point anchor_point = layout.chunkAnchorPoint(iter); + tspan->attributes.setFirstXY(anchor_point); + } + } } } @@ -1039,4 +1052,4 @@ void TextTagAttributes::setRotate(unsigned index, double angle) fill-column:99 End: */ -// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 : +// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :