X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Ftext-editing.cpp;h=5b9db13d4532a29c2926344b9f5e0322133afa45;hb=530f7fc7cfa4351ec33163abd795460bbc351609;hp=b84361324338c62735017ba15f2407bd624e9d60;hpb=fa6a5ffc4cf7c7b97d623650e253e2aa67768f24;p=inkscape.git diff --git a/src/text-editing.cpp b/src/text-editing.cpp index b84361324..5b9db13d4 100644 --- a/src/text-editing.cpp +++ b/src/text-editing.cpp @@ -14,7 +14,13 @@ # include "config.h" #endif +#include +#include +#include + #include "desktop.h" +#include "inkscape.h" +#include "message-stack.h" #include "style.h" #include "unit-constants.h" @@ -26,10 +32,13 @@ #include "sp-flowtext.h" #include "sp-flowdiv.h" #include "sp-flowregion.h" +#include "sp-tref.h" #include "sp-tspan.h" #include "text-editing.h" +static const gchar *tref_edit_message = _("You cannot edit cloned character data."); + static bool tidy_xml_tree_recursively(SPObject *root); Inkscape::Text::Layout const * te_get_layout (SPItem const *item) @@ -69,37 +78,45 @@ sp_te_input_is_empty (SPObject const *item) } Inkscape::Text::Layout::iterator -sp_te_get_position_by_coords (SPItem const *item, NR::Point &i_p) +sp_te_get_position_by_coords (SPItem const *item, Geom::Point const &i_p) { - NR::Matrix im=sp_item_i2d_affine (item); + Geom::Matrix im (sp_item_i2d_affine (item)); im = im.inverse(); - NR::Point p = i_p * im; + Geom::Point p = i_p * im; Inkscape::Text::Layout const *layout = te_get_layout(item); return layout->getNearestCursorPositionTo(p); } -std::vector sp_te_create_selection_quads(SPItem const *item, Inkscape::Text::Layout::iterator const &start, Inkscape::Text::Layout::iterator const &end, NR::Matrix const &transform) +std::vector sp_te_create_selection_quads(SPItem const *item, Inkscape::Text::Layout::iterator const &start, Inkscape::Text::Layout::iterator const &end, Geom::Matrix const &transform) { if (start == end) - return std::vector(); + return std::vector(); Inkscape::Text::Layout const *layout = te_get_layout(item); if (layout == NULL) - return std::vector(); + return std::vector(); return layout->createSelectionShape(start, end, transform); } void -sp_te_get_cursor_coords (SPItem const *item, Inkscape::Text::Layout::iterator const &position, NR::Point &p0, NR::Point &p1) +sp_te_get_cursor_coords (SPItem const *item, Inkscape::Text::Layout::iterator const &position, Geom::Point &p0, Geom::Point &p1) { Inkscape::Text::Layout const *layout = te_get_layout(item); double height, rotation; - layout->queryCursorShape(position, &p0, &height, &rotation); - p1 = NR::Point(p0[NR::X] + height * sin(rotation), p0[NR::Y] - height * cos(rotation)); + layout->queryCursorShape(position, p0, height, rotation); + p1 = Geom::Point(p0[Geom::X] + height * sin(rotation), p0[Geom::Y] - height * cos(rotation)); } SPStyle const * sp_te_style_at_position(SPItem const *text, Inkscape::Text::Layout::iterator const &position) +{ + SPObject const *pos_obj = sp_te_object_at_position(text, position); + if (pos_obj) + return SP_OBJECT_STYLE(pos_obj); + return NULL; +} + +SPObject const * sp_te_object_at_position(SPItem const *text, Inkscape::Text::Layout::iterator const &position) { Inkscape::Text::Layout const *layout = te_get_layout(text); if (layout == NULL) @@ -110,8 +127,8 @@ SPStyle const * sp_te_style_at_position(SPItem const *text, Inkscape::Text::Layo pos_obj = SP_OBJECT(rawptr); if (pos_obj == 0) pos_obj = text; while (SP_OBJECT_STYLE(pos_obj) == NULL) - pos_obj = SP_OBJECT_PARENT(pos_obj); // SPStrings don't have style - return SP_OBJECT_STYLE(pos_obj); + pos_obj = SP_OBJECT_PARENT(pos_obj); // not interested in SPStrings + return pos_obj; } /* @@ -131,8 +148,9 @@ char * dump_hexy(const gchar * utf8) Inkscape::Text::Layout::iterator sp_te_replace(SPItem *item, Inkscape::Text::Layout::iterator const &start, Inkscape::Text::Layout::iterator const &end, gchar const *utf8) { - Inkscape::Text::Layout::iterator new_start = sp_te_delete(item, start, end); - return sp_te_insert(item, new_start, utf8); + iterator_pair pair; + sp_te_delete(item, start, end, pair); + return sp_te_insert(item, pair.first, utf8); } @@ -141,23 +159,34 @@ Inkscape::Text::Layout::iterator sp_te_replace(SPItem *item, Inkscape::Text::Lay static bool is_line_break_object(SPObject const *object) { - return SP_IS_TEXT(object) - || (SP_IS_TSPAN(object) && SP_TSPAN(object)->role != SP_TSPAN_ROLE_UNSPECIFIED) - || SP_IS_TEXTPATH(object) - || SP_IS_FLOWDIV(object) - || SP_IS_FLOWPARA(object) - || SP_IS_FLOWLINE(object) - || SP_IS_FLOWREGIONBREAK(object); + bool is_line_break = false; + + if (object) { + if (SP_IS_TEXT(object) + || (SP_IS_TSPAN(object) && SP_TSPAN(object)->role != SP_TSPAN_ROLE_UNSPECIFIED) + || SP_IS_TEXTPATH(object) + || SP_IS_FLOWDIV(object) + || SP_IS_FLOWPARA(object) + || SP_IS_FLOWLINE(object) + || SP_IS_FLOWREGIONBREAK(object)) { + + is_line_break = true; + } + } + + return is_line_break; } /** returns the attributes for an object, or NULL if it isn't a text, -tspan or textpath. */ +tspan, tref, or textpath. */ static TextTagAttributes* attributes_for_object(SPObject *object) { if (SP_IS_TSPAN(object)) return &SP_TSPAN(object)->attributes; if (SP_IS_TEXT(object)) return &SP_TEXT(object)->attributes; + if (SP_IS_TREF(object)) + return &SP_TREF(object)->attributes; if (SP_IS_TEXTPATH(object)) return &SP_TEXTPATH(object)->attributes; return NULL; @@ -177,7 +206,9 @@ unsigned sp_text_get_length(SPObject const *item) unsigned length = 0; if (SP_IS_STRING(item)) return SP_STRING(item)->string.length(); + if (is_line_break_object(item)) length++; + for (SPObject const *child = item->firstChild() ; child ; child = SP_OBJECT_NEXT(child)) { if (SP_IS_STRING(child)) length += SP_STRING(child)->string.length(); else length += sp_text_get_length(child); @@ -191,15 +222,20 @@ unsigned sp_text_get_length_upto(SPObject const *item, SPObject const *upto) { unsigned length = 0; + // The string is the lowest level and the length can be counted directly. if (SP_IS_STRING(item)) { return SP_STRING(item)->string.length(); } + + // Take care of new lines... if (is_line_break_object(item) && !SP_IS_TEXT(item)) { if (item != SP_OBJECT_PARENT(item)->firstChild()) { // add 1 for each newline length++; } } + + // Count the length of the children for (SPObject const *child = item->firstChild() ; child ; child = SP_OBJECT_NEXT(child)) { if (upto && child == upto) { // hit upto, return immediately @@ -242,6 +278,9 @@ static Inkscape::XML::Node* duplicate_node_without_children(Inkscape::XML::Docum case Inkscape::XML::COMMENT_NODE: return xml_doc->createComment(old_node->content()); + case Inkscape::XML::PI_NODE: + return xml_doc->createPI(old_node->name(), old_node->content()); + case Inkscape::XML::DOCUMENT_NODE: return NULL; // this had better never happen } @@ -318,8 +357,10 @@ Inkscape::Text::Layout::iterator sp_te_insert_line (SPItem *item, Inkscape::Text { // Disable newlines in a textpath; TODO: maybe on Enter in a textpath, separate it into two // texpaths attached to the same path, with a vertical shift - if (SP_IS_TEXT_TEXTPATH (item)) + if (SP_IS_TEXT_TEXTPATH (item) || SP_IS_TREF(item)) return position; + + SPDesktop *desktop = SP_ACTIVE_DESKTOP; Inkscape::Text::Layout const *layout = te_get_layout(item); SPObject *split_obj = 0; @@ -332,6 +373,12 @@ Inkscape::Text::Layout::iterator sp_te_insert_line (SPItem *item, Inkscape::Text if (split_obj == 0 || is_line_break_object(split_obj)) { if (split_obj == 0) split_obj = item->lastChild(); + + if (SP_IS_TREF(split_obj)) { + desktop->messageStack()->flash(Inkscape::ERROR_MESSAGE, tref_edit_message); + return position; + } + if (split_obj) { Inkscape::XML::Document *xml_doc = sp_document_repr_doc(SP_OBJECT_DOCUMENT(split_obj)); Inkscape::XML::Node *new_node = duplicate_node_without_children(xml_doc, SP_OBJECT_REPR(split_obj)); @@ -339,6 +386,12 @@ Inkscape::Text::Layout::iterator sp_te_insert_line (SPItem *item, Inkscape::Text Inkscape::GC::release(new_node); } } else if (SP_IS_STRING(split_obj)) { + // If the parent is a tref, editing on this particular string is disallowed. + if (SP_IS_TREF(SP_OBJECT_PARENT(split_obj))) { + desktop->messageStack()->flash(Inkscape::ERROR_MESSAGE, tref_edit_message); + return position; + } + Glib::ustring *string = &SP_STRING(split_obj)->string; unsigned char_index = 0; for (Glib::ustring::iterator it = string->begin() ; it != split_text_iter ; it++) @@ -353,7 +406,7 @@ Inkscape::Text::Layout::iterator sp_te_insert_line (SPItem *item, Inkscape::Text // TODO // I think the only case to put here is arbitrary gaps, which nobody uses yet } - item->updateRepr(SP_OBJECT_REPR(item),SP_OBJECT_WRITE_EXT); + item->updateRepr(); unsigned char_index = layout->iteratorToCharIndex(position); te_update_layout_now(item); item->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); @@ -408,6 +461,8 @@ sp_te_insert(SPItem *item, Inkscape::Text::Layout::iterator const &position, gch g_warning("Trying to insert invalid utf8"); return position; } + + SPDesktop *desktop = SP_ACTIVE_DESKTOP; Inkscape::Text::Layout const *layout = te_get_layout(item); SPObject *source_obj = 0; @@ -421,7 +476,13 @@ sp_te_insert(SPItem *item, Inkscape::Text::Layout::iterator const &position, gch layout->getSourceOfCharacter(it_prev_char, &rawptr, &iter_text); source_obj = SP_OBJECT(rawptr); if (SP_IS_STRING(source_obj)) { - // the simple case + // If the parent is a tref, editing on this particular string is disallowed. + if (SP_IS_TREF(SP_OBJECT_PARENT(source_obj))) { + desktop->messageStack()->flash(Inkscape::ERROR_MESSAGE, tref_edit_message); + return position; + } + + // Now the simple case can begin... if (!cursor_at_start) iter_text++; SPString *string_item = SP_STRING(source_obj); insert_into_spstring(string_item, cursor_at_end ? string_item->string.end() : iter_text, utf8); @@ -457,11 +518,17 @@ sp_te_insert(SPItem *item, Inkscape::Text::Layout::iterator const &position, gch g_assert(SP_IS_STRING(source_obj->firstChild())); string_item = SP_STRING(source_obj->firstChild()); } + // If the parent is a tref, editing on this particular string is disallowed. + if (SP_IS_TREF(SP_OBJECT_PARENT(string_item))) { + desktop->messageStack()->flash(Inkscape::ERROR_MESSAGE, tref_edit_message); + return position; + } + insert_into_spstring(string_item, cursor_at_end ? string_item->string.end() : string_item->string.begin(), utf8); } } - item->updateRepr(SP_OBJECT_REPR(item),SP_OBJECT_WRITE_EXT); + item->updateRepr(); unsigned char_index = layout->iteratorToCharIndex(position); te_update_layout_now(item); item->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); @@ -619,30 +686,35 @@ static void erase_from_spstring(SPString *string_item, Glib::ustring::iterator i quite a complicated operation, partly due to the cleanup that is done if all the text in a subobject has been deleted, and partly due to the difficulty of figuring out what is a line break and how to delete one. Returns the -lesser of \a start and \a end, because that is where the cursor should be -put after the deletion is done. */ -Inkscape::Text::Layout::iterator -sp_te_delete (SPItem *item, Inkscape::Text::Layout::iterator const &start, Inkscape::Text::Layout::iterator const &end) +real start and ending iterators based on the situation. */ +bool +sp_te_delete (SPItem *item, Inkscape::Text::Layout::iterator const &start, + Inkscape::Text::Layout::iterator const &end, iterator_pair &iter_pair) { - if (start == end) return start; - Inkscape::Text::Layout::iterator first, last; - if (start < end) { - first = start; - last = end; - } else { - first = end; - last = start; + bool success = false; + + iter_pair.first = start; + iter_pair.second = end; + + if (start == end) return success; + + if (start > end) { + iter_pair.first = end; + iter_pair.second = start; } + + SPDesktop *desktop = SP_ACTIVE_DESKTOP; + Inkscape::Text::Layout const *layout = te_get_layout(item); SPObject *start_item = 0, *end_item = 0; void *rawptr = 0; Glib::ustring::iterator start_text_iter, end_text_iter; - layout->getSourceOfCharacter(first, &rawptr, &start_text_iter); + layout->getSourceOfCharacter(iter_pair.first, &rawptr, &start_text_iter); start_item = SP_OBJECT(rawptr); - layout->getSourceOfCharacter(last, &rawptr, &end_text_iter); + layout->getSourceOfCharacter(iter_pair.second, &rawptr, &end_text_iter); end_item = SP_OBJECT(rawptr); if (start_item == 0) - return first; // start is at end of text + return success; // start is at end of text if (is_line_break_object(start_item)) move_to_end_of_paragraph(&start_item, &start_text_iter); if (end_item == 0) { @@ -657,7 +729,13 @@ sp_te_delete (SPItem *item, Inkscape::Text::Layout::iterator const &start, Inksc if (start_item == end_item) { // the quick case where we're deleting stuff all from the same string if (SP_IS_STRING(start_item)) { // always true (if it_start != it_end anyway) - erase_from_spstring(SP_STRING(start_item), start_text_iter, end_text_iter); + // If the parent is a tref, editing on this particular string is disallowed. + if (SP_IS_TREF(SP_OBJECT_PARENT(start_item))) { + desktop->messageStack()->flash(Inkscape::ERROR_MESSAGE, tref_edit_message); + } else { + erase_from_spstring(SP_STRING(start_item), start_text_iter, end_text_iter); + success = true; + } } } else { SPObject *sub_item = start_item; @@ -665,8 +743,15 @@ sp_te_delete (SPItem *item, Inkscape::Text::Layout::iterator const &start, Inksc while (sub_item != item) { if (sub_item == end_item) { if (SP_IS_STRING(sub_item)) { + // If the parent is a tref, editing on this particular string is disallowed. + if (SP_IS_TREF(SP_OBJECT_PARENT(sub_item))) { + desktop->messageStack()->flash(Inkscape::ERROR_MESSAGE, tref_edit_message); + break; + } + Glib::ustring *string = &SP_STRING(sub_item)->string; erase_from_spstring(SP_STRING(sub_item), string->begin(), end_text_iter); + success = true; } break; } @@ -676,6 +761,7 @@ sp_te_delete (SPItem *item, Inkscape::Text::Layout::iterator const &start, Inksc erase_from_spstring(string, start_text_iter, string->string.end()); else erase_from_spstring(string, string->string.begin(), string->string.end()); + success = true; } // walk to the next item in the tree if (sub_item->hasChildren()) @@ -701,11 +787,12 @@ sp_te_delete (SPItem *item, Inkscape::Text::Layout::iterator const &start, Inksc } } - while (tidy_xml_tree_recursively(common_ancestor)); + while (tidy_xml_tree_recursively(common_ancestor)){}; te_update_layout_now(item); item->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG); - layout->validateIterator(&first); - return first; + layout->validateIterator(&iter_pair.first); + layout->validateIterator(&iter_pair.second); + return success; } @@ -864,13 +951,13 @@ text_tag_attributes_at_position(SPItem *item, Inkscape::Text::Layout::iterator c } void -sp_te_adjust_kerning_screen (SPItem *item, Inkscape::Text::Layout::iterator const &start, Inkscape::Text::Layout::iterator const &end, SPDesktop *desktop, NR::Point by) +sp_te_adjust_kerning_screen (SPItem *item, Inkscape::Text::Layout::iterator const &start, Inkscape::Text::Layout::iterator const &end, SPDesktop *desktop, Geom::Point by) { // divide increment by zoom // divide increment by matrix expansion gdouble factor = 1 / desktop->current_zoom(); - NR::Matrix t = sp_item_i2doc_affine(item); - factor = factor / NR::expansion(t); + Geom::Matrix t (sp_item_i2doc_affine(item)); + factor = factor / t.descrim(); by = factor * by; unsigned char_index; @@ -891,8 +978,8 @@ sp_te_adjust_rotation_screen(SPItem *text, Inkscape::Text::Layout::iterator cons // divide increment by zoom // divide increment by matrix expansion gdouble factor = 1 / desktop->current_zoom(); - NR::Matrix t = sp_item_i2doc_affine(text); - factor = factor / NR::expansion(t); + Geom::Matrix t (sp_item_i2doc_affine(text)); + factor = factor / t.descrim(); Inkscape::Text::Layout const *layout = te_get_layout(text); if (layout == NULL) return; SPObject *source_item = 0; @@ -906,7 +993,7 @@ sp_te_adjust_rotation_screen(SPItem *text, Inkscape::Text::Layout::iterator cons } void -sp_te_adjust_rotation(SPItem *text, Inkscape::Text::Layout::iterator const &start, Inkscape::Text::Layout::iterator const &end, SPDesktop *desktop, gdouble degrees) +sp_te_adjust_rotation(SPItem *text, Inkscape::Text::Layout::iterator const &start, Inkscape::Text::Layout::iterator const &end, SPDesktop */*desktop*/, gdouble degrees) { unsigned char_index; TextTagAttributes *attributes = text_tag_attributes_at_position(text, std::min(start, end), &char_index); @@ -976,7 +1063,7 @@ sp_te_adjust_tspan_letterspacing_screen(SPItem *text, Inkscape::Text::Layout::it gdouble const zoom = desktop->current_zoom(); gdouble const zby = (by / (zoom * (nb_let > 1 ? nb_let - 1 : 1)) - / NR::expansion(sp_item_i2doc_affine(SP_ITEM(source_obj)))); + / to_2geom(sp_item_i2doc_affine(SP_ITEM(source_obj))).descrim()); val += zby; if (start == end) { @@ -1007,8 +1094,21 @@ sp_te_adjust_tspan_letterspacing_screen(SPItem *text, Inkscape::Text::Layout::it text->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG | SP_TEXT_LAYOUT_MODIFIED_FLAG); } +double +sp_te_get_average_linespacing (SPItem *text) +{ + Inkscape::Text::Layout const *layout = te_get_layout(text); + if (!layout) + return 0; + + unsigned line_count = layout->lineIndex(layout->end()); + double all_lines_height = layout->characterAnchorPoint(layout->end())[Geom::Y] - layout->characterAnchorPoint(layout->begin())[Geom::Y]; + double average_line_height = all_lines_height / (line_count == 0 ? 1 : line_count); + return average_line_height; +} + void -sp_te_adjust_linespacing_screen (SPItem *text, Inkscape::Text::Layout::iterator const &start, Inkscape::Text::Layout::iterator const &end, SPDesktop *desktop, gdouble by) +sp_te_adjust_linespacing_screen (SPItem *text, Inkscape::Text::Layout::iterator const &/*start*/, Inkscape::Text::Layout::iterator const &/*end*/, SPDesktop *desktop, gdouble by) { // TODO: use start and end iterators to delineate the area to be affected g_return_if_fail (text != NULL); @@ -1026,7 +1126,7 @@ sp_te_adjust_linespacing_screen (SPItem *text, Inkscape::Text::Layout::iterator } unsigned line_count = layout->lineIndex(layout->end()); - double all_lines_height = layout->characterAnchorPoint(layout->end())[NR::Y] - layout->characterAnchorPoint(layout->begin())[NR::Y]; + double all_lines_height = layout->characterAnchorPoint(layout->end())[Geom::Y] - layout->characterAnchorPoint(layout->begin())[Geom::Y]; double average_line_height = all_lines_height / (line_count == 0 ? 1 : line_count); if (fabs(average_line_height) < 0.001) average_line_height = 0.001; @@ -1035,8 +1135,8 @@ sp_te_adjust_linespacing_screen (SPItem *text, Inkscape::Text::Layout::iterator gdouble zby = by / (desktop->current_zoom() * (line_count == 0 ? 1 : line_count)); // divide increment by matrix expansion - NR::Matrix t = sp_item_i2doc_affine (SP_ITEM(text)); - zby = zby / NR::expansion(t); + Geom::Matrix t (sp_item_i2doc_affine (SP_ITEM(text))); + zby = zby / t.descrim(); switch (style->line_height.unit) { case SP_CSS_UNIT_NONE: @@ -1054,27 +1154,27 @@ sp_te_adjust_linespacing_screen (SPItem *text, Inkscape::Text::Layout::iterator else style->line_height.value *= (average_line_height + zby) / average_line_height; break; // absolute-type units - case SP_CSS_UNIT_PX: + case SP_CSS_UNIT_PX: style->line_height.computed += zby; style->line_height.value = style->line_height.computed; break; - case SP_CSS_UNIT_PT: + case SP_CSS_UNIT_PT: style->line_height.computed += zby * PT_PER_PX; style->line_height.value = style->line_height.computed; break; - case SP_CSS_UNIT_PC: + case SP_CSS_UNIT_PC: style->line_height.computed += zby * (PT_PER_PX / 12); style->line_height.value = style->line_height.computed; break; - case SP_CSS_UNIT_MM: + case SP_CSS_UNIT_MM: style->line_height.computed += zby * MM_PER_PX; style->line_height.value = style->line_height.computed; break; - case SP_CSS_UNIT_CM: + case SP_CSS_UNIT_CM: style->line_height.computed += zby * CM_PER_PX; style->line_height.value = style->line_height.computed; break; - case SP_CSS_UNIT_IN: + case SP_CSS_UNIT_IN: style->line_height.computed += zby * IN_PER_PX; style->line_height.value = style->line_height.computed; break; @@ -1103,7 +1203,7 @@ as opposed to sp_style_merge_from_style_string which merges its parameter underneath the existing styles (ie ignoring already set properties). */ static void overwrite_style_with_string(SPObject *item, gchar const *style_string) { - SPStyle *new_style = sp_style_new(); + SPStyle *new_style = sp_style_new(SP_OBJECT_DOCUMENT(item)); sp_style_merge_from_style_string(new_style, style_string); gchar const *item_style_string = SP_OBJECT_REPR(item)->attribute("style"); if (item_style_string && *item_style_string) @@ -1128,7 +1228,7 @@ static bool objects_have_equal_style(SPObject const *parent, SPObject const *chi gchar *parent_style = sp_style_write_string(parent->style, SP_STYLE_FLAG_ALWAYS); // we have to write parent_style then read it again, because some properties format their values // differently depending on whether they're set or not (*cough*dash-offset*cough*) - SPStyle *parent_spstyle = sp_style_new(); + SPStyle *parent_spstyle = sp_style_new(SP_OBJECT_DOCUMENT(parent)); sp_style_merge_from_style_string(parent_spstyle, parent_style); g_free(parent_style); parent_style = sp_style_write_string(parent_spstyle, SP_STYLE_FLAG_ALWAYS); @@ -1144,7 +1244,7 @@ static bool objects_have_equal_style(SPObject const *parent, SPObject const *chi } child = SP_OBJECT_PARENT(child); } - SPStyle *child_spstyle = sp_style_new(); + SPStyle *child_spstyle = sp_style_new(SP_OBJECT_DOCUMENT(parent)); sp_style_merge_from_style_string(child_spstyle, child_style_construction.c_str()); gchar *child_style = sp_style_write_string(child_spstyle, SP_STYLE_FLAG_ALWAYS); sp_style_unref(child_spstyle); @@ -1348,6 +1448,7 @@ static bool tidy_operator_empty_spans(SPObject **item) the repeated strings will be merged by another operator. */ static bool tidy_operator_inexplicable_spans(SPObject **item) { + if (*item && sp_repr_is_meta_element((*item)->repr)) return false; if (SP_IS_STRING(*item)) return false; if (is_line_break_object(*item)) return false; TextTagAttributes *attrs = attributes_for_object(*item); @@ -1576,6 +1677,7 @@ static bool tidy_operator_styled_whitespace(SPObject **item) for ( ; ; ) { // go up one item in the xml test_item = SP_OBJECT_PARENT(test_item); if (is_line_break_object(test_item)) break; + if (SP_IS_FLOWTEXT(test_item)) return false; SPObject *next = SP_OBJECT_NEXT(test_item); if (next) { test_item = next; @@ -1633,7 +1735,7 @@ static bool tidy_xml_tree_recursively(SPObject *root) bool changes = false; for (SPObject *child = root->firstChild() ; child != NULL ; ) { - if (SP_IS_FLOWREGION(child) || SP_IS_FLOWREGIONEXCLUDE(child)) { + if (SP_IS_FLOWREGION(child) || SP_IS_FLOWREGIONEXCLUDE(child) || SP_IS_TREF(child)) { child = SP_OBJECT_NEXT(child); continue; } @@ -1683,6 +1785,16 @@ void sp_te_apply_style(SPItem *text, Inkscape::Text::Layout::iterator const &sta if (is_line_break_object(end_item)) end_item = SP_OBJECT_NEXT(end_item); if (end_item == 0) end_item = text; + + + /* Special case: With a tref, we only want to change its style when the whole + * string is selected, in which case the style can be applied directly to the + * tref node. If only part of the tref's string child is selected, just return. */ + + if (!sp_tref_fully_contained(start_item, start_text_iter, end_item, end_text_iter)) { + + return; + } /* stage 1: applying the style. Go up to the closest common ancestor of start and end and then semi-recursively apply the style to all the @@ -1693,9 +1805,24 @@ void sp_te_apply_style(SPItem *text, Inkscape::Text::Layout::iterator const &sta The recursion may involve creating new spans. */ SPObject *common_ancestor = get_common_ancestor(text, start_item, end_item); + + // bug #168370 (consider parent transform and viewBox) + // snipplet copied from desktop-style.cpp sp_desktop_apply_css_recursive(...) + SPCSSAttr *css_set = sp_repr_css_attr_new(); + sp_repr_css_merge(css_set, (SPCSSAttr*) css); + { + Geom::Matrix const local(sp_item_i2doc_affine(SP_ITEM(common_ancestor))); + double const ex(local.descrim()); + if ( ( ex != 0. ) + && ( ex != 1. ) ) { + sp_css_attr_scale(css_set, 1/ex); + } + } + start_item = ascend_while_first(start_item, start_text_iter, common_ancestor); end_item = ascend_while_first(end_item, end_text_iter, common_ancestor); - recursively_apply_style(common_ancestor, css, start_item, start_text_iter, end_item, end_text_iter, span_name_for_text_object(text)); + recursively_apply_style(common_ancestor, css_set, start_item, start_text_iter, end_item, end_text_iter, span_name_for_text_object(text)); + sp_repr_css_attr_unref(css_set); /* stage 2: cleanup the xml tree (of which there are multiple passes) */ /* discussion: this stage requires a certain level of inventiveness because @@ -1709,7 +1836,7 @@ void sp_te_apply_style(SPItem *text, Inkscape::Text::Layout::iterator const &sta and neither option can be made to work, a fallback could be to reduce everything to a single level of nesting and drop all pretence of roundtrippability. */ - while (tidy_xml_tree_recursively(common_ancestor)); + while (tidy_xml_tree_recursively(common_ancestor)){}; // if we only modified subobjects this won't have been automatically sent text->requestDisplayUpdate(SP_OBJECT_MODIFIED_FLAG | SP_OBJECT_STYLE_MODIFIED_FLAG);