X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText2.cpp;h=45fb9dfe6910b6e275cb64b6e2712cdf7cebad7b;hb=4080450341a4ed1cec0e4f72d9c917d2c7378157;hp=27b70aabb0646283a283643816b6289af8bbad05;hpb=880b6c4d6ebd6f8e36b340a3efa3cb13108cc478;p=lyx.git diff --git a/src/Text2.cpp b/src/Text2.cpp index 27b70aabb0..45fb9dfe69 100644 --- a/src/Text2.cpp +++ b/src/Text2.cpp @@ -11,6 +11,7 @@ * \author John Levon * \author André Pönitz * \author Allan Rae + * \author Stefan Schimanski * \author Dekel Tsur * \author Jürgen Vigna * @@ -149,9 +150,7 @@ Font Text::getFont(Buffer const & buffer, Paragraph const & par, BOOST_ASSERT(pos >= 0); Layout_ptr const & layout = par.layout(); -#ifdef WITH_WARNINGS -#warning broken? -#endif + // FIXME: broken? BufferParams const & params = buffer.params(); pos_type const body_pos = par.beginOfBody(); @@ -328,7 +327,7 @@ void Text::setInsetFont(Buffer const & buffer, pit_type pit, DocIterator cellend = cellbegin; cellend.pit() = cellend.lastpit(); cellend.pos() = cellend.lastpos(); - text->setFont(buffer, cellbegin, cellend, font, toggleall); + text->setFont(buffer, cellbegin.top(), cellend.top(), font, toggleall); } if (dit == end) break; @@ -357,7 +356,7 @@ pit_type Text::undoSpan(pit_type pit) void Text::setLayout(Buffer const & buffer, pit_type start, pit_type end, - string const & layout) + docstring const & layout) { BOOST_ASSERT(start != end); @@ -375,7 +374,7 @@ void Text::setLayout(Buffer const & buffer, pit_type start, pit_type end, // set layout over selection and make a total rebreak of those paragraphs -void Text::setLayout(Cursor & cur, string const & layout) +void Text::setLayout(Cursor & cur, docstring const & layout) { BOOST_ASSERT(this == cur.text()); // special handling of new environment insets @@ -384,7 +383,7 @@ void Text::setLayout(Cursor & cur, string const & layout) Layout_ptr const & lyxlayout = params.getTextClass()[layout]; if (lyxlayout->is_environment) { // move everything in a new environment inset - LYXERR(Debug::DEBUG) << "setting layout " << layout << endl; + LYXERR(Debug::DEBUG) << "setting layout " << to_utf8(layout) << endl; lyx::dispatch(FuncRequest(LFUN_LINE_BEGIN)); lyx::dispatch(FuncRequest(LFUN_LINE_END_SELECT)); lyx::dispatch(FuncRequest(LFUN_CUT)); @@ -493,13 +492,13 @@ void Text::setFont(Cursor & cur, Font const & font, bool toggleall) // Ok, we have a selection. recordUndoSelection(cur); - setFont(cur.buffer(), cur.selectionBegin(), cur.selectionEnd(), font, - toggleall); + setFont(cur.buffer(), cur.selectionBegin().top(), + cur.selectionEnd().top(), font, toggleall); } -void Text::setFont(Buffer const & buffer, DocIterator const & begin, - DocIterator const & end, Font const & font, +void Text::setFont(Buffer const & buffer, CursorSlice const & begin, + CursorSlice const & end, Font const & font, bool toggleall) { // Don't use forwardChar here as ditend might have @@ -507,7 +506,7 @@ void Text::setFont(Buffer const & buffer, DocIterator const & begin, // Can't use forwardPos either as this descends into // nested insets. Language const * language = buffer.params().language; - for (DocIterator dit = begin; dit != end; dit.forwardPosNoDescend()) { + 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(); @@ -648,16 +647,8 @@ void Text::setParagraph(Cursor & cur, params.spacing(spacing); // does the layout allow the new alignment? - Layout_ptr const & layout = par.layout(); - - if (align == LYX_ALIGN_LAYOUT) - align = layout->align; - if (align & layout->alignpossible) { - if (align == layout->align) - params.align(LYX_ALIGN_LAYOUT); - else - params.align(align); - } + if (align & par.layout()->alignpossible) + params.align(align); par.setLabelWidthString(labelwidthstring); params.noindent(noindent); } @@ -669,7 +660,7 @@ void Text::insertInset(Cursor & cur, Inset * inset) { BOOST_ASSERT(this == cur.text()); BOOST_ASSERT(inset); - cur.paragraph().insertInset(cur.pos(), inset, + cur.paragraph().insertInset(cur.pos(), inset, current_font, Change(cur.buffer().params().trackChanges ? Change::INSERTED : Change::UNCHANGED)); } @@ -760,42 +751,33 @@ void Text::setCurrentFont(Cursor & cur) pos_type pos = cur.pos(); Paragraph & par = cur.paragraph(); - // ignore empty paragraph - if (par.empty()) - return; - - // if on boundary or at paragraph end, set font of previous char - if ((pos > 0 && cur.boundary()) || pos == cur.lastpos()) + // are we behind previous char in fact? -> go to that char + if (pos > 0 && cur.boundary()) --pos; - - // we changed the line and the bidi tables are outdated? - if (!bidi.inRange(pos)) - bidi.computeTables(par, cur.buffer(), cur.textRow()); - // now in range? - if (!bidi.inRange(pos)) - return; - - if (pos > 0) { + // find position to take the font from + if (pos != 0) { + // paragraph end? -> font of last char if (pos == cur.lastpos()) --pos; - else // potentional bug... BUG (Lgb) - if (par.isSeparator(pos)) { - if (pos > cur.textRow().pos() && - bidi.level(pos) % 2 == - bidi.level(pos - 1) % 2) - --pos; - else if (pos + 1 < cur.lastpos()) - ++pos; - } + // on space? -> look at the words in front of space + else if (pos > 0 && par.isSeparator(pos)) { + // abc| def -> font of c + // abc |[WERBEH], i.e. boundary==true -> font of c + // abc [WERBEH]| def, font of the space + if (!isRTLBoundary(cur.buffer(), par, pos)) + --pos; + } } + // get font BufferParams const & bufparams = cur.buffer().params(); current_font = par.getFontSettings(bufparams, pos); real_current_font = getFont(cur.buffer(), par, pos); + // special case for paragraph end if (cur.pos() == cur.lastpos() - && bidi.isBoundary(cur.buffer(), par, cur.pos()) + && isRTLBoundary(cur.buffer(), par, cur.pos()) && !cur.boundary()) { Language const * lang = par.getParLanguage(bufparams); current_font.setLanguage(lang); @@ -991,7 +973,8 @@ bool Text::cursorLeft(Cursor & cur) // if on right side of boundary (i.e. not at paragraph end, but line end) // -> skip it, i.e. set boundary to true, i.e. go only logically left // there are some exceptions to ignore this: lineseps, newlines, spaces -#ifdef DEBUG +#if 0 + // some effectless debug code to see the values in the debugger bool bound = cur.boundary(); int rowpos = cur.textRow().pos(); int pos = cur.pos(); @@ -1029,17 +1012,20 @@ bool Text::cursorRight(Cursor & cur) // not at paragraph end? if (cur.pos() != cur.lastpos()) { - // if left of boundary -> just jump to right side - if (cur.boundary()) - return setCursor(cur, cur.pit(), cur.pos(), true, false); - // in front of editable inset, i.e. jump into it? if (checkAndActivateInset(cur, true)) return false; - + + // if left of boundary -> just jump to right side + // but for RTL boundaries don't, because: abc|DDEEFFghi -> abcDDEEF|Fghi + if (cur.boundary() && + !isRTLBoundary(cur.buffer(), cur.paragraph(), cur.pos())) + return setCursor(cur, cur.pit(), cur.pos(), true, false); + // next position is left of boundary, // but go to next line for special cases like space, newline, linesep -#ifdef DEBUG +#if 0 + // some effectless debug code to see the values in the debugger int endpos = cur.textRow().endpos(); int lastpos = cur.lastpos(); int pos = cur.pos(); @@ -1060,6 +1046,11 @@ bool Text::cursorRight(Cursor & cur) return setCursor(cur, cur.pit(), cur.pos() + 1, true, true); } + // in front of RTL boundary? Stay on this side of the boundary because: + // ab|cDDEEFFghi -> abc|DDEEFFghi + if (isRTLBoundary(cur.buffer(), cur.paragraph(), cur.pos() + 1)) + return setCursor(cur, cur.pit(), cur.pos() + 1, true, true); + // move right return setCursor(cur, cur.pit(), cur.pos() + 1, true, false); } @@ -1154,12 +1145,10 @@ bool Text::deleteEmptyParagraphMechanism(Cursor & cur, && oldpar.isLineSeparator(old.pos() - 1) && !oldpar.isDeleted(old.pos() - 1)) { oldpar.eraseChar(old.pos() - 1, cur.buffer().params().trackChanges); -#ifdef WITH_WARNINGS -#warning This will not work anymore when we have multiple views of the same buffer +// FIXME: This will not work anymore when we have multiple views of the same buffer // In this case, we will have to correct also the cursors held by // other bufferviews. It will probably be easier to do that in a more // automated way in CursorSlice code. (JMarc 26/09/2001) -#endif // correct all cursor parts if (same_par) { fixCursorAfterDelete(cur.top(), old.top()); @@ -1189,7 +1178,7 @@ bool Text::deleteEmptyParagraphMechanism(Cursor & cur, ParagraphList & plist = old.text()->paragraphs(); plist.erase(boost::next(plist.begin(), old.pit())); - // see #warning above + // see #warning (FIXME?) above if (cur.depth() >= old.depth()) { CursorSlice & curslice = cur[old.depth() - 1]; if (&curslice.inset() == &old.inset()