X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText2.cpp;h=b7dc9a13d60373425bf835bd9eebf70d52594ef0;hb=4056f0ddb150d0e5d60bc5941d51e365eed0ac86;hp=2a6abbfb39566c6cc997e9e820d313f1fffe9b50;hpb=3e2af36af1cdd3f80a054a0e87c6a0dda344a416;p=lyx.git diff --git a/src/Text2.cpp b/src/Text2.cpp index 2a6abbfb39..b7dc9a13d6 100644 --- a/src/Text2.cpp +++ b/src/Text2.cpp @@ -22,20 +22,18 @@ #include "Text.h" +#include "Bidi.h" #include "Buffer.h" #include "buffer_funcs.h" #include "BufferList.h" #include "BufferParams.h" #include "BufferView.h" -#include "Bullet.h" #include "Changes.h" #include "Cursor.h" #include "CutAndPaste.h" -#include "debug.h" #include "DispatchResult.h" #include "ErrorList.h" #include "FuncRequest.h" -#include "gettext.h" #include "Language.h" #include "Layout.h" #include "Lexer.h" @@ -44,31 +42,23 @@ #include "Paragraph.h" #include "paragraph_funcs.h" #include "ParagraphParameters.h" -#include "ParIterator.h" -#include "Server.h" -#include "ServerSocket.h" +#include "TextClass.h" #include "TextMetrics.h" #include "VSpace.h" -#include "frontends/FontMetrics.h" - #include "insets/InsetEnvironment.h" #include "mathed/InsetMathHull.h" +#include "support/debug.h" +#include "support/gettext.h" #include "support/textutils.h" -#include #include #include -using std::endl; -using std::ostringstream; -using std::string; -using std::max; -using std::min; -using std::istringstream; +using namespace std; namespace lyx { @@ -167,10 +157,9 @@ void Text::setCharFont(Buffer const & buffer, pit_type pit, void Text::setInsetFont(BufferView const & bv, pit_type pit, pos_type pos, Font const & font, bool toggleall) { - BOOST_ASSERT(pars_[pit].isInset(pos) && - pars_[pit].getInset(pos)->noFontChange()); - Inset * const inset = pars_[pit].getInset(pos); + BOOST_ASSERT(inset && inset->noFontChange()); + CursorSlice::idx_type endidx = inset->nargs(); for (CursorSlice cs(*inset); cs.idx() != endidx; ++cs.idx()) { Text * text = cs.text(); @@ -210,7 +199,7 @@ void Text::setLayout(Buffer const & buffer, pit_type start, pit_type end, BOOST_ASSERT(start != end); BufferParams const & bufparams = buffer.params(); - LayoutPtr const & lyxlayout = bufparams.getTextClass()[layout]; + LayoutPtr const & lyxlayout = bufparams.textClass()[layout]; for (pit_type pit = start; pit != end; ++pit) { Paragraph & par = pars_[pit]; @@ -229,10 +218,10 @@ void Text::setLayout(Cursor & cur, docstring const & layout) // special handling of new environment insets BufferView & bv = cur.bv(); BufferParams const & params = bv.buffer().params(); - LayoutPtr const & lyxlayout = params.getTextClass()[layout]; + LayoutPtr const & lyxlayout = params.textClass()[layout]; if (lyxlayout->is_environment) { // move everything in a new environment inset - LYXERR(Debug::DEBUG) << "setting layout " << to_utf8(layout) << endl; + 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)); @@ -358,21 +347,22 @@ void Text::setFont(BufferView const & bv, CursorSlice const & begin, // nested insets. Language const * language = buffer.params().language; for (CursorSlice dit = begin; dit != end; dit.forwardPos()) { - if (dit.pos() != dit.lastpos()) { - pit_type const pit = dit.pit(); - pos_type const pos = dit.pos(); - if (pars_[pit].isInset(pos) && - pars_[pit].getInset(pos)->noFontChange()) - // We need to propagate the font change to all - // text cells of the inset (bug 1973). - // FIXME: This should change, see documentation - // of noFontChange in Inset.h - setInsetFont(bv, pit, pos, font, toggleall); - TextMetrics const & tm = bv.textMetrics(this); - Font f = tm.getDisplayFont(pit, pos); - f.update(font, language, toggleall); - setCharFont(buffer, pit, pos, f, tm.font_); + if (dit.pos() == dit.lastpos()) + continue; + pit_type const pit = dit.pit(); + pos_type const pos = dit.pos(); + Inset * inset = pars_[pit].getInset(pos); + if (inset && inset->noFontChange()) { + // We need to propagate the font change to all + // text cells of the inset (bug 1973). + // FIXME: This should change, see documentation + // of noFontChange in Inset.h + setInsetFont(bv, pit, pos, font, toggleall); } + TextMetrics const & tm = bv.textMetrics(this); + Font f = tm.getDisplayFont(pit, pos); + f.update(font, language, toggleall); + setCharFont(buffer, pit, pos, f, tm.font_); } } @@ -428,25 +418,23 @@ docstring Text::getStringToIndex(Cursor const & cur) { BOOST_ASSERT(this == cur.text()); - docstring idxstring; if (cur.selection()) - idxstring = cur.selectionAsString(false); - else { - // Try implicit word selection. If there is a change - // in the language the implicit word selection is - // disabled. - Cursor tmpcur = cur; - selectWord(tmpcur, PREVIOUS_WORD); - - if (!tmpcur.selection()) - cur.message(_("Nothing to index!")); - else if (tmpcur.selBegin().pit() != tmpcur.selEnd().pit()) - cur.message(_("Cannot index more than one paragraph!")); - else - idxstring = tmpcur.selectionAsString(false); - } - - return idxstring; + return cur.selectionAsString(false); + + // Try implicit word selection. If there is a change + // in the language the implicit word selection is + // disabled. + Cursor tmpcur = cur; + selectWord(tmpcur, PREVIOUS_WORD); + + if (!tmpcur.selection()) + cur.message(_("Nothing to index!")); + else if (tmpcur.selBegin().pit() != tmpcur.selEnd().pit()) + cur.message(_("Cannot index more than one paragraph!")); + else + return tmpcur.selectionAsString(false); + + return docstring(); } @@ -457,13 +445,14 @@ void Text::setParagraphs(Cursor & cur, docstring arg, bool merge) pit_type undopit = undoSpan(cur.selEnd().pit()); recUndo(cur, cur.selBegin().pit(), undopit - 1); + //FIXME UNICODE + string const argument = to_utf8(arg); for (pit_type pit = cur.selBegin().pit(), end = cur.selEnd().pit(); pit <= end; ++pit) { Paragraph & par = pars_[pit]; ParagraphParameters params = par.params(); - params.read(to_utf8(arg), merge); - Layout const & layout = *(par.layout()); - par.params().apply(params, layout); + params.read(argument, merge); + par.params().apply(params, *par.layout()); } } @@ -493,8 +482,8 @@ void Text::insertInset(Cursor & cur, Inset * inset) BOOST_ASSERT(this == cur.text()); BOOST_ASSERT(inset); cur.paragraph().insertInset(cur.pos(), inset, cur.current_font, - Change(cur.buffer().params().trackChanges ? - Change::INSERTED : Change::UNCHANGED)); + Change(cur.buffer().params().trackChanges + ? Change::INSERTED : Change::UNCHANGED)); } @@ -502,7 +491,7 @@ void Text::insertInset(Cursor & cur, Inset * inset) void Text::insertStringAsLines(Cursor & cur, docstring const & str) { cur.buffer().insertStringAsLines(pars_, cur.pit(), cur.pos(), - cur.current_font, str, autoBreakRows_); + cur.current_font, str, autoBreakRows_); } @@ -536,9 +525,11 @@ void Text::insertStringAsParagraphs(Cursor & cur, docstring const & str) bool Text::setCursor(Cursor & cur, pit_type par, pos_type pos, bool setfont, bool boundary) { + TextMetrics const & tm = cur.bv().textMetrics(this); + bool const update_needed = !tm.has(par); Cursor old = cur; setCursorIntern(cur, par, pos, setfont, boundary); - return cur.bv().checkDepm(cur, old); + return cur.bv().checkDepm(cur, old) || update_needed; } @@ -602,6 +593,24 @@ bool Text::checkAndActivateInset(Cursor & cur, bool front) } +bool Text::checkAndActivateInsetVisual(Cursor & cur, bool movingForward, bool movingLeft) +{ + if (cur.selection()) + return false; + if (cur.pos() == -1) + return false; + if (cur.pos() == cur.lastpos()) + return false; + Paragraph & par = cur.paragraph(); + Inset * inset = par.isInset(cur.pos()) ? par.getInset(cur.pos()) : 0; + if (!inset || inset->editable() != Inset::HIGHLY_EDITABLE) + return false; + inset->edit(cur, movingForward, + movingLeft ? Inset::ENTRY_DIRECTION_RIGHT : Inset::ENTRY_DIRECTION_LEFT); + return true; +} + + bool Text::cursorBackward(Cursor & cur) { // Tell BufferView to test for FitCursor in any case! @@ -644,6 +653,186 @@ 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! + return false; + } + + // Are we already at leftmost pos in row? + if (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); +} + + +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! + return false; + } + + // Are we already at rightmost pos in row? + if (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); +} + + bool Text::cursorForward(Cursor & cur) { // Tell BufferView to test for FitCursor in any case! @@ -746,7 +935,7 @@ void Text::fixCursorAfterDelete(CursorSlice & cur, CursorSlice const & where) bool Text::deleteEmptyParagraphMechanism(Cursor & cur, Cursor & old, bool & need_anchor_change) { - //LYXERR(Debug::DEBUG) << "DEPM: cur:\n" << cur << "old:\n" << old << endl; + //LYXERR(Debug::DEBUG, "DEPM: cur:\n" << cur << "old:\n" << old); Paragraph & oldpar = old.paragraph(); @@ -819,7 +1008,7 @@ bool Text::deleteEmptyParagraphMechanism(Cursor & cur, bool const soa = oldpar.params().startOfAppendix(); plist.erase(boost::next(plist.begin(), old.pit())); // do not lose start of appendix marker (bug 4212) - if (soa) + if (soa && old.pit() < pit_type(plist.size())) plist[old.pit()].params().startOfAppendix(true); // see #warning (FIXME?) above