X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftext.C;h=7ca49fe69e88754bee75bb0fcdb28d7305d990fd;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=b6d69c991b27939d7f9549c40a4644036dd1ad8b;hpb=19cf66f397268c0f040edbc7a02728057535c742;p=lyx.git diff --git a/src/text.C b/src/text.C index b6d69c991b..7ca49fe69e 100644 --- a/src/text.C +++ b/src/text.C @@ -317,9 +317,6 @@ void readParToken(Buffer const & buf, Paragraph & par, LyXLex & lex, } else if (token == "\\newpage") { par.insertInset(par.size(), new InsetPagebreak, font, change); } else if (token == "\\change_unchanged") { - // Hack ! Needed for empty paragraphs :/ - // FIXME: change tracking (MG) - // set empty 'par' to INSERTED??? change = Change(Change::UNCHANGED); } else if (token == "\\change_inserted") { lex.eatLine(); @@ -331,7 +328,6 @@ void readParToken(Buffer const & buf, Paragraph & par, LyXLex & lex, errorList.push_back(ErrorItem(_("Change tracking error"), bformat(_("Unknown author index for insertion: %1$d\n"), aid), par.id(), 0, par.size())); - change = Change(Change::UNCHANGED); } else change = Change(Change::INSERTED, bp.author_map[aid], ct); @@ -345,7 +341,6 @@ void readParToken(Buffer const & buf, Paragraph & par, LyXLex & lex, errorList.push_back(ErrorItem(_("Change tracking error"), bformat(_("Unknown author index for deletion: %1$d\n"), aid), par.id(), 0, par.size())); - change = Change(Change::UNCHANGED); } else change = Change(Change::DELETED, bp.author_map[aid], ct); @@ -368,7 +363,6 @@ void readParagraph(Buffer const & buf, Paragraph & par, LyXLex & lex, Change change(Change::UNCHANGED); while (lex.isOK()) { - readParToken(buf, par, lex, token, font, change, errorList); lex.nextToken(); @@ -406,17 +400,11 @@ void readParagraph(Buffer const & buf, Paragraph & par, LyXLex & lex, -BufferView * LyXText::bv() const -{ - BOOST_ASSERT(bv_owner != 0); - return bv_owner; -} - - -double LyXText::spacing(Paragraph const & par) const +double LyXText::spacing(Buffer const & buffer, + Paragraph const & par) const { if (par.params().spacing().isDefault()) - return bv()->buffer()->params().spacing().getValue(); + return buffer.params().spacing().getValue(); return par.params().spacing().getValue(); } @@ -433,9 +421,11 @@ int LyXText::height() const } -int LyXText::singleWidth(Paragraph const & par, pos_type pos) const +int LyXText::singleWidth(Buffer const & buffer, Paragraph const & par, + pos_type pos) const { - return singleWidth(par, pos, par.getChar(pos), getFont(par, pos)); + return singleWidth(par, pos, par.getChar(pos), + getFont(buffer, par, pos)); } @@ -466,15 +456,16 @@ int LyXText::singleWidth(Paragraph const & par, } -int LyXText::leftMargin(pit_type pit) const +int LyXText::leftMargin(Buffer const & buffer, pit_type pit) const { BOOST_ASSERT(pit >= 0); BOOST_ASSERT(pit < int(pars_.size())); - return leftMargin(pit, pars_[pit].size()); + return leftMargin(buffer, pit, pars_[pit].size()); } -int LyXText::leftMargin(pit_type const pit, pos_type const pos) const +int LyXText::leftMargin(Buffer const & buffer, + pit_type const pit, pos_type const pos) const { BOOST_ASSERT(pit >= 0); BOOST_ASSERT(pit < int(pars_.size())); @@ -482,27 +473,26 @@ int LyXText::leftMargin(pit_type const pit, pos_type const pos) const BOOST_ASSERT(pos >= 0); BOOST_ASSERT(pos <= par.size()); //lyxerr << "LyXText::leftMargin: pit: " << pit << " pos: " << pos << endl; - BufferParams const & params = bv()->buffer()->params(); - LyXTextClass const & tclass = params.getLyXTextClass(); + LyXTextClass const & tclass = buffer.params().getLyXTextClass(); LyXLayout_ptr const & layout = par.layout(); string parindent = layout->parindent; int l_margin = 0; - if (isMainText()) + if (isMainText(buffer)) l_margin += changebarMargin(); // FIXME UNICODE docstring leftm = from_utf8(tclass.leftmargin()); - l_margin += theFontMetrics(params.getFont()).signedWidth(leftm); + l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(leftm); if (par.getDepth() != 0) { // find the next level paragraph pit_type newpar = outerHook(pit, pars_); if (newpar != pit_type(pars_.size())) { if (pars_[newpar].layout()->isEnvironment()) { - l_margin = leftMargin(newpar); + l_margin = leftMargin(buffer, newpar); } if (par.layout() == tclass.defaultLayout()) { if (pars_[newpar].params().noindent()) @@ -520,7 +510,7 @@ int LyXText::leftMargin(pit_type const pit, pos_type const pos) const && pit > 0 && pars_[pit - 1].layout()->nextnoindent) parindent.erase(); - LyXFont const labelfont = getLabelFont(par); + LyXFont const labelfont = getLabelFont(buffer, par); FontMetrics const & labelfont_metrics = theFontMetrics(labelfont); switch (layout->margintype) { @@ -528,7 +518,7 @@ int LyXText::leftMargin(pit_type const pit, pos_type const pos) const if (!layout->leftmargin.empty()) { // FIXME UNICODE docstring leftm = from_utf8(layout->leftmargin); - l_margin += theFontMetrics(params.getFont()).signedWidth(leftm); + l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(leftm); } if (!par.getLabelstring().empty()) { // FIXME UNICODE @@ -560,7 +550,7 @@ int LyXText::leftMargin(pit_type const pit, pos_type const pos) const case MARGIN_STATIC: { // FIXME UNICODE docstring leftm = from_utf8(layout->leftmargin); - l_margin += theFontMetrics(params.getFont()).signedWidth(leftm) + l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(leftm) * 4 / (par.getDepth() + 4); break; } @@ -637,33 +627,33 @@ int LyXText::leftMargin(pit_type const pit, pos_type const pos) const && align == LYX_ALIGN_BLOCK && !par.params().noindent() // in some insets, paragraphs are never indented - && !(par.inInset() && par.inInset()->neverIndent()) + && !(par.inInset() && par.inInset()->neverIndent(buffer)) // display style insets are always centered, omit indentation && !(!par.empty() && par.isInset(pos) && par.getInset(pos)->display()) && (par.layout() != tclass.defaultLayout() - || bv()->buffer()->params().paragraph_separation == + || buffer.params().paragraph_separation == BufferParams::PARSEP_INDENT)) { docstring din = from_utf8(parindent); - l_margin += theFontMetrics(params.getFont()).signedWidth(din); + l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(din); } return l_margin; } -int LyXText::rightMargin(Paragraph const & par) const +int LyXText::rightMargin(Buffer const & buffer, Paragraph const & par) const { // FIXME: the correct way is to only call rightMargin() only // within the main LyXText. The following test is thus bogus. - LyXText const & text = bv()->buffer()->text(); + LyXText const & text = buffer.text(); // We do not want rightmargins on inner texts. if (&text != this) return 0; - BufferParams const & params = bv()->buffer()->params(); + BufferParams const & params = buffer.params(); LyXTextClass const & tclass = params.getLyXTextClass(); docstring trmarg = from_utf8(tclass.rightmargin()); docstring lrmarg = from_utf8(par.layout()->rightmargin); @@ -678,13 +668,13 @@ int LyXText::rightMargin(Paragraph const & par) const } -int LyXText::labelEnd(pit_type const pit) const +int LyXText::labelEnd(Buffer const & buffer, pit_type const pit) const { // labelEnd is only needed if the layout fills a flushleft label. if (pars_[pit].layout()->margintype != MARGIN_MANUAL) return 0; // return the beginning of the body - return leftMargin(pit); + return leftMargin(buffer, pit); } @@ -705,7 +695,8 @@ pos_type addressBreakPoint(pos_type i, Paragraph const & par) }; -void LyXText::rowBreakPoint(pit_type const pit, Row & row) const +void LyXText::rowBreakPoint(Buffer const & buffer, int right_margin, + pit_type const pit, Row & row) const { Paragraph const & par = pars_[pit]; pos_type const end = par.size(); @@ -716,7 +707,7 @@ void LyXText::rowBreakPoint(pit_type const pit, Row & row) const } // maximum pixel width of a row - int width = maxwidth_ - rightMargin(par); // - leftMargin(pit, row); + int width = maxwidth_ - right_margin; // - leftMargin(buffer, pit, row); if (width < 0) { row.endpos(end); return; @@ -736,16 +727,16 @@ void LyXText::rowBreakPoint(pit_type const pit, Row & row) const // or the end of the par, then choose the possible break // nearest that. - int const left = leftMargin(pit, pos); + int const left = leftMargin(buffer, pit, pos); int x = left; // pixel width since last breakpoint int chunkwidth = 0; - FontIterator fi = FontIterator(*this, par, pos); + FontIterator fi = FontIterator(buffer, *this, par, pos); pos_type point = end; pos_type i = pos; - FontMetrics const & fm = theFontMetrics(getLabelFont(par)); + FontMetrics const & fm = theFontMetrics(getLabelFont(buffer, par)); for ( ; i < end; ++i, ++fi) { char_type const c = par.getChar(i); int thiswidth = singleWidth(par, i, c, *fi); @@ -755,9 +746,9 @@ void LyXText::rowBreakPoint(pit_type const pit, Row & row) const docstring lsep = from_utf8(layout->labelsep); int add = fm.width(lsep); if (par.isLineSeparator(i - 1)) - add -= singleWidth(par, i - 1); + add -= singleWidth(buffer, par, i - 1); - add = std::max(add, labelEnd(pit) - x); + add = std::max(add, labelEnd(buffer, pit) - x); thiswidth += add; } @@ -820,28 +811,28 @@ void LyXText::rowBreakPoint(pit_type const pit, Row & row) const } -void LyXText::setRowWidth(pit_type const pit, Row & row) const +void LyXText::setRowWidth(Buffer const & buffer, pit_type const pit, Row & row) const { // get the pure distance pos_type const end = row.endpos(); Paragraph const & par = pars_[pit]; docstring const labelsep = from_utf8(par.layout()->labelsep); - int w = leftMargin(pit, row.pos()); + int w = leftMargin(buffer, pit, row.pos()); pos_type const body_pos = par.beginOfBody(); pos_type i = row.pos(); - FontMetrics const & fm = theFontMetrics(getLabelFont(par)); + FontMetrics const & fm = theFontMetrics(getLabelFont(buffer, par)); if (i < end) { - FontIterator fi = FontIterator(*this, par, i); + FontIterator fi = FontIterator(buffer, *this, par, i); for ( ; i < end; ++i, ++fi) { if (body_pos > 0 && i == body_pos) { w += fm.width(labelsep); if (par.isLineSeparator(i - 1)) - w -= singleWidth(par, i - 1); - w = max(w, labelEnd(pit)); + w -= singleWidth(buffer, par, i - 1); + w = max(w, labelEnd(buffer, pit)); } char_type const c = par.getChar(i); w += singleWidth(par, i, c, *fi); @@ -851,16 +842,17 @@ void LyXText::setRowWidth(pit_type const pit, Row & row) const if (body_pos > 0 && body_pos >= end) { w += fm.width(labelsep); if (end > 0 && par.isLineSeparator(end - 1)) - w -= singleWidth(par, end - 1); - w = max(w, labelEnd(pit)); + w -= singleWidth(buffer, par, end - 1); + w = max(w, labelEnd(buffer, pit)); } - row.width(w + rightMargin(par)); + row.width(w + rightMargin(buffer, par)); } // returns the minimum space a manual label needs on the screen in pixel -int LyXText::labelFill(Paragraph const & par, Row const & row) const +int LyXText::labelFill(Buffer const & buffer, Paragraph const & par, + Row const & row) const { pos_type last = par.beginOfBody(); @@ -875,13 +867,13 @@ int LyXText::labelFill(Paragraph const & par, Row const & row) const int w = 0; for (pos_type i = row.pos(); i <= last; ++i) - w += singleWidth(par, i); + w += singleWidth(buffer, par, i); docstring const & label = par.params().labelWidthString(); if (label.empty()) return 0; - FontMetrics const & fm = theFontMetrics(getLabelFont(par)); + FontMetrics const & fm = theFontMetrics(getLabelFont(buffer, par)); return max(0, fm.width(label) - w); } @@ -893,7 +885,8 @@ LColor_color LyXText::backgroundColor() const } -void LyXText::setHeightOfRow(pit_type const pit, Row & row) +void LyXText::setHeightOfRow(BufferView const & bv, pit_type const pit, + Row & row) { Paragraph const & par = pars_[pit]; // get the maximum ascent and the maximum descent @@ -910,19 +903,21 @@ void LyXText::setHeightOfRow(pit_type const pit, Row & row) // increase but not decrease the height. Just some point to // start with so we don't have to do the assignment below too // often. - LyXFont font = getFont(par, row.pos()); + Buffer const & buffer = *bv.buffer(); + LyXFont font = getFont(buffer, par, row.pos()); LyXFont::FONT_SIZE const tmpsize = font.size(); - font = getLayoutFont(pit); + font = getLayoutFont(buffer, pit); LyXFont::FONT_SIZE const size = font.size(); font.setSize(tmpsize); - LyXFont labelfont = getLabelFont(par); + LyXFont labelfont = getLabelFont(buffer, par); FontMetrics const & labelfont_metrics = theFontMetrics(labelfont); FontMetrics const & fontmetrics = theFontMetrics(font); // these are minimum values - double const spacing_val = layout->spacing.getValue() * spacing(par); + double const spacing_val = layout->spacing.getValue() + * spacing(*bv.buffer(), par); //lyxerr << "spacing_val = " << spacing_val << endl; int maxasc = int(fontmetrics.maxAscent() * spacing_val); int maxdesc = int(fontmetrics.maxDescent() * spacing_val); @@ -959,16 +954,17 @@ void LyXText::setHeightOfRow(pit_type const pit, Row & row) // is it a top line? if (row.pos() == 0) { - BufferParams const & bufparams = bv()->buffer()->params(); + Buffer const & buffer = *bv.buffer(); + BufferParams const & bufparams = buffer.params(); // some parksips VERY EASY IMPLEMENTATION - if (bv()->buffer()->params().paragraph_separation + if (bufparams.paragraph_separation == BufferParams::PARSEP_SKIP && pit != 0 && ((layout->isParagraph() && par.getDepth() == 0) || (pars_[pit - 1].layout()->isParagraph() && pars_[pit - 1].getDepth() == 0))) { - maxasc += bufparams.getDefSkip().inPixels(*bv()); + maxasc += bufparams.getDefSkip().inPixels(bv); } if (par.params().startOfAppendix()) @@ -980,7 +976,7 @@ void LyXText::setHeightOfRow(pit_type const pit, Row & row) && !par.params().labelString().empty()) { labeladdon = int(labelfont_metrics.maxHeight() * layout->spacing.getValue() - * spacing(par)); + * spacing(buffer, par)); } // special code for the top label @@ -993,7 +989,7 @@ void LyXText::setHeightOfRow(pit_type const pit, Row & row) labeladdon = int( labelfont_metrics.maxHeight() * layout->spacing.getValue() - * spacing(par) + * spacing(*bv.buffer(), par) + (layout->topsep + layout->labelbottomsep) * dh); } @@ -1059,7 +1055,7 @@ void LyXText::setHeightOfRow(pit_type const pit, Row & row) // FIXME: the correct way is to do the following is to move the // following code in another method specially tailored for the // main LyXText. The following test is thus bogus. - LyXText const & text = bv_owner->buffer()->text(); + LyXText const & text = buffer.text(); // Top and bottom margin of the document (only at top-level) if (&text == this) { if (pit == 0 && row.pos() == 0) @@ -1095,13 +1091,13 @@ void LyXText::breakParagraph(LCursor & cur, bool keep_layout) return; // a layout change may affect also the following paragraph - recUndo(cur.pit(), undoSpan(cur.pit()) - 1); + recUndo(cur, cur.pit(), undoSpan(cur.pit()) - 1); // Always break behind a space // It is better to erase the space (Dekel) if (cur.pos() != cur.lastpos() && cpar.isLineSeparator(cur.pos())) // FIXME: change tracking (MG) - cpar.erase(cur.pos(), cur.buffer().params().trackChanges); + cpar.eraseChar(cur.pos(), cur.buffer().params().trackChanges); // How should the layout for the new paragraph be? int preserve_layout = 0; @@ -1137,7 +1133,7 @@ void LyXText::breakParagraph(LCursor & cur, bool keep_layout) while (!pars_[next_par].empty() && pars_[next_par].isNewline(0)) // FIXME: change tracking (MG) - pars_[next_par].erase(0, cur.buffer().params().trackChanges); + pars_[next_par].eraseChar(0, cur.buffer().params().trackChanges); ParIterator current_it(cur); ParIterator last_it(cur); @@ -1153,6 +1149,17 @@ void LyXText::breakParagraph(LCursor & cur, bool keep_layout) Change(Change::INSERTED)); } + // FIXME: Breaking a paragraph has nothing to do with setting a cursor. + // Because of the mix between the model (the paragraph contents) and the + // view (the paragraph breaking in rows, we have to do this here before + // the setCursor() call below. + bool changed_height = redoParagraph(cur.bv(), cpit); + changed_height |= redoParagraph(cur.bv(), cpit + 1); + if (changed_height) + // A singlePar update is not enough in this case. + cur.updateFlags(Update::Force); + + // This check is necessary. Otherwise the new empty paragraph will // be deleted automatically. And it is more friendly for the user! if (cur.pos() != 0 || isempty) @@ -1171,6 +1178,7 @@ void LyXText::insertChar(LCursor & cur, char_type c) recordUndo(cur, Undo::INSERT); + Buffer const & buffer = cur.buffer(); Paragraph & par = cur.paragraph(); // try to remove this pit_type const pit = cur.pit(); @@ -1188,8 +1196,8 @@ void LyXText::insertChar(LCursor & cur, char_type c) !(contains(number_seperators, c) && cur.pos() != 0 && cur.pos() != cur.lastpos() && - getFont(par, cur.pos()).number() == LyXFont::ON && - getFont(par, cur.pos() - 1).number() == LyXFont::ON) + getFont(buffer, par, cur.pos()).number() == LyXFont::ON && + getFont(buffer, par, cur.pos() - 1).number() == LyXFont::ON) ) number(cur); // Set current_font.number to OFF } else if (isDigit(c) && @@ -1203,11 +1211,11 @@ void LyXText::insertChar(LCursor & cur, char_type c) || par.isSeparator(cur.pos() - 2) || par.isNewline(cur.pos() - 2)) ) { - setCharFont(pit, cur.pos() - 1, current_font); + setCharFont(buffer, pit, cur.pos() - 1, current_font); } else if (contains(number_seperators, c) && cur.pos() >= 2 - && getFont(par, cur.pos() - 2).number() == LyXFont::ON) { - setCharFont(pit, cur.pos() - 1, current_font); + && getFont(buffer, par, cur.pos() - 2).number() == LyXFont::ON) { + setCharFont(buffer, pit, cur.pos() - 1, current_font); } } } @@ -1232,10 +1240,8 @@ void LyXText::insertChar(LCursor & cur, char_type c) return; } BOOST_ASSERT(cur.pos() > 0); - if ((par.isLineSeparator(cur.pos() - 1) - || par.isNewline(cur.pos() - 1)) - // FIXME: change tracking (MG) - && par.lookupChange(cur.pos() - 1) != Change(Change::DELETED)) { + if ((par.isLineSeparator(cur.pos() - 1) || par.isNewline(cur.pos() - 1)) + && !par.isDeleted(cur.pos() - 1)) { static bool sent_space_message = false; if (!sent_space_message) { cur.message(_("You cannot type two spaces this way. " @@ -1246,8 +1252,14 @@ void LyXText::insertChar(LCursor & cur, char_type c) } } - // FIXME: change tracking (MG) - par.insertChar(cur.pos(), c, current_font, Change(Change::INSERTED)); + par.insertChar(cur.pos(), c, current_font, cur.buffer().params().trackChanges); + + // FIXME: Inserting a character has nothing to do with setting a cursor. + // Because of the mix between the model (the paragraph contents) and the + // view (the paragraph breaking in rows, we have to do this here. + if (redoParagraph(cur.bv(), cur.pit())) + // A singlePar update is not enough in this case. + cur.updateFlags(Update::Force); setCursor(cur, cur.pit(), cur.pos() + 1, false, cur.boundary()); charInserted(); } @@ -1267,19 +1279,19 @@ void LyXText::charInserted() } -RowMetrics -LyXText::computeRowMetrics(pit_type const pit, Row const & row) const +RowMetrics LyXText::computeRowMetrics(Buffer const & buffer, + pit_type const pit, Row const & row) const { RowMetrics result; Paragraph const & par = pars_[pit]; double w = dim_.wid - row.width(); - bool const is_rtl = isRTL(par); + bool const is_rtl = isRTL(buffer, par); if (is_rtl) - result.x = rightMargin(par); + result.x = rightMargin(buffer, par); else - result.x = leftMargin(pit, row.pos()); + result.x = leftMargin(buffer, pit, row.pos()); // is there a manual margin with a manual label LyXLayout_ptr const & layout = par.layout(); @@ -1298,7 +1310,7 @@ LyXText::computeRowMetrics(pit_type const pit, Row const & row) const ++nlh; if (nlh && !par.getLabelWidthString().empty()) - result.label_hfill = labelFill(par, row) / double(nlh); + result.label_hfill = labelFill(buffer, par, row) / double(nlh); } // are there any hfills in the row? @@ -1362,7 +1374,7 @@ LyXText::computeRowMetrics(pit_type const pit, Row const & row) const } } - bidi.computeTables(par, *bv()->buffer(), row); + bidi.computeTables(par, buffer, row); if (is_rtl) { pos_type body_pos = par.beginOfBody(); pos_type end = row.endpos(); @@ -1371,7 +1383,7 @@ LyXText::computeRowMetrics(pit_type const pit, Row const & row) const && (body_pos > end || !par.isLineSeparator(body_pos - 1))) { docstring const lsep = from_utf8(layout->labelsep); - result.x += theFontMetrics(getLabelFont(par)).width(lsep); + result.x += theFontMetrics(getLabelFont(buffer, par)).width(lsep); if (body_pos <= end) result.x += result.label_hfill; } @@ -1465,14 +1477,14 @@ void LyXText::acceptChange(LCursor & cur) DocIterator it = cur.selectionBegin(); DocIterator et = cur.selectionEnd(); pit_type pit = it.pit(); - Change::Type const type = pars_[pit].lookupChange(it.pos()).type; + bool isDeleted = pars_[pit].isDeleted(it.pos()); for (; pit <= et.pit(); ++pit) { pos_type left = ( pit == it.pit() ? it.pos() : 0 ); pos_type right = ( pit == et.pit() ? et.pos() : pars_[pit].size() + 1 ); - pars_[pit].acceptChange(left, right); + pars_[pit].acceptChanges(left, right); } - if (type == Change::DELETED) { + if (isDeleted) { ParagraphList & plist = paragraphs(); if (it.pit() + 1 < et.pit()) pars_.erase(boost::next(plist.begin(), it.pit() + 1), @@ -1480,8 +1492,7 @@ void LyXText::acceptChange(LCursor & cur) // Paragraph merge if appropriate: // FIXME: change tracking (MG) - if (pars_[it.pit()].lookupChange(pars_[it.pit()].size()) - == Change(Change::DELETED)) { + if (pars_[it.pit()].isDeleted(pars_[it.pit()].size())) { setCursorIntern(cur, it.pit() + 1, 0); backspacePos0(cur); } @@ -1503,22 +1514,21 @@ void LyXText::rejectChange(LCursor & cur) DocIterator it = cur.selectionBegin(); DocIterator et = cur.selectionEnd(); pit_type pit = it.pit(); - Change::Type const type = pars_[pit].lookupChange(it.pos()).type; + bool isInserted = pars_[pit].isInserted(it.pos()); for (; pit <= et.pit(); ++pit) { pos_type left = ( pit == it.pit() ? it.pos() : 0 ); pos_type right = ( pit == et.pit() ? et.pos() : pars_[pit].size() + 1 ); - pars_[pit].rejectChange(left, right); + pars_[pit].rejectChanges(left, right); } - if (type == Change::INSERTED) { + if (isInserted) { ParagraphList & plist = paragraphs(); if (it.pit() + 1 < et.pit()) pars_.erase(boost::next(plist.begin(), it.pit() + 1), boost::next(plist.begin(), et.pit())); // Paragraph merge if appropriate: // FIXME: change tracking (MG) - if (pars_[it.pit()].lookupChange(pars_[it.pit()].size()) - == Change(Change::INSERTED)) { + if (pars_[it.pit()].isInserted(pars_[it.pit()].size())) { setCursorIntern(cur, it.pit() + 1, 0); backspacePos0(cur); } @@ -1624,10 +1634,11 @@ void LyXText::changeCase(LCursor & cur, LyXText::TextCase action) break; } } -#ifdef WITH_WARNINGS -#warning changes -#endif - pars_[pit].setChar(pos, c); + + // FIXME: change tracking (MG) + // sorry but we are no longer allowed to set a single character directly + // we have to rewrite this method in terms of erase&insert operations + //pars_[pit].setChar(pos, c); ++pos; } } @@ -1637,35 +1648,48 @@ bool LyXText::erase(LCursor & cur) { BOOST_ASSERT(this == cur.text()); bool needsUpdate = false; + Paragraph & par = cur.paragraph(); if (cur.pos() != cur.lastpos()) { - recordUndo(cur, Undo::DELETE, cur.pit()); - setCursorIntern(cur, cur.pit(), cur.pos() + 1, false, cur.boundary()); - needsUpdate = backspace(cur); + // this is the code for a normal delete, not pasting + // any paragraphs + recordUndo(cur, Undo::DELETE); // FIXME: change tracking (MG) - if (cur.paragraph().lookupChange(cur.pos()) == Change(Change::DELETED)) - cur.posRight(); + par.eraseChar(cur.pos(), cur.buffer().params().trackChanges); + if (par.isDeleted(cur.pos())) + cur.forwardPos(); + needsUpdate = true; } else if (cur.pit() != cur.lastpit()) { - LCursor scur = cur; - - setCursorIntern(cur, cur.pit() + 1, 0, false, false); - if (pars_[cur.pit()].layout() == pars_[scur.pit()].layout()) { - recordUndo(scur, Undo::DELETE, scur.pit()); - needsUpdate = backspace(cur); - if (cur.buffer().params().trackChanges) { - // FIXME: Change tracking (MG) - // move forward after the paragraph break is DELETED - Paragraph & par = cur.paragraph(); - // FIXME: change tracking (MG) - if (par.lookupChange(par.size()) == Change(Change::DELETED)) - setCursorIntern(cur, cur.pit() + 1, 0); - } + if (cur.buffer().params().trackChanges + && par.isInserted(cur.pos())) { + // mark "carriage return" as deleted: + // FIXME: Change tracking (MG) + par.setChange(cur.pos(), Change(Change::DELETED)); + cur.forwardPos(); + needsUpdate = true; } else { - setCursorIntern(scur, scur.pit(), scur.pos(), false, scur.boundary()); + setCursorIntern(cur, cur.pit() + 1, 0); + needsUpdate = backspacePos0(cur); + // FIXME: Change tracking (MG) + if (cur.paragraph().isDeleted(cur.pos())) + cur.forwardPos(); } } else needsUpdate = dissolveInset(cur); + // FIXME: Inserting characters has nothing to do with setting a cursor. + // Because of the mix between the model (the paragraph contents) + // and the view (the paragraph breaking in rows, we have to do this + // here before the setCursorIntern() call. + if (needsUpdate) { + if (redoParagraph(cur.bv(), cur.pit())) + // A singlePar update is not enough in this case. + cur.updateFlags(Update::Force); + // Make sure the cursor is correct. Is this really needed? + // No, not really... at least not here! + setCursorIntern(cur, cur.pit(), cur.pos()); + } + return needsUpdate; } @@ -1673,79 +1697,56 @@ bool LyXText::erase(LCursor & cur) bool LyXText::backspacePos0(LCursor & cur) { BOOST_ASSERT(this == cur.text()); + if (cur.pit() == 0) + return false; + bool needsUpdate = false; - Paragraph & par = cur.paragraph(); - // is it an empty paragraph? - pos_type lastpos = cur.lastpos(); - if (lastpos == 0 || (lastpos == 1 && par.isSeparator(0))) { - // This is an empty paragraph and we delete it just - // by moving the cursor one step - // left and let the DeleteEmptyParagraphMechanism - // handle the actual deletion of the paragraph. - - if (cur.pit() != 0) { - // For KeepEmpty layouts we need to get - // rid of the keepEmpty setting first. - // And the only way to do this is to - // reset the layout to something - // else: f.ex. the default layout. - if (par.allowEmpty()) { - Buffer & buf = cur.buffer(); - BufferParams const & bparams = buf.params(); - par.layout(bparams.getLyXTextClass().defaultLayout()); - } + BufferParams const & bufparams = cur.buffer().params(); + LyXTextClass const & tclass = bufparams.getLyXTextClass(); + ParagraphList & plist = cur.text()->paragraphs(); + Paragraph const & par = cur.paragraph(); + LCursor prevcur = cur; + --prevcur.pit(); + prevcur.pos() = prevcur.lastpos(); + Paragraph const & prevpar = prevcur.paragraph(); - cursorLeft(cur); - return true; - } + // is it an empty paragraph? + if (cur.lastpos() == 0 + || (cur.lastpos() == 1 && par.isSeparator(0))) { + recordUndo(cur, Undo::ATOMIC, prevcur.pit(), cur.pit()); + plist.erase(boost::next(plist.begin(), cur.pit())); + needsUpdate = true; } - - if (cur.pit() != 0) - recordUndo(cur, Undo::DELETE, cur.pit() - 1); - - pit_type tmppit = cur.pit(); - // We used to do cursorLeftIntern() here, but it is - // not a good idea since it triggers the auto-delete - // mechanism. So we do a cursorLeftIntern()-lite, - // without the dreaded mechanism. (JMarc) - if (cur.pit() != 0) { - // steps into the above paragraph. - setCursorIntern(cur, cur.pit() - 1, - pars_[cur.pit() - 1].size(), - false); + // is previous par empty? + else if (prevcur.lastpos() == 0 + || (prevcur.lastpos() == 1 && prevpar.isSeparator(0))) { + recordUndo(cur, Undo::ATOMIC, prevcur.pit(), cur.pit()); + plist.erase(boost::next(plist.begin(), prevcur.pit())); + needsUpdate = true; } - // Pasting is not allowed, if the paragraphs have different // layout. I think it is a real bug of all other // word processors to allow it. It confuses the user. // Correction: Pasting is always allowed with standard-layout - // Correction (Jug 20050717): Remove check about alignment! - Buffer & buf = cur.buffer(); - BufferParams const & bufparams = buf.params(); - LyXTextClass const & tclass = bufparams.getLyXTextClass(); - pit_type const cpit = cur.pit(); - - if (cpit != tmppit - && (pars_[cpit].layout() == pars_[tmppit].layout() - || pars_[tmppit].layout() == tclass.defaultLayout())) - { - mergeParagraph(bufparams, pars_, cpit); + else if (par.layout() == prevpar.layout() + || par.layout() == tclass.defaultLayout()) { + recordUndo(cur, Undo::ATOMIC, prevcur.pit()); + mergeParagraph(bufparams, plist, prevcur.pit()); needsUpdate = true; + } - if (cur.pos() != 0 && pars_[cpit].isSeparator(cur.pos() - 1)) - --cur.pos(); - - // the counters may have changed - ParIterator par_it(cur); - updateLabels(cur.buffer(), par_it); - - setCursor(cur, cur.pit(), cur.pos(), false); + if (needsUpdate) { + updateLabels(cur.buffer()); + setCursorIntern(cur, prevcur.pit(), prevcur.pos()); } + return needsUpdate; } + + bool LyXText::backspace(LCursor & cur) { BOOST_ASSERT(this == cur.text()); @@ -1754,18 +1755,14 @@ bool LyXText::backspace(LCursor & cur) if (cur.pit() == 0) return dissolveInset(cur); - // The cursor is at the beginning of a paragraph, so - // the the backspace will collapse two paragraphs into - // one. - - if (cur.pit() != 0 && cur.buffer().params().trackChanges) { + if (cur.buffer().params().trackChanges) { // FIXME: Change tracking (MG) // Previous paragraph, mark "carriage return" as // deleted: Paragraph & par = pars_[cur.pit() - 1]; // Take care of a just inserted para break: // FIXME: change tracking (MG) - if (par.lookupChange(par.size()) != Change(Change::INSERTED)) { + if (!par.isInserted(par.size())) { // FIXME: change tracking (MG) par.setChange(par.size(), Change(Change::DELETED)); setCursorIntern(cur, cur.pit() - 1, par.size()); @@ -1773,6 +1770,8 @@ bool LyXText::backspace(LCursor & cur) } } + // The cursor is at the beginning of a paragraph, so + // the backspace will collapse two paragraphs into one. needsUpdate = backspacePos0(cur); } else { @@ -1786,12 +1785,19 @@ bool LyXText::backspace(LCursor & cur) setCursorIntern(cur, cur.pit(), cur.pos() - 1, false, cur.boundary()); // FIXME: change tracking (MG) - cur.paragraph().erase(cur.pos(), cur.buffer().params().trackChanges); + cur.paragraph().eraseChar(cur.pos(), cur.buffer().params().trackChanges); } if (cur.pos() == cur.lastpos()) setCurrentFont(cur); + // FIXME: Backspacing has nothing to do with setting a cursor. + // Because of the mix between the model (the paragraph contents) + // and the view (the paragraph breaking in rows, we have to do this + // here before the setCursor() call. + if (redoParagraph(cur.bv(), cur.pit())) + // A singlePar update is not enough in this case. + cur.updateFlags(Update::Force); setCursor(cur, cur.pit(), cur.pos(), false, cur.boundary()); return needsUpdate; @@ -1801,9 +1807,10 @@ bool LyXText::backspace(LCursor & cur) bool LyXText::dissolveInset(LCursor & cur) { BOOST_ASSERT(this == cur.text()); - if (isMainText() || cur.inset().nargs() != 1) + if (isMainText(*cur.bv().buffer()) || cur.inset().nargs() != 1) return false; + bool const in_ert = cur.inset().lyxCode() == InsetBase::ERT_CODE; recordUndoInset(cur); cur.selHandle(false); // save position @@ -1819,8 +1826,21 @@ bool LyXText::dissolveInset(LCursor & cur) { spit += cur.pit(); Buffer & b = cur.buffer(); // FIXME: change tracking (MG) - cur.paragraph().erase(cur.pos(), b.params().trackChanges); + cur.paragraph().eraseChar(cur.pos(), b.params().trackChanges); if (!plist.empty()) { + if (in_ert) { + // ERT paragraphs have the Language latex_language. + // This is invalid outside of ERT, so we need to + // change it to the buffer language. + ParagraphList::iterator it = plist.begin(); + ParagraphList::iterator it_end = plist.end(); + for (; it != it_end; it++) { + it->changeLanguage(b.params(), + latex_language, + b.getLanguage()); + } + } + pasteParagraphList(cur, plist, b.params().textclass, b.errorList("Paste")); // restore position @@ -1839,10 +1859,11 @@ Row const & LyXText::firstRow() const } -bool LyXText::redoParagraph(pit_type const pit) +bool LyXText::redoParagraph(BufferView & bv, pit_type const pit) { // remove rows of paragraph, keep track of height changes Paragraph & par = pars_[pit]; + Buffer const & buffer = *bv.buffer(); // Add bibitem insets if necessary if (par.layout()->labeltype == LABEL_BIBLIO) { @@ -1857,25 +1878,31 @@ bool LyXText::redoParagraph(pit_type const pit) if (!hasbibitem) { InsetBibitem * inset(new InsetBibitem(InsetCommandParams("bibitem"))); - // FIXME: change tracking (MG) - par.insertInset(0, static_cast(inset), Change(Change::INSERTED)); - bv()->cursor().posRight(); + par.insertInset(0, static_cast(inset), + Change(buffer.params().trackChanges ? + Change::INSERTED : Change::UNCHANGED)); + bv.cursor().posRight(); } } + // Optimisation: this is used in the next two loops + // so better to calculate that once here. + int right_margin = rightMargin(buffer, par); + // redo insets // FIXME: We should always use getFont(), see documentation of // noFontChange() in insetbase.h. - LyXFont const bufferfont = bv()->buffer()->params().getFont(); + LyXFont const bufferfont = buffer.params().getFont(); InsetList::iterator ii = par.insetlist.begin(); InsetList::iterator iend = par.insetlist.end(); for (; ii != iend; ++ii) { Dimension dim; - int const w = maxwidth_ - leftMargin(pit, ii->pos) - rightMargin(par); + int const w = maxwidth_ - leftMargin(buffer, pit, ii->pos) + - right_margin; LyXFont const & font = ii->inset->noFontChange() ? bufferfont : - getFont(par, ii->pos); - MetricsInfo mi(bv(), font, w); + getFont(buffer, par, ii->pos); + MetricsInfo mi(&bv, font, w); ii->inset->metrics(mi, dim); } @@ -1887,9 +1914,9 @@ bool LyXText::redoParagraph(pit_type const pit) pos_type z = 0; do { Row row(z); - rowBreakPoint(pit, row); - setRowWidth(pit, row); - setHeightOfRow(pit, row); + rowBreakPoint(buffer, right_margin, pit, row); + setRowWidth(buffer, pit, row); + setHeightOfRow(bv, pit, row); par.rows().push_back(row); dim.wid = std::max(dim.wid, row.width()); dim.des += row.height(); @@ -1904,8 +1931,8 @@ bool LyXText::redoParagraph(pit_type const pit) if (z > 0 && par.isNewline(z - 1)) { Row row(z - 1); row.endpos(z - 1); - setRowWidth(pit, row); - setHeightOfRow(pit, row); + setRowWidth(buffer, pit, row); + setHeightOfRow(bv, pit, row); par.rows().push_back(row); dim.des += row.height(); } @@ -1913,7 +1940,7 @@ bool LyXText::redoParagraph(pit_type const pit) dim.asc += par.rows()[0].ascent(); dim.des -= par.rows()[0].ascent(); - bool const same = dim == par.dim(); + bool const same = dim.height() == par.dim().height(); par.dim() = dim; //lyxerr << "redoParagraph: " << par.rows().size() << " rows\n"; @@ -1935,7 +1962,7 @@ void LyXText::metrics(MetricsInfo & mi, Dimension & dim) unsigned int h = 0; unsigned int w = 0; for (pit_type pit = 0, n = paragraphs().size(); pit != n; ++pit) { - redoParagraph(pit); + redoParagraph(*mi.base.bv, pit); Paragraph & par = paragraphs()[pit]; h += par.height(); if (w < par.width()) @@ -1957,74 +1984,7 @@ void LyXText::draw(PainterInfo & pi, int x, int y) const } -#if 0 // only used for inset right now. should also be used for main text -void LyXText::drawSelection(PainterInfo & pi, int x , int) const -{ - LCursor & cur = pi.base.bv->cursor(); - if (!cur.selection()) - return; - if (!ptr_cmp(cur.text(), this)) - return; - - lyxerr << "draw selection at " << x << endl; - - DocIterator beg = cur.selectionBegin(); - DocIterator end = cur.selectionEnd(); - - // the selection doesn't touch the visible screen - if (bv_funcs::status(pi.base.bv, beg) == bv_funcs::CUR_BELOW - || bv_funcs::status(pi.base.bv, end) == bv_funcs::CUR_ABOVE) - return; - - Paragraph const & par1 = pars_[beg.pit()]; - Paragraph const & par2 = pars_[end.pit()]; - - Row const & row1 = par1.getRow(beg.pos(), beg.boundary()); - Row const & row2 = par2.getRow(end.pos(), end.boundary()); - - int y1,x1,x2; - if (bv_funcs::status(pi.base.bv, beg) == bv_funcs::CUR_ABOVE) { - y1 = 0; - x1 = 0; - x2 = 0; - } else { - y1 = bv_funcs::getPos(beg).y_ - row1.ascent(); - int const startx = cursorX(beg.top(), begin.boundary()); - x1 = isRTL(par1) ? startx : 0; - x2 = isRTL(par1) ? 0 + dim_.wid : startx; - } - - int y2,X1,X2; - if (bv_funcs::status(pi.base.bv, end) == bv_funcs::CUR_BELOW) { - y2 = pi.base.bv->workHeight(); - X1 = 0; - X2 = 0; - } else { - y2 = bv_funcs::getPos(end).y_ + row2.descent(); - int const endx = cursorX(end.top(), end.boundary()); - X1 = isRTL(par2) ? 0 : endx; - X2 = isRTL(par2) ? endx : 0 + dim_.wid; - } - - lyxerr << " y1: " << y1 << " y2: " << y2 - << " xo: " << xo_ << " wid: " << dim_.wid - << endl; - - // paint big rectangle in one go - pi.pain.fillRectangle(x, y1, dim_.wid, y2 - y1, LColor::selection); - - // reset background at begin of first selected line - pi.pain.fillRectangle(x + x1, y1, x2 - x1, row1.height(), - LColor::background); - - // reset background at end of last selected line - pi.pain.fillRectangle(x + X1, y2 - row2.height(), - X2 - X1, row2.height(), LColor::background); -} - -#else - void LyXText::drawSelection(PainterInfo & pi, int x, int) const { LCursor & cur = pi.base.bv->cursor(); @@ -2033,27 +1993,30 @@ void LyXText::drawSelection(PainterInfo & pi, int x, int) const if (!ptr_cmp(cur.text(), this)) return; - lyxerr[Debug::DEBUG] - << BOOST_CURRENT_FUNCTION - << "draw selection at " << x - << endl; + if (lyxerr.debugging(Debug::DEBUG)) { + lyxerr[Debug::DEBUG] + << BOOST_CURRENT_FUNCTION + << "draw selection at " << x + << endl; + } DocIterator beg = cur.selectionBegin(); DocIterator end = cur.selectionEnd(); - BufferView * bv = pi.base.bv; + BufferView & bv = *pi.base.bv; + Buffer const & buffer = *bv.buffer(); // the selection doesn't touch the visible screen - if (bv_funcs::status(bv, beg) == bv_funcs::CUR_BELOW - || bv_funcs::status(bv, end) == bv_funcs::CUR_ABOVE) + if (bv_funcs::status(&bv, beg) == bv_funcs::CUR_BELOW + || bv_funcs::status(&bv, end) == bv_funcs::CUR_ABOVE) return; Paragraph const & par1 = pars_[beg.pit()]; Paragraph const & par2 = pars_[end.pit()]; - bool const above = (bv_funcs::status(bv, beg) + bool const above = (bv_funcs::status(&bv, beg) == bv_funcs::CUR_ABOVE); - bool const below = (bv_funcs::status(bv, end) + bool const below = (bv_funcs::status(&bv, end) == bv_funcs::CUR_BELOW); int y1,y2,x1,x2; if (above) { @@ -2063,41 +2026,55 @@ void LyXText::drawSelection(PainterInfo & pi, int x, int) const x2 = dim_.wid; } else { Row const & row1 = par1.getRow(beg.pos(), beg.boundary()); - y1 = bv_funcs::getPos(*bv, beg, beg.boundary()).y_ - row1.ascent(); + y1 = bv_funcs::getPos(bv, beg, beg.boundary()).y_ - row1.ascent(); y2 = y1 + row1.height(); - int const startx = cursorX(beg.top(), beg.boundary()); - x1 = !isRTL(par1) ? startx : 0; - x2 = !isRTL(par1) ? 0 + dim_.wid : startx; + int const startx = cursorX(buffer, beg.top(), beg.boundary()); + if (!isRTL(buffer, par1)) { + x1 = startx; + x2 = 0 + dim_.wid; + } + else { + x1 = 0; + x2 = startx; + } } int Y1,Y2,X1,X2; if (below) { - Y1 = bv->workHeight(); - Y2 = bv->workHeight(); + Y1 = bv.workHeight(); + Y2 = bv.workHeight(); X1 = 0; X2 = dim_.wid; } else { Row const & row2 = par2.getRow(end.pos(), end.boundary()); - Y1 = bv_funcs::getPos(*bv, end, end.boundary()).y_ - row2.ascent(); + Y1 = bv_funcs::getPos(bv, end, end.boundary()).y_ - row2.ascent(); Y2 = Y1 + row2.height(); - int const endx = cursorX(end.top(), end.boundary()); - X1 = !isRTL(par2) ? 0 : endx; - X2 = !isRTL(par2) ? endx : 0 + dim_.wid; + int const endx = cursorX(buffer, end.top(), end.boundary()); + if (!isRTL(buffer, par2)) { + X1 = 0; + X2 = endx; + } + else { + X1 = endx; + X2 = 0 + dim_.wid; + } } if (!above && !below && &par1.getRow(beg.pos(), beg.boundary()) == &par2.getRow(end.pos(), end.boundary())) { // paint only one rectangle - int const b( !isRTL(par1) ? x + x1 : x + X1 ); - int const w( !isRTL(par1) ? X2 - x1 : x2 - X1 ); + int const b( !isRTL(*bv.buffer(), par1) ? x + x1 : x + X1 ); + int const w( !isRTL(*bv.buffer(), par1) ? X2 - x1 : x2 - X1 ); pi.pain.fillRectangle(b, y1, w, y2 - y1, LColor::selection); return; } - lyxerr[Debug::DEBUG] << " y1: " << y1 << " y2: " << y2 - << "X1:" << X1 << " x2: " << X2 << " wid: " << dim_.wid - << endl; + if (lyxerr.debugging(Debug::DEBUG)) { + lyxerr[Debug::DEBUG] << " y1: " << y1 << " y2: " << y2 + << "X1:" << X1 << " x2: " << X2 << " wid: " << dim_.wid + << endl; + } // paint upper rectangle pi.pain.fillRectangle(x + x1, y1, x2 - x1, y2 - y1, @@ -2109,7 +2086,6 @@ void LyXText::drawSelection(PainterInfo & pi, int x, int) const pi.pain.fillRectangle(x, y2, dim_.wid, Y1 - y2, LColor::selection); } -#endif bool LyXText::isLastRow(pit_type pit, Row const & row) const { @@ -2238,7 +2214,8 @@ int LyXText::descent() const } -int LyXText::cursorX(CursorSlice const & sl, bool boundary) const +int LyXText::cursorX(Buffer const & buffer, CursorSlice const & sl, + bool boundary) const { pit_type const pit = sl.pit(); Paragraph const & par = pars_[pit]; @@ -2255,7 +2232,7 @@ int LyXText::cursorX(CursorSlice const & sl, bool boundary) const pos_type cursor_vpos = 0; - RowMetrics const m = computeRowMetrics(pit, row); + RowMetrics const m = computeRowMetrics(buffer, pit, row); double x = m.x; pos_type const row_pos = row.pos(); @@ -2264,7 +2241,7 @@ int LyXText::cursorX(CursorSlice const & sl, bool boundary) const if (end <= row_pos) cursor_vpos = row_pos; else if (ppos >= end) - cursor_vpos = isRTL(par) ? row_pos : end; + cursor_vpos = isRTL(buffer, par) ? row_pos : end; else if (ppos > row_pos && ppos >= end) // Place cursor after char at (logical) position pos - 1 cursor_vpos = (bidi.level(ppos - 1) % 2 == 0) @@ -2282,7 +2259,8 @@ int LyXText::cursorX(CursorSlice const & sl, bool boundary) const // Use font span to speed things up, see below FontSpan font_span; LyXFont font; - FontMetrics const & labelfm = theFontMetrics(getLabelFont(par)); + FontMetrics const & labelfm = theFontMetrics( + getLabelFont(buffer, par)); for (pos_type vpos = row_pos; vpos < cursor_vpos; ++vpos) { pos_type pos = bidi.vis2log(vpos); @@ -2291,13 +2269,13 @@ int LyXText::cursorX(CursorSlice const & sl, bool boundary) const docstring const lsep = from_utf8(par.layout()->labelsep); x += m.label_hfill + labelfm.width(lsep); if (par.isLineSeparator(body_pos - 1)) - x -= singleWidth(par, body_pos - 1); + x -= singleWidth(buffer, par, body_pos - 1); } // Use font span to speed things up, see above if (pos < font_span.first || pos > font_span.last) { font_span = par.fontSpan(pos); - font = getFont(par, pos); + font = getFont(buffer, par, pos); } x += singleWidth(par, pos, par.getChar(pos), font); @@ -2310,15 +2288,15 @@ int LyXText::cursorX(CursorSlice const & sl, bool boundary) const // see correction above if (boundary_correction) - if (getFont(par, ppos).isVisibleRightToLeft()) - x -= singleWidth(par, ppos); + if (getFont(buffer, par, ppos).isVisibleRightToLeft()) + x -= singleWidth(buffer, par, ppos); else - x += singleWidth(par, ppos); + x += singleWidth(buffer, par, ppos); // Make sure inside an inset we always count from the left // edge (bidi!) -- MV if (sl.pos() < par.size()) { - font = getFont(par, sl.pos()); + font = getFont(buffer, par, sl.pos()); if (!boundary && font.isVisibleRightToLeft() && par.isInset(sl.pos())) x -= par.getInset(sl.pos())->width(); @@ -2357,20 +2335,17 @@ string LyXText::currentState(LCursor & cur) Paragraph const & par = cur.paragraph(); std::ostringstream os; - // FIXME: change tracking (MG) - bool const show_change = par.lookupChange(cur.pos()) != Change(Change::UNCHANGED); - if (buf.params().trackChanges) os << "[C] "; - if (show_change) { - Change change = par.lookupChange(cur.pos()); + Change change = par.lookupChange(cur.pos()); + + if (change.type != Change::UNCHANGED) { Author const & a = buf.params().authors().get(change.author); os << to_utf8(_("Change: ")) << a.name(); if (!a.email().empty()) os << " (" << a.email() << ")"; - if (change.changetime) - os << to_utf8(_(" at ")) << ctime(&change.changetime); + os << to_utf8(_(" at ")) << ctime(&change.changetime); os << " : "; } @@ -2428,7 +2403,7 @@ string LyXText::currentState(LCursor & cur) } -string LyXText::getPossibleLabel(LCursor & cur) const +docstring LyXText::getPossibleLabel(LCursor & cur) const { pit_type pit = cur.pit(); @@ -2442,14 +2417,12 @@ string LyXText::getPossibleLabel(LCursor & cur) const } } - string name = layout->latexname(); + docstring name = from_ascii(layout->latexname()); // for captions, we want the abbreviation of the float type if (layout->labeltype == LABEL_SENSITIVE) { // Search for the first float or wrap inset in the iterator - size_t i = cur.depth(); - while (i > 0) { - --i; + for (int i = cur.depth(); --i >= 0; ) { InsetBase * const in = &cur[i].inset(); if (in->lyxCode() == InsetBase::FLOAT_CODE || in->lyxCode() == InsetBase::WRAP_CODE) { @@ -2459,20 +2432,19 @@ string LyXText::getPossibleLabel(LCursor & cur) const } } - string text = name.substr(0, 3); + docstring text = name.substr(0, 3); if (name == "theorem") - text = "thm"; // Create a correct prefix for prettyref + text = from_ascii("thm"); // Create a correct prefix for prettyref text += ':'; if (layout->latextype == LATEX_PARAGRAPH || lyxrc.label_init_length < 0) text.erase(); - // FIXME UNICODE - string par_text = to_utf8(pars_[pit].asString(cur.buffer(), false)); + docstring par_text = pars_[pit].asString(cur.buffer(), false); for (int i = 0; i < lyxrc.label_init_length; ++i) { if (par_text.empty()) break; - string head; + docstring head; par_text = split(par_text, head, ' '); // Is it legal to use spaces in labels ? if (i > 0) @@ -2493,7 +2465,7 @@ string LyXText::getPossibleLabel(LCursor & cur) const // int pos = r.pos(); // for (; currx < x && pos < r.endpos(); ++pos) { // lastx = currx; -// currx += singleWidth(par, pos); +// currx += singleWidth(buffer, par, pos); // } // if (abs(lastx - x) < abs(currx - x) && pos != r.pos()) // --pos; @@ -2501,12 +2473,13 @@ string LyXText::getPossibleLabel(LCursor & cur) const //} -pos_type LyXText::x2pos(pit_type pit, int row, int x) const +pos_type LyXText::x2pos(BufferView const & bv, pit_type pit, int row, + int x) const { BOOST_ASSERT(row < int(pars_[pit].rows().size())); bool bound = false; Row const & r = pars_[pit].rows()[row]; - return r.pos() + getColumnNearX(pit, r, x, bound); + return r.pos() + getColumnNearX(bv, pit, r, x, bound); } @@ -2524,7 +2497,7 @@ pos_type LyXText::x2pos(pit_type pit, int row, int x) const bool LyXText::setCursorFromCoordinates(LCursor & cur, int const x, int const y) { BOOST_ASSERT(this == cur.text()); - pit_type pit = getPitNearY(y); + pit_type pit = getPitNearY(cur.bv(), y); int yy = cur.bv().coordCache().get(this, pit).y_ - pars_[pit].ascent(); lyxerr[Debug::DEBUG] << BOOST_CURRENT_FUNCTION @@ -2553,7 +2526,8 @@ bool LyXText::setCursorFromCoordinates(LCursor & cur, int const x, int const y) bool bound = false; int xx = x; - pos_type const pos = row.pos() + getColumnNearX(pit, row, xx, bound); + pos_type const pos = row.pos() + getColumnNearX(cur.bv(), pit, row, + xx, bound); lyxerr[Debug::DEBUG] << BOOST_CURRENT_FUNCTION @@ -2565,4 +2539,61 @@ bool LyXText::setCursorFromCoordinates(LCursor & cur, int const x, int const y) } +void LyXText::charsTranspose(LCursor & cur) +{ + BOOST_ASSERT(this == cur.text()); + + pos_type pos = cur.pos(); + + // If cursor is at beginning or end of paragraph, do nothing. + if (pos == cur.lastpos() || pos == 0) + return; + + Paragraph & par = cur.paragraph(); + + // Get the positions of the characters to be transposed. + pos_type pos1 = pos - 1; + pos_type pos2 = pos; + + // In change tracking mode, ignore deleted characters. + while (pos2 < cur.lastpos() && par.isDeleted(pos2)) + ++pos2; + if (pos2 == cur.lastpos()) + return; + + while (pos1 >= 0 && par.isDeleted(pos1)) + --pos1; + if (pos1 < 0) + return; + + // Don't do anything if one of the "characters" is not regular text. + if (par.isInset(pos1) || par.isInset(pos2)) + return; + + // Store the characters to be transposed (including font information). + char_type char1 = par.getChar(pos1); + LyXFont const font1 = + par.getFontSettings(cur.buffer().params(), pos1); + + char_type char2 = par.getChar(pos2); + LyXFont const font2 = + par.getFontSettings(cur.buffer().params(), pos2); + + // And finally, we are ready to perform the transposition. + // Track the changes if Change Tracking is enabled. + bool const trackChanges = cur.buffer().params().trackChanges; + + recordUndo(cur); + + par.eraseChar(pos2, trackChanges); + par.eraseChar(pos1, trackChanges); + par.insertChar(pos1, char2, font2, trackChanges); + par.insertChar(pos2, char1, font1, trackChanges); + + // After the transposition, move cursor to after the transposition. + setCursor(cur, cur.pit(), pos2); + cur.forwardPos(); +} + + } // namespace lyx