![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/text-editing.cpp b/src/text-editing.cpp
index 2ad894cc6122e2269e4046219711da96a7a81af6..482f6faebec07e79a5f52e65007dc32a6ac45d2d 100644 (file)
--- a/src/text-editing.cpp
+++ b/src/text-editing.cpp
# include "config.h"
#endif
+#include <cstring>
+#include <string>
#include <glibmm/i18n.h>
#include "desktop.h"
}
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<NR::Point> 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<Geom::Point> 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<NR::Point>();
+ return std::vector<Geom::Point>();
Inkscape::Text::Layout const *layout = te_get_layout(item);
if (layout == NULL)
- return std::vector<NR::Point>();
+ return std::vector<Geom::Point>();
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)
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, SP_TE_DELETE_OTHER);
- 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);
}
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)
is_line_break = true;
}
-
- if (SP_IS_TSPAN(object) && SP_TSPAN(object)->role != SP_TSPAN_ROLE_UNSPECIFIED) {
- SPObject *prev_object = SP_OBJECT_PREV(object);
- if (prev_object && SP_IS_TSPAN(prev_object)) {
- is_line_break = true;
- }
- }
}
return is_line_break;
@@ -273,6 +270,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
}
@@ -398,7 +398,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);
@@ -520,7 +520,7 @@ sp_te_insert(SPItem *item, Inkscape::Text::Layout::iterator const &position, gch
}
}
- 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);
@@ -678,20 +678,21 @@ 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
+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, sp_te_deletion_type deletionType)
+ 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;
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) {
// 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);
-
- // Compensate so the cursor doesn't move when hitting backspace
- if (deletionType == SP_TE_DELETE_SINGLE_BACKSPACE) {
- first = last;
- }
-
} else {
erase_from_spstring(SP_STRING(start_item), start_text_iter, end_text_iter);
+ success = true;
}
}
} else {
// 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);
- // Compensate so the cursor doesn't move when hitting backspace
- if (deletionType == SP_TE_DELETE_SINGLE_BACKSPACE) {
- //first = last;
- }
break;
}
Glib::ustring *string = &SP_STRING(sub_item)->string;
erase_from_spstring(SP_STRING(sub_item), string->begin(), end_text_iter);
+ success = true;
}
break;
}
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())
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;
}
@@ -948,13 +943,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;
@@ -975,8 +970,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;
@@ -990,7 +985,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);
@@ -1060,7 +1055,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) {
@@ -1091,8 +1086,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);
@@ -1110,7 +1118,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;
@@ -1119,8 +1127,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:
@@ -1138,27 +1146,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;
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);
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;
@@ -1787,9 +1797,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