X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText2.cpp;h=4a0c1dd3eb27b9b7393d0f4d6e75e6fd77ad2c15;hb=d145c2dc9f27666ca0ed9f8589f99f502d7b2a4d;hp=27fe087c109159ca389500175e9b16980c65c9ed;hpb=5dfa0c0381173e8dd4bb5c873be65853ad7b8240;p=lyx.git diff --git a/src/Text2.cpp b/src/Text2.cpp index 27fe087c10..4a0c1dd3eb 100644 --- a/src/Text2.cpp +++ b/src/Text2.cpp @@ -46,11 +46,9 @@ #include "TextMetrics.h" #include "VSpace.h" -#include "insets/InsetEnvironment.h" - #include "mathed/InsetMathHull.h" -#include "support/assert.h" +#include "support/lassert.h" #include "support/debug.h" #include "support/gettext.h" #include "support/textutils.h" @@ -216,22 +214,6 @@ void Text::setLayout(Buffer const & buffer, pit_type start, pit_type end, void Text::setLayout(Cursor & cur, docstring const & layout) { LASSERT(this == cur.text(), /**/); - // special handling of new environment insets - BufferView & bv = cur.bv(); - BufferParams const & params = bv.buffer().params(); - Layout const & lyxlayout = params.documentClass()[layout]; - if (lyxlayout.is_environment) { - // move everything in a new environment inset - LYXERR(Debug::DEBUG, "setting layout " << to_utf8(layout)); - lyx::dispatch(FuncRequest(LFUN_LINE_BEGIN)); - lyx::dispatch(FuncRequest(LFUN_LINE_END_SELECT)); - lyx::dispatch(FuncRequest(LFUN_CUT)); - Inset * inset = new InsetEnvironment(bv.buffer(), layout); - insertInset(cur, inset); - //inset->edit(cur, true); - //lyx::dispatch(FuncRequest(LFUN_PASTE)); - return; - } pit_type start = cur.selBegin().pit(); pit_type end = cur.selEnd().pit() + 1; @@ -386,8 +368,7 @@ void Text::toggleFree(Cursor & cur, Font const & font, bool toggleall) { LASSERT(this == cur.text(), /**/); // If the mask is completely neutral, tell user - if (font.fontInfo() == ignore_font && - (font.language() == 0 || font.language() == ignore_language)) { + if (font.fontInfo() == ignore_font && font.language() == ignore_language) { // Could only happen with user style cur.message(_("No font change defined.")); return; @@ -655,181 +636,27 @@ bool Text::cursorBackward(Cursor & cur) bool Text::cursorVisLeft(Cursor & cur, bool skip_inset) { - pit_type new_pit = cur.pit(); // the paragraph to which we will move - pos_type new_pos; // the position we will move to - bool new_boundary; // will we move to a boundary position? - pos_type left_pos; // position visually left of current cursor - pos_type right_pos; // position visually right of current cursor - bool new_pos_is_RTL; // is new position we're moving to RTL? - - cur.getSurroundingPos(left_pos, right_pos); - - LYXERR(Debug::RTL, left_pos <<"|"<< right_pos << " (pos: "<= cur.pos(), true)) { - LYXERR(Debug::RTL, "entering inset at: " << temp_cur.pos()); - cur = temp_cur; // set the real cursor to new position inside inset! + temp_cur.posVisLeft(skip_inset); + if (temp_cur.depth() > cur.depth()) { + cur = temp_cur; return false; } - - // Are we already at leftmost pos in row? - if (cur.text()->empty() || left_pos == -1) { - - Cursor new_cur = cur; - if (!new_cur.posVisToNewRow(true)) { - LYXERR(Debug::RTL, "not moving!"); - return false; - } - - // we actually move the cursor at the end of this function, for now - // just keep track of the new position... - new_pit = new_cur.pit(); - new_pos = new_cur.pos(); - new_boundary = new_cur.boundary(); - - LYXERR(Debug::RTL, "left edge, moving: " << int(new_pit) << "," - << int(new_pos) << "," << (new_boundary ? 1 : 0)); - - } - // normal movement to the left - else { - // Recall, if the cursor is at position 'x', that means *before* - // the character at position 'x'. In RTL, "before" means "to the - // right of", in LTR, "to the left of". So currently our situation - // is this: the position to our left is 'left_pos' (i.e., we're - // currently to the right of 'left_pos'). In order to move to the - // left, it depends whether or not the character at 'left_pos' is RTL. - new_pos_is_RTL = cur.paragraph().getFontSettings( - cur.bv().buffer().params(), left_pos).isVisibleRightToLeft(); - // If the character at 'left_pos' *is* RTL, then in order to move to - // the left of it, we need to be *after* 'left_pos', i.e., move to - // position 'left_pos' + 1. - if (new_pos_is_RTL) { - new_pos = left_pos + 1; - // set the boundary to true in two situations: - if ( - // 1. if new_pos is now lastpos (which means that we're moving left - // to the end of an RTL chunk which is at the end of an LTR - // paragraph); - new_pos == cur.lastpos() - // 2. if the position *after* left_pos is not RTL (we want to be - // *after* left_pos, not before left_pos + 1!) - || !cur.paragraph().getFontSettings(cur.bv().buffer().params(), - new_pos).isVisibleRightToLeft() - ) - new_boundary = true; - else // set the boundary to false - new_boundary = false; - } - // Otherwise (if the character at position 'left_pos' is LTR), then - // moving to the left of it is as easy as setting the new position - // to 'left_pos'. - else { - new_pos = left_pos; - new_boundary = false; - } - - } - - LYXERR(Debug::RTL, "moving to: " << new_pos - << (new_boundary ? " (boundary)" : "")); - - return setCursor(cur, new_pit, new_pos, true, new_boundary); + return setCursor(cur, temp_cur.pit(), temp_cur.pos(), + true, temp_cur.boundary()); } bool Text::cursorVisRight(Cursor & cur, bool skip_inset) { - pit_type new_pit = cur.pit(); // the paragraph to which we will move - pos_type new_pos; // the position we will move to - bool new_boundary; // will we move to a boundary position? - pos_type left_pos; // position visually left of current cursor - pos_type right_pos; // position visually right of current cursor - bool new_pos_is_RTL; // is new position we're moving to RTL? - - cur.getSurroundingPos(left_pos, right_pos); - - LYXERR(Debug::RTL, left_pos <<"|"<< right_pos << " (pos: "<= cur.pos(), false)) { - LYXERR(Debug::RTL, "entering inset at: " << temp_cur.pos()); - cur = temp_cur; // set the real cursor to new position inside inset! + temp_cur.posVisRight(skip_inset); + if (temp_cur.depth() > cur.depth()) { + cur = temp_cur; return false; } - - // Are we already at rightmost pos in row? - if (cur.text()->empty() || right_pos == -1) { - - Cursor new_cur = cur; - if (!new_cur.posVisToNewRow(false)) { - LYXERR(Debug::RTL, "not moving!"); - return false; - } - - // we actually move the cursor at the end of this function, for now - // just keep track of the new position... - new_pit = new_cur.pit(); - new_pos = new_cur.pos(); - new_boundary = new_cur.boundary(); - - LYXERR(Debug::RTL, "right edge, moving: " << int(new_pit) << "," - << int(new_pos) << "," << (new_boundary ? 1 : 0)); - - } - // normal movement to the right - else { - // Recall, if the cursor is at position 'x', that means *before* - // the character at position 'x'. In RTL, "before" means "to the - // right of", in LTR, "to the left of". So currently our situation - // is this: the position to our right is 'right_pos' (i.e., we're - // currently to the left of 'right_pos'). In order to move to the - // right, it depends whether or not the character at 'right_pos' is RTL. - new_pos_is_RTL = cur.paragraph().getFontSettings( - cur.bv().buffer().params(), right_pos).isVisibleRightToLeft(); - // If the character at 'right_pos' *is* LTR, then in order to move to - // the right of it, we need to be *after* 'right_pos', i.e., move to - // position 'right_pos' + 1. - if (!new_pos_is_RTL) { - new_pos = right_pos + 1; - // set the boundary to true in two situations: - if ( - // 1. if new_pos is now lastpos (which means that we're moving - // right to the end of an LTR chunk which is at the end of an - // RTL paragraph); - new_pos == cur.lastpos() - // 2. if the position *after* right_pos is RTL (we want to be - // *after* right_pos, not before right_pos + 1!) - || cur.paragraph().getFontSettings(cur.bv().buffer().params(), - new_pos).isVisibleRightToLeft() - ) - new_boundary = true; - else // set the boundary to false - new_boundary = false; - } - // Otherwise (if the character at position 'right_pos' is RTL), then - // moving to the right of it is as easy as setting the new position - // to 'right_pos'. - else { - new_pos = right_pos; - new_boundary = false; - } - - } - - LYXERR(Debug::RTL, "moving to: " << new_pos - << (new_boundary ? " (boundary)" : "")); - - return setCursor(cur, new_pit, new_pos, true, new_boundary); + return setCursor(cur, temp_cur.pit(), temp_cur.pos(), + true, temp_cur.boundary()); }