X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextMetrics.cpp;h=fd576c31b2a254a460999dddede9be56606a9b37;hb=2d7cf039351fba0d91746dce8cbf1f9e31cdc224;hp=47745c4a7c9f3cff8df9885ecf15d470cbc1ce44;hpb=742bf1b950cf3863c3ea3c50080d62616408c5e6;p=lyx.git diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp index 47745c4a7c..fd576c31b2 100644 --- a/src/TextMetrics.cpp +++ b/src/TextMetrics.cpp @@ -27,7 +27,6 @@ #include "CoordCache.h" #include "Cursor.h" #include "CutAndPaste.h" -#include "FuncRequest.h" #include "HSpace.h" #include "InsetList.h" #include "Layout.h" @@ -40,6 +39,7 @@ #include "Text.h" #include "TextClass.h" #include "VSpace.h" +#include "WordLangTuple.h" #include "insets/InsetText.h" @@ -50,9 +50,11 @@ #include "frontends/Painter.h" #include "support/debug.h" -#include +#include "support/docstring_list.h" #include "support/lassert.h" +#include + using namespace std; @@ -131,8 +133,6 @@ TextMetrics::TextMetrics(BufferView * bv, Text * text) dim_.wid = max_width_; dim_.asc = 10; dim_.des = 10; - - //text_->updateLabels(bv->buffer()); } @@ -176,17 +176,6 @@ ParagraphMetrics & TextMetrics::parMetrics(pit_type pit, bool redo) } -int TextMetrics::parPosition(pit_type pit) const -{ - if (pit < par_metrics_.begin()->first) - return -1000000; - if (pit > par_metrics_.rbegin()->first) - return +1000000; - - return par_metrics_[pit].position(); -} - - bool TextMetrics::metrics(MetricsInfo & mi, Dimension & dim, int min_width) { LASSERT(mi.base.textwidth > 0, /**/); @@ -241,11 +230,9 @@ int TextMetrics::rightMargin(pit_type const pit) const void TextMetrics::applyOuterFont(Font & font) const { - Font lf(font_); - lf.fontInfo().reduce(bv_->buffer().params().getFont().fontInfo()); - lf.fontInfo().realize(font.fontInfo()); - lf.setLanguage(font.language()); - font = lf; + FontInfo lf(font_.fontInfo()); + lf.reduce(bv_->buffer().params().getFont().fontInfo()); + font.fontInfo().realize(lf); } @@ -316,11 +303,8 @@ bool TextMetrics::isRTL(CursorSlice const & sl, bool boundary) const bool TextMetrics::isRTLBoundary(pit_type pit, pos_type pos) const { - if (!lyxrc.rtl_support) - return false; - // no RTL boundary at paragraph start - if (pos == 0) + if (!lyxrc.rtl_support || pos == 0) return false; Font const & left_font = displayFont(pit, pos - 1); @@ -329,16 +313,20 @@ bool TextMetrics::isRTLBoundary(pit_type pit, pos_type pos) const } +// isRTLBoundary returns false on a real end-of-line boundary, +// because otherwise the two boundary types get mixed up. +// This is the whole purpose of this being in TextMetrics. bool TextMetrics::isRTLBoundary(pit_type pit, pos_type pos, Font const & font) const { - if (!lyxrc.rtl_support) + if (!lyxrc.rtl_support + // no RTL boundary at paragraph start + || pos == 0 + // if the metrics have not been calculated, then we are not + // on screen and can safely ignore issues about boundaries. + || !contains(pit)) return false; - // no RTL boundary at paragraph start - if (pos == 0) - return false; - ParagraphMetrics & pm = par_metrics_[pit]; // no RTL boundary in empty paragraph if (pm.rows().empty()) @@ -353,13 +341,6 @@ bool TextMetrics::isRTLBoundary(pit_type pit, pos_type pos, return false; Paragraph const & par = text_->getPar(pit); - bool left = font.isVisibleRightToLeft(); - bool right; - if (pos == par.size()) - right = par.isRTL(bv_->buffer().params()); - else - right = displayFont(pit, pos).isVisibleRightToLeft(); - // no RTL boundary at line break: // abc|\n -> move right -> abc\n (and not: abc\n| // FED FED| FED ) @@ -369,6 +350,13 @@ bool TextMetrics::isRTLBoundary(pit_type pit, pos_type pos, || par.isSeparator(pos - 1))) return false; + bool left = font.isVisibleRightToLeft(); + bool right; + if (pos == par.size()) + right = par.isRTL(bv_->buffer().params()); + else + right = displayFont(pit, pos).isVisibleRightToLeft(); + return left != right; } @@ -376,7 +364,7 @@ bool TextMetrics::isRTLBoundary(pit_type pit, pos_type pos, bool TextMetrics::redoParagraph(pit_type const pit) { Paragraph & par = text_->getPar(pit); - // IMPORTANT NOTE: We pass 'false' explicitely in order to not call + // IMPORTANT NOTE: We pass 'false' explicitly in order to not call // redoParagraph() recursively inside parMetrics. Dimension old_dim = parMetrics(pit, false).dim(); ParagraphMetrics & pm = par_metrics_[pit]; @@ -386,21 +374,6 @@ bool TextMetrics::redoParagraph(pit_type const pit) main_text_ = (text_ == &buffer.text()); bool changed = false; - // FIXME: This check ought to be done somewhere else. It is the reason - // why text_ is not const. But then, where else to do it? - // Well, how can you end up with either (a) a biblio environment that - // has no InsetBibitem or (b) a biblio environment with more than one - // InsetBibitem? I think the answer is: when paragraphs are merged; - // when layout is set; when material is pasted. - int const moveCursor = par.checkBiblio(buffer); - if (moveCursor > 0) - const_cast(bv_->cursor()).posForward(); - else if (moveCursor < 0) { - Cursor & cursor = const_cast(bv_->cursor()); - if (cursor.pos() >= -moveCursor) - cursor.posBackward(); - } - // Optimisation: this is used in the next two loops // so better to calculate that once here. int const right_margin = rightMargin(pm); @@ -413,7 +386,10 @@ bool TextMetrics::redoParagraph(pit_type const pit) LYXERR(Debug::INFO, "MacroContext not initialised!" << " Going through the buffer again and hope" << " the context is better then."); - bv_->buffer().updateLabels(); + // FIXME audit updateBuffer calls + // This should not be here, but it is not clear yet where else it + // should be. + bv_->buffer().updateBuffer(); parPos = text_->macrocontextPosition(); LASSERT(!parPos.empty(), /**/); parPos.pit() = pit; @@ -444,7 +420,7 @@ bool TextMetrics::redoParagraph(pit_type const pit) - right_margin; Font const & font = ii->inset->noFontChange() ? bufferfont : displayFont(pit, ii->pos); - MacroContext mc(buffer, parPos); + MacroContext mc(&buffer, parPos); MetricsInfo mi(bv_, font.fontInfo(), w, mc); ii->inset->metrics(mi, dim); Dimension const old_dim = pm.insetDimension(ii->inset); @@ -828,11 +804,24 @@ pos_type TextMetrics::rowBreakPoint(int width, pit_type const pit, // pixel width since last breakpoint int chunkwidth = 0; + docstring const s(1, char_type(0x00B6)); + Font f; + int par_marker_width = theFontMetrics(f).width(s); + FontIterator fi = FontIterator(*this, par, pit, pos); pos_type point = end; pos_type i = pos; + + ParagraphList const & pars_ = text_->paragraphs(); + bool const draw_par_end_marker = lyxrc.paragraph_markers + && size_type(pit + 1) < pars_.size(); + for ( ; i < end; ++i, ++fi) { int thiswidth = pm.singleWidth(i, *fi); + + if (draw_par_end_marker && i == end - 1) + // enlarge the last character to hold the end-of-par marker + thiswidth += par_marker_width; // add inline completion width if (inlineCompletionLPos == i) { @@ -962,6 +951,18 @@ int TextMetrics::rowWidth(int right_margin, pit_type const pit, } } + // count the paragraph end marker. + if (end == par.size() && lyxrc.paragraph_markers) { + ParagraphList const & pars_ = text_->paragraphs(); + if (size_type(pit + 1) < pars_.size()) { + // enlarge the last character to hold the + // end-of-par marker + docstring const s(1, char_type(0x00B6)); + Font f; + w += theFontMetrics(f).width(s); + } + } + if (body_pos > 0 && body_pos >= end) { FontMetrics const & fm = theFontMetrics( text_->labelFont(par)); @@ -1206,6 +1207,20 @@ pos_type TextMetrics::getColumnNearX(pit_type const pit, return 0; } + // This (rtl_support test) is not needed, but gives + // some speedup if rtl_support == false + bool const lastrow = lyxrc.rtl_support && row.endpos() == par.size(); + + // If lastrow is false, we don't need to compute + // the value of rtl. + bool const rtl = lastrow ? text_->isRTL(par) : false; + + // if the first character is a separator, and we are in RTL + // text, this character will not be painted on screen + // and thus we should not count it and skip to the next. + if (rtl && par.isSeparator(bidi.vis2log(vc))) + ++vc; + while (vc < end && tmpx <= x) { c = bidi.vis2log(vc); last_tmpx = tmpx; @@ -1231,13 +1246,7 @@ pos_type TextMetrics::getColumnNearX(pit_type const pit, LASSERT(vc <= end, /**/); // This shouldn't happen. boundary = false; - // This (rtl_support test) is not needed, but gives - // some speedup if rtl_support == false - bool const lastrow = lyxrc.rtl_support && row.endpos() == par.size(); - // If lastrow is false, we don't need to compute - // the value of rtl. - bool const rtl = lastrow ? text_->isRTL(par) : false; if (lastrow && ((rtl && left_side && vc == row.pos() && x < tmpx - 5) || (!rtl && !left_side && vc == end && x > tmpx + 5))) { @@ -1403,7 +1412,7 @@ pit_type TextMetrics::getPitNearY(int y) } -Row const & TextMetrics::getPitAndRowNearY(int y, pit_type & pit, +Row const & TextMetrics::getPitAndRowNearY(int & y, pit_type & pit, bool assert_in_view, bool up) { ParagraphMetrics const & pm = par_metrics_[pit]; @@ -1417,25 +1426,29 @@ Row const & TextMetrics::getPitAndRowNearY(int y, pit_type & pit, if (yy + rit->height() > y) break; - if (assert_in_view && yy + rit->height() != y) { - if (!up) { - if (rit != pm.rows().begin()) + if (assert_in_view) { + if (!up && yy + rit->height() > y) { + if (rit != pm.rows().begin()) { + y = yy; --rit; - else if (pit != 0) { + } else if (pit != 0) { --pit; newParMetricsUp(); ParagraphMetrics const & pm2 = par_metrics_[pit]; rit = pm2.rows().end(); --rit; + y = yy; } - } else { - if (rit != rlast) + } else if (up && yy != y) { + if (rit != rlast) { + y = yy + rit->height(); ++rit; - else if (pit != int(par_metrics_.size())) { + } else if (pit < int(text_->paragraphs().size()) - 1) { ++pit; newParMetricsDown(); ParagraphMetrics const & pm2 = par_metrics_[pit]; rit = pm2.rows().begin(); + y = pm2.position(); } } } @@ -1454,10 +1467,11 @@ Inset * TextMetrics::editXY(Cursor & cur, int x, int y, } pit_type pit = getPitNearY(y); LASSERT(pit != -1, return 0); + + int yy = y; // is modified by getPitAndRowNearY + Row const & row = getPitAndRowNearY(yy, pit, assert_in_view, up); - Row const & row = getPitAndRowNearY(y, pit, assert_in_view, up); - bool bound = false; - + bool bound = false; // is modified by getColumnNearX int xx = x; // is modified by getColumnNearX pos_type const pos = row.pos() + getColumnNearX(pit, row, xx, bound); @@ -1467,7 +1481,7 @@ Inset * TextMetrics::editXY(Cursor & cur, int x, int y, cur.setTargetX(x); // try to descend into nested insets - Inset * inset = checkInsetHit(x, y); + Inset * inset = checkInsetHit(x, yy); //lyxerr << "inset " << inset << " hit at x: " << x << " y: " << y << endl; if (!inset) { // Either we deconst editXY or better we move current_font @@ -1479,23 +1493,22 @@ Inset * TextMetrics::editXY(Cursor & cur, int x, int y, } ParagraphList const & pars = text_->paragraphs(); - Inset const * insetBefore = pos ? pars[pit].getInset(pos - 1) : 0; - //Inset * insetBehind = pars[pit].getInset(pos); + Inset const * inset_before = pos ? pars[pit].getInset(pos - 1) : 0; // This should be just before or just behind the // cursor position set above. - LASSERT((pos != 0 && inset == insetBefore) + LASSERT(inset == inset_before || inset == pars[pit].getInset(pos), /**/); // Make sure the cursor points to the position before // this inset. - if (inset == insetBefore) { + if (inset == inset_before) { --cur.pos(); cur.boundary(false); } // Try to descend recursively inside the inset. - inset = inset->editXY(cur, x, y); + inset = inset->editXY(cur, x, yy); if (cur.top().text() == text_) cur.setCurrentFont(); @@ -1622,6 +1635,8 @@ int TextMetrics::cursorX(CursorSlice const & sl, else if (ppos >= end) cursor_vpos = text_->isRTL(par) ? row_pos : end; else if (ppos > row_pos && ppos >= end) + //FIXME: this code is never reached! + // (see http://www.lyx.org/trac/changeset/8251) // Place cursor after char at (logical) position pos - 1 cursor_vpos = (bidi.level(ppos - 1) % 2 == 0) ? bidi.log2vis(ppos - 1) + 1 : bidi.log2vis(ppos - 1); @@ -1656,6 +1671,15 @@ int TextMetrics::cursorX(CursorSlice const & sl, if (end > 0 && end < par.size() && par.isSeparator(end - 1)) skipped_sep_vpos = bidi.log2vis(end - 1); + if (lyxrc.paragraph_markers && text_->isRTL(par)) { + ParagraphList const & pars_ = text_->paragraphs(); + if (size_type(pit + 1) < pars_.size()) { + FontInfo f; + docstring const s = docstring(1, char_type(0x00B6)); + x += theFontMetrics(f).width(s); + } + } + // Inline completion RTL special case row_pos == cursor_pos: // "__|b" => cursor_pos is right of __ if (row_pos == inlineCompletionVPos && row_pos == cursor_vpos) { @@ -1968,7 +1992,7 @@ int TextMetrics::leftMargin(int max_width, || (layout.labeltype == LABEL_STATIC && layout.latextype == LATEX_ENVIRONMENT && !text_->isFirstInSequence(pit))) - && align == LYX_ALIGN_BLOCK + && (align == LYX_ALIGN_BLOCK || align == LYX_ALIGN_LEFT) && !par.params().noindent() // in some insets, paragraphs are never indented && !text_->inset().neverIndent() @@ -1978,14 +2002,15 @@ int TextMetrics::leftMargin(int max_width, && par.getInset(pos)->display()) && (!(tclass.isDefaultLayout(par.layout()) || tclass.isPlainLayout(par.layout())) - || buffer.params().paragraph_separation == BufferParams::ParagraphIndentSeparation) + || buffer.params().paragraph_separation + == BufferParams::ParagraphIndentSeparation) ) { - // use the parindent of the layout when the default indentation is used - // otherwise use the indentation set in the document settings + // use the parindent of the layout when the default indentation is + // used otherwise use the indentation set in the document settings if (buffer.params().getIndentation().asLyXCommand() == "default") - l_margin += theFontMetrics(buffer.params().getFont()).signedWidth( - parindent); + l_margin += theFontMetrics( + buffer.params().getFont()).signedWidth(parindent); else l_margin += buffer.params().getIndentation().inPixels(*bv_); } @@ -2044,7 +2069,7 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type pit, int x, int y) co // This is our text. && cur.text() == text_ // if the anchor is outside, this is not our selection - && cur.anchor().text() == text_ + && cur.normalAnchor().text() == text_ && pit >= sel_beg.pit() && pit <= sel_end.pit(); // We store the begin and end pos of the selection relative to this par @@ -2093,6 +2118,11 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type pit, int x, int y) co row.setCrc(pm.computeRowSignature(row, bparams)); bool row_has_changed = row.changed(); + // Take this opportunity to spellcheck the row contents. + if (row_has_changed && lyxrc.spellcheck_continuously) { + text_->getPar(pit).spellCheck(); + } + // Don't paint the row if a full repaint has not been requested // and if it has not changed. if (!pi.full_repaint && !row_has_changed) { @@ -2110,9 +2140,6 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type pit, int x, int y) co width(), row.height(), pi.background_color); } - if (row.selection()) - drawRowSelection(pi, x, row, cur, pit); - // Instrumentation for testing row cache (see also // 12 lines lower): if (lyxerr.debugging(Debug::PAINTING) && inside @@ -2129,15 +2156,23 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type pit, int x, int y) co // for inner insets as the Row has been cleared out. bool tmp = pi.full_repaint; pi.full_repaint = true; + + rp.paintSelection(); rp.paintAppendix(); rp.paintDepthBar(); rp.paintChangeBar(); - if (i == 0) + bool const is_rtl = text_->isRTL(text_->getPar(pit)); + if (i == 0 && !is_rtl) rp.paintFirst(); + if (i == nrows - 1 && is_rtl) + rp.paintLast(); rp.paintText(); - if (i == nrows - 1) + if (i == nrows - 1 && !is_rtl) rp.paintLast(); + if (i == 0 && is_rtl) + rp.paintFirst(); y += row.descent(); + // Restore full_repaint status. pi.full_repaint = tmp; } @@ -2148,102 +2183,6 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type pit, int x, int y) co } -void TextMetrics::drawRowSelection(PainterInfo & pi, int x, Row const & row, - Cursor const & curs, pit_type pit) const -{ - DocIterator beg = curs.selectionBegin(); - beg.pit() = pit; - beg.pos() = row.sel_beg; - - DocIterator end = curs.selectionEnd(); - end.pit() = pit; - end.pos() = row.sel_end; - - bool const begin_boundary = beg.pos() >= row.endpos(); - bool const end_boundary = row.sel_end == row.endpos(); - - DocIterator cur = beg; - cur.boundary(begin_boundary); - int x1 = cursorX(beg.top(), begin_boundary); - int x2 = cursorX(end.top(), end_boundary); - int const y1 = bv_->getPos(cur, cur.boundary()).y_ - row.ascent(); - int const y2 = y1 + row.height(); - - int const rm = text_->isMainText() ? bv_->rightMargin() : 0; - int const lm = text_->isMainText() ? bv_->leftMargin() : 0; - - // draw the margins - if (row.begin_margin_sel) { - if (text_->isRTL(beg.paragraph())) { - pi.pain.fillRectangle(x + x1, y1, width() - rm - x1, y2 - y1, - Color_selection); - } else { - pi.pain.fillRectangle(x + lm, y1, x1 - lm, y2 - y1, - Color_selection); - } - } - - if (row.end_margin_sel) { - if (text_->isRTL(beg.paragraph())) { - pi.pain.fillRectangle(x + lm, y1, x2 - lm, y2 - y1, - Color_selection); - } else { - pi.pain.fillRectangle(x + x2, y1, width() - rm - x2, y2 - y1, - Color_selection); - } - } - - // if we are on a boundary from the beginning, it's probably - // a RTL boundary and we jump to the other side directly as this - // segement is 0-size and confuses the logic below - if (cur.boundary()) - cur.boundary(false); - - // go through row and draw from RTL boundary to RTL boundary - while (cur < end) { - bool drawNow = false; - - // simplified cursorForward code below which does not - // descend into insets and which does not go into the - // next line. Compare the logic with the original cursorForward - - // if left of boundary -> just jump to right side, but - // for RTL boundaries don't, because: abc|DDEEFFghi -> abcDDEEF|Fghi - if (cur.boundary()) { - cur.boundary(false); - } else if (isRTLBoundary(cur.pit(), cur.pos() + 1)) { - // in front of RTL boundary -> Stay on this side of the boundary - // because: ab|cDDEEFFghi -> abc|DDEEFFghi - ++cur.pos(); - cur.boundary(true); - drawNow = true; - } else { - // move right - ++cur.pos(); - - // line end? - if (cur.pos() == row.endpos()) - cur.boundary(true); - } - - if (x1 == -1) { - // the previous segment was just drawn, now the next starts - x1 = cursorX(cur.top(), cur.boundary()); - } - - if (!(cur < end) || drawNow) { - x2 = cursorX(cur.top(), cur.boundary()); - pi.pain.fillRectangle(x + min(x1,x2), y1, abs(x2 - x1), y2 - y1, - Color_selection); - - // reset x1, so it is set again next round (which will be on the - // right side of a boundary or at the selection end) - x1 = -1; - } - } -} - - void TextMetrics::completionPosAndDim(Cursor const & cur, int & x, int & y, Dimension & dim) const { @@ -2255,8 +2194,10 @@ void TextMetrics::completionPosAndDim(Cursor const & cur, int & x, int & y, wordStart.pos() -= word.length(); // get position on screen of the word start and end - Point lxy = cur.bv().getPos(wordStart, false); - Point rxy = cur.bv().getPos(bvcur, bvcur.boundary()); + //FIXME: Is it necessary to explicitly set this to false? + wordStart.boundary(false); + Point lxy = cur.bv().getPos(wordStart); + Point rxy = cur.bv().getPos(bvcur); // calculate dimensions of the word dim = rowHeight(bvcur.pit(), wordStart.pos(), bvcur.pos(), false);