X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextMetrics.cpp;h=3769627f68d32c768c4a89da73ddd7f3caaf5bcd;hb=c7d29be153debac82e3d2e8865fcc849f0a5f40d;hp=73bd4f8baa1303916e51108b078b9592468a71d2;hpb=32edb65985a8e63340c0421d76c00956bf846fd2;p=lyx.git diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp index 73bd4f8baa..3769627f68 100644 --- a/src/TextMetrics.cpp +++ b/src/TextMetrics.cpp @@ -26,7 +26,6 @@ #include "CoordCache.h" #include "Cursor.h" #include "CutAndPaste.h" -#include "HSpace.h" #include "InsetList.h" #include "Language.h" #include "Layout.h" @@ -40,14 +39,17 @@ #include "insets/InsetText.h" -#include "mathed/MathMacroTemplate.h" +#include "mathed/InsetMathMacroTemplate.h" #include "frontends/FontMetrics.h" #include "frontends/Painter.h" +#include "frontends/NullPainter.h" +#include "support/convert.h" #include "support/debug.h" #include "support/lassert.h" +#include #include using namespace std; @@ -80,21 +82,24 @@ int numberOfLabelHfills(Paragraph const & par, Row const & row) return n; } - -int numberOfHfills(Row const & row, pos_type const body_pos) +// FIXME: this needs to be rewritten, probably by merging it into some +// code that, besides counting, sets the active status of the space +// inset in the row element. +int numberOfHfills(Row const & row, ParagraphMetrics const & pm, + pos_type const body_pos) { int n = 0; Row::const_iterator cit = row.begin(); Row::const_iterator const end = row.end(); for ( ; cit != end ; ++cit) if (cit->pos >= body_pos - && cit->inset && cit->inset->isHfill()) + && cit->inset && pm.hfillExpansion(row, cit->pos)) ++n; return n; } -} +} // namespace ///////////////////////////////////////////////////////////////////// // @@ -195,15 +200,23 @@ bool TextMetrics::metrics(MetricsInfo & mi, Dimension & dim, int min_width) } +void TextMetrics::updatePosCache(pit_type pit) const +{ + frontend::NullPainter np; + PainterInfo pi(bv_, np); + drawParagraph(pi, pit, origin_.x_, par_metrics_[pit].position()); +} + + int TextMetrics::rightMargin(ParagraphMetrics const & pm) const { - return main_text_? pm.rightMargin(*bv_) : 0; + return text_->isMainText() ? pm.rightMargin(*bv_) : 0; } int TextMetrics::rightMargin(pit_type const pit) const { - return main_text_? par_metrics_[pit].rightMargin(*bv_) : 0; + return text_->isMainText() ? par_metrics_[pit].rightMargin(*bv_) : 0; } @@ -350,15 +363,15 @@ bool TextMetrics::redoParagraph(pit_type const pit) pm.reset(par); Buffer & buffer = bv_->buffer(); - main_text_ = (text_ == &buffer.text()); bool changed = false; // Check whether there are InsetBibItems that need fixing // 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; + // has no InsetBibitem, (b) a biblio environment with more than one + // InsetBibitem or (c) a paragraph that has a bib item but is no biblio + // environment? I think the answer is: when paragraphs are merged; // when layout is set; when material is pasted. if (par.brokenBiblio()) { Cursor & cur = const_cast(bv_->cursor()); @@ -399,6 +412,7 @@ bool TextMetrics::redoParagraph(pit_type const pit) } // redo insets + par.setBeginOfBody(); Font const bufferfont = buffer.params().getFont(); CoordCache::Insets & insetCache = bv_->coordCache().insets(); InsetList::const_iterator ii = par.insetList().begin(); @@ -417,10 +431,21 @@ bool TextMetrics::redoParagraph(pit_type const pit) parPos.pos()++; } + // If there is an end of paragraph marker, its size should be + // substracted to the available width. The logic here is + // almost the same as in breakRow, remember keep them in sync. + int eop = 0; + if (lyxrc.paragraph_markers && ii->pos + 1 == par.size() + && size_type(pit + 1) < text_->paragraphs().size()) { + Font f(text_->layoutFont(pit)); + // ¶ U+00B6 PILCROW SIGN + eop = theFontMetrics(f).width(char_type(0x00B6)); + } + // do the metric calculation Dimension dim; - int const w = max_width_ - leftMargin(max_width_, pit, ii->pos) - - right_margin; + int const w = max_width_ - leftMargin(pit, ii->pos) + - right_margin - eop; Font const & font = ii->inset->inheritFont() ? displayFont(pit, ii->pos) : bufferfont; MacroContext mc(&buffer, parPos); @@ -432,51 +457,75 @@ bool TextMetrics::redoParagraph(pit_type const pit) } } - par.setBeginOfBody(); pos_type first = 0; size_t row_index = 0; + bool need_new_row = false; // maximum pixel width of a row do { if (row_index == pm.rows().size()) pm.rows().push_back(Row()); Row & row = pm.rows()[row_index]; + row.pit(pit); row.pos(first); - breakRow(row, right_margin, pit); - setRowHeight(row, pit); - row.setChanged(false); - if (row_index || row.right_boundary() || row.endpos() < par.size()) - // If there is more than one row or the row has been - // broken by a display inset or a newline, expand the text - // to the full allowable width. This setting here is - // needed for the computeRowMetrics() below. - dim_.wid = max_width_; + row.pit(pit); + need_new_row = breakRow(row, right_margin); + setRowHeight(row); + row.changed(true); + if (row_index || row.endpos() < par.size() + || (row.right_boundary() && par.inInset().lyxCode() != CELL_CODE)) { + /* If there is more than one row or the row has been + * broken by a display inset or a newline, expand the text + * to the full allowable width. This setting here is + * needed for the computeRowMetrics() below. In the case + * of a display inset, we do nothing when inside a table + * cell, because the tabular code is not prepared for + * that, and it triggers when using a caption in a + * longtable (see bugs #9945 and #9757). + */ + if (dim_.wid < max_width_) + dim_.wid = max_width_; + } int const max_row_width = max(dim_.wid, row.width()); - computeRowMetrics(pit, row, max_row_width); + computeRowMetrics(row, max_row_width); first = row.endpos(); ++row_index; - pm.dim().wid = max(pm.dim().wid, row.width()); + pm.dim().wid = max(pm.dim().wid, row.width() + row.right_margin); pm.dim().des += row.height(); - } while (first < par.size()); + } while (first < par.size() || need_new_row); if (row_index < pm.rows().size()) pm.rows().resize(row_index); - // Make sure that if a par ends in newline, there is one more row - // under it - if (first > 0 && par.isNewline(first - 1)) { - if (row_index == pm.rows().size()) - pm.rows().push_back(Row()); - Row & row = pm.rows()[row_index]; - row.pos(first); - row.endpos(first); - setRowHeight(row, pit); - row.setChanged(false); - int const max_row_width = max(dim_.wid, row.width()); - computeRowMetrics(pit, row, max_row_width); - pm.dim().des += row.height(); + // FIXME: It might be better to move this in another method + // specially tailored for the main text. + // Top and bottom margin of the document (only at top-level) + if (text_->isMainText()) { + // original value was 20px, which is 0.2in at 100dpi + int const margin = Length(0.2, Length::IN).inPixels(0); + if (pit == 0) { + pm.rows().front().dimension().asc += margin; + /* coverity thinks that we should update pm.dim().asc + * below, but all the rows heights are actually counted as + * part of the paragraph metric descent see loop above). + */ + // coverity[copy_paste_error] + pm.dim().des += margin; + } + ParagraphList const & pars = text_->paragraphs(); + if (pit + 1 == pit_type(pars.size())) { + pm.rows().back().dimension().des += margin; + pm.dim().des += margin; + } } + // The space above and below the paragraph. + int const top = parTopSpacing(pit); + pm.rows().front().dimension().asc += top; + int const bottom = parBottomSpacing(pit); + pm.rows().back().dimension().des += bottom; + pm.dim().des += top + bottom; + pm.dim().asc += pm.rows()[0].ascent(); pm.dim().des -= pm.rows()[0].ascent(); @@ -486,19 +535,20 @@ bool TextMetrics::redoParagraph(pit_type const pit) } -LyXAlignment TextMetrics::getAlign(Paragraph const & par, pos_type const pos) const +LyXAlignment TextMetrics::getAlign(Paragraph const & par, Row const & row) const { - Layout const & layout = par.layout(); - - LyXAlignment align; - if (par.params().align() == LYX_ALIGN_LAYOUT) - align = layout.align; - else - align = par.params().align(); + LyXAlignment align = par.getAlign(bv_->buffer().params()); // handle alignment inside tabular cells Inset const & owner = text_->inset(); + bool forced_block = false; switch (owner.contentAlignment()) { + case LYX_ALIGN_BLOCK: + // In general block align is the default state, but here it is + // an explicit choice. Therefore it should not be overridden + // later. + forced_block = true; + // fall through case LYX_ALIGN_CENTER: case LYX_ALIGN_LEFT: case LYX_ALIGN_RIGHT: @@ -511,7 +561,7 @@ LyXAlignment TextMetrics::getAlign(Paragraph const & par, pos_type const pos) co } // Display-style insets should always be on a centered row - if (Inset const * inset = par.getInset(pos)) { + if (Inset const * inset = par.getInset(row.pos())) { switch (inset->display()) { case Inset::AlignLeft: align = LYX_ALIGN_BLOCK; @@ -528,22 +578,27 @@ LyXAlignment TextMetrics::getAlign(Paragraph const & par, pos_type const pos) co } } - // Has the user requested we not justify stuff? - if (!bv_->buffer().params().justification - && align == LYX_ALIGN_BLOCK) - align = LYX_ALIGN_LEFT; + if (align == LYX_ALIGN_BLOCK) { + // If this row has been broken abruptly by a display inset, or + // it is the end of the paragraph, or the user requested we + // not justify stuff, then don't stretch. + // A forced block alignment can only be overridden the 'no + // justification on screen' setting. + if ((row.flushed() && !forced_block) + || !bv_->buffer().params().justification) + align = row.isRTL() ? LYX_ALIGN_RIGHT : LYX_ALIGN_LEFT; + } return align; } -void TextMetrics::computeRowMetrics(pit_type const pit, - Row & row, int width) const +void TextMetrics::computeRowMetrics(Row & row, int width) const { row.label_hfill = 0; row.separator = 0; - Paragraph const & par = text_->getPar(pit); + Paragraph const & par = text_->getPar(row.pit()); int const w = width - row.right_margin - row.width(); // FIXME: put back this assertion when the crash on new doc is solved. @@ -567,60 +622,74 @@ void TextMetrics::computeRowMetrics(pit_type const pit, ++nlh; if (nlh && !par.getLabelWidthString().empty()) - row.label_hfill = labelFill(pit, row) / double(nlh); + row.label_hfill = labelFill(row) / double(nlh); } - double hfill = 0; // are there any hfills in the row? - if (int const nh = numberOfHfills(row, par.beginOfBody())) { - if (w > 0) - hfill = double(w) / nh; - // we don't have to look at the alignment if it is ALIGN_LEFT and - // if the row is already larger then the permitted width as then - // we force the LEFT_ALIGN'edness! - } else if (int(row.width()) < max_width_) { - // is it block, flushleft or flushright? - // set x how you need it - switch (getAlign(par, row.pos())) { - case LYX_ALIGN_BLOCK: { - int const ns = row.countSeparators(); - /** If we have separators, and this row has - * not be broken abruptly by a display inset - * or newline, then stretch it */ - if (ns && !row.right_boundary() - && row.endpos() != par.size()) { - row.setSeparatorExtraWidth(double(w) / ns); - row.dimension().wid = width; - } else if (text_->isRTL(par)) { - row.dimension().wid = width; + ParagraphMetrics & pm = par_metrics_[row.pit()]; + int nh = numberOfHfills(row, pm, par.beginOfBody()); + int hfill = 0; + int hfill_rem = 0; + + // We don't have to look at the alignment if the row is already + // larger then the permitted width as then we force the + // LEFT_ALIGN'edness! + if (int(row.width()) >= max_width_) + return; + + if (nh == 0) { + // Common case : there is no hfill, and the alignment will be + // meaningful + switch (getAlign(par, row)) { + case LYX_ALIGN_BLOCK: + // Expand expanding characters by a total of w + if (!row.setExtraWidth(w) && row.isRTL()) { + // Justification failed and the text is RTL: align to the right row.left_margin += w; + row.dimension().wid += w; + } + break; + case LYX_ALIGN_LEFT: + // a displayed inset that is flushed + if (Inset const * inset = par.getInset(row.pos())) { + row.left_margin += inset->indent(*bv_); + row.dimension().wid += inset->indent(*bv_); } break; - } case LYX_ALIGN_RIGHT: - row.left_margin += w; - row.dimension().wid += w; + if (Inset const * inset = par.getInset(row.pos())) { + int const new_w = max(w - inset->indent(*bv_), 0); + row.left_margin += new_w; + row.dimension().wid += new_w; + } else { + row.left_margin += w; + row.dimension().wid += w; + } break; case LYX_ALIGN_CENTER: - row.dimension().wid = width - w / 2; + row.dimension().wid += w / 2; row.left_margin += w / 2; break; - case LYX_ALIGN_LEFT: case LYX_ALIGN_NONE: case LYX_ALIGN_LAYOUT: case LYX_ALIGN_SPECIAL: case LYX_ALIGN_DECIMAL: break; } + return; } - // Finally, handle hfill insets + // Case nh > 0. There are hfill separators. + hfill = w / nh; + hfill_rem = w % nh; + row.dimension().wid += w; + // Set size of hfill insets pos_type const endpos = row.endpos(); pos_type body_pos = par.beginOfBody(); if (body_pos > 0 && (body_pos > endpos || !par.isLineSeparator(body_pos - 1))) body_pos = 0; - ParagraphMetrics & pm = par_metrics_[pit]; + CoordCache::Insets & insetCache = bv_->coordCache().insets(); Row::iterator cit = row.begin(); Row::iterator const cend = row.end(); @@ -628,22 +697,24 @@ void TextMetrics::computeRowMetrics(pit_type const pit, if (row.label_hfill && cit->endpos == body_pos && cit->type == Row::SPACE) cit->dim.wid -= int(row.label_hfill * (nlh - 1)); - if (!cit->inset || !cit->inset->isHfill()) - continue; - if (pm.hfillExpansion(row, cit->pos)) - cit->dim.wid = int(cit->pos >= body_pos ? - max(hfill, 5.0) : row.label_hfill); - else - cit->dim.wid = 5; - // Cache the inset dimension. - insetCache.add(cit->inset, cit->dim); + if (cit->inset && pm.hfillExpansion(row, cit->pos)) { + if (cit->pos >= body_pos) { + cit->dim.wid += hfill; + --nh; + if (nh == 0) + cit->dim.wid += hfill_rem; + } else + cit->dim.wid += int(row.label_hfill); + // Cache the inset dimension. + insetCache.add(cit->inset, cit->dim); + } } } -int TextMetrics::labelFill(pit_type const pit, Row const & row) const +int TextMetrics::labelFill(Row const & row) const { - Paragraph const & par = text_->getPar(pit); + Paragraph const & par = text_->getPar(row.pit()); LBUFERR(par.beginOfBody() > 0 || par.isEnvSeparator(0)); int w = 0; @@ -689,7 +760,7 @@ int TextMetrics::labelEnd(pit_type const pit) const if (text_->getPar(pit).layout().margintype != MARGIN_MANUAL) return 0; // return the beginning of the body - return leftMargin(max_width_, pit); + return leftMargin(pit); } namespace { @@ -748,23 +819,25 @@ private: pos_type bodypos_; }; -} // anon namespace +} // namespace /** This is the function where the hard work is done. The code here is * very sensitive to small changes :) Note that part of the * intelligence is also in Row::shortenIfNeeded. */ -void TextMetrics::breakRow(Row & row, int const right_margin, pit_type const pit) const +bool TextMetrics::breakRow(Row & row, int const right_margin) const { - Paragraph const & par = text_->getPar(pit); + Paragraph const & par = text_->getPar(row.pit()); pos_type const end = par.size(); pos_type const pos = row.pos(); pos_type const body_pos = par.beginOfBody(); bool const is_rtl = text_->isRTL(par); + bool need_new_row = false; row.clear(); - row.left_margin = leftMargin(max_width_, pit, pos); + row.left_margin = leftMargin(row.pit(), pos); row.right_margin = right_margin; + row.needsChangeBar(false); if (is_rtl) swap(row.left_margin, row.right_margin); // Remember that the row width takes into account the left_margin @@ -773,13 +846,6 @@ void TextMetrics::breakRow(Row & row, int const right_margin, pit_type const pit // the width available for the row. int const width = max_width_ - row.right_margin; - if (pos >= end || row.width() > width) { - row.endpos(end); - return; - } - - ParagraphList const & pars = text_->paragraphs(); - #if 0 //FIXME: As long as leftMargin() is not correctly implemented for // MARGIN_RIGHT_ADDRESS_BOX, we should also not do this here. @@ -791,14 +857,14 @@ void TextMetrics::breakRow(Row & row, int const right_margin, pit_type const pit // check for possible inline completion DocIterator const & ic_it = bv_->inlineCompletionPos(); pos_type ic_pos = -1; - if (ic_it.inTexted() && ic_it.text() == text_ && ic_it.pit() == pit) + if (ic_it.inTexted() && ic_it.text() == text_ && ic_it.pit() == row.pit()) ic_pos = ic_it.pos(); // Now we iterate through until we reach the right margin // or the end of the par, then build a representation of the row. pos_type i = pos; - FontIterator fi = FontIterator(*this, par, pit, pos); - while (i < end && row.width() <= width) { + FontIterator fi = FontIterator(*this, par, row.pit(), pos); + while (i < end && (i == pos || row.width() <= width)) { char_type c = par.getChar(i); // The most special cases are handled first. if (par.isInset(i)) { @@ -814,12 +880,28 @@ void TextMetrics::breakRow(Row & row, int const right_margin, pit_type const pit // this is needed to make sure that the row width is correct row.finalizeLast(); int const add = max(fm.width(par.layout().labelsep), - labelEnd(pit) - row.width()); + labelEnd(row.pit()) - row.width()); row.addSpace(i, add, *fi, par.lookupChange(i)); } else if (c == '\t') row.addSpace(i, theFontMetrics(*fi).width(from_ascii(" ")), *fi, par.lookupChange(i)); - else { + else if (c == 0x2028 || c == 0x2029) { + /** + * U+2028 LINE SEPARATOR + * U+2029 PARAGRAPH SEPARATOR + + * These are special unicode characters that break + * lines/pragraphs. Not handling them lead to trouble wrt + * Qt QTextLayout formatting. We add a visible character + * on screen so that the user can see that something is + * happening. + */ + row.finalizeLast(); + // ⤶ U+2936 ARROW POINTING DOWNWARDS THEN CURVING LEFTWARDS + // ¶ U+00B6 PILCROW SIGN + char_type const screen_char = (c == 0x2028) ? 0x2936 : 0x00B6; + row.add(i, screen_char, *fi, par.lookupChange(i)); + } else { // FIXME: please someone fix the Hebrew/Arabic parenthesis mess! // see also Paragraph::getUChar. if (fi->language()->lang() == "hebrew") { @@ -856,7 +938,8 @@ void TextMetrics::breakRow(Row & row, int const right_margin, pit_type const pit && inset->display()) || (!row.empty() && row.back().inset && row.back().inset->display())) { - row.right_boundary(true); + row.flushed(true); + need_new_row = par.isNewline(i); ++i; break; } @@ -867,202 +950,177 @@ void TextMetrics::breakRow(Row & row, int const right_margin, pit_type const pit row.finalizeLast(); row.endpos(i); - // End of paragraph marker - if (lyxrc.paragraph_markers - && i == end && size_type(pit + 1) < pars.size()) { + // End of paragraph marker. The logic here is almost the + // same as in redoParagraph, remember keep them in sync. + ParagraphList const & pars = text_->paragraphs(); + if (lyxrc.paragraph_markers && !need_new_row + && i == end && size_type(row.pit() + 1) < pars.size()) { // add a virtual element for the end-of-paragraph // marker; it is shown on screen, but does not exist // in the paragraph. - Font f(text_->layoutFont(pit)); + Font f(text_->layoutFont(row.pit())); f.fontInfo().setColor(Color_paragraphmarker); BufferParams const & bparams = text_->inset().buffer().params(); f.setLanguage(par.getParLanguage(bparams)); + // ¶ U+00B6 PILCROW SIGN row.addVirtual(end, docstring(1, char_type(0x00B6)), f, Change()); } - // if the row is too large, try to cut at last separator. - row.shortenIfNeeded(body_pos, width); + // Is there a end-of-paragaph change? + if (i == end && par.lookupChange(end).changed() && !need_new_row) + row.needsChangeBar(true); + + // if the row is too large, try to cut at last separator. In case + // of success, reset indication that the row was broken abruptly. + int const next_width = max_width_ - leftMargin(row.pit(), row.endpos()) + - rightMargin(row.pit()); + + if (row.shortenIfNeeded(body_pos, width, next_width)) + row.flushed(false); + row.right_boundary(!row.empty() && row.endpos() < end + && row.back().endpos == row.endpos()); + // Last row in paragraph is flushed + if (row.endpos() == end) + row.flushed(true); // make sure that the RTL elements are in reverse ordering row.reverseRTL(is_rtl); //LYXERR0("breakrow: row is " << row); -} + return need_new_row; +} -void TextMetrics::setRowHeight(Row & row, pit_type const pit, - bool topBottomSpace) const +int TextMetrics::parTopSpacing(pit_type const pit) const { Paragraph const & par = text_->getPar(pit); - // get the maximum ascent and the maximum descent - double layoutasc = 0; - double layoutdesc = 0; - double const dh = defaultRowHeight(); - - // ok, let us initialize the maxasc and maxdesc value. - // Only the fontsize count. The other properties - // are taken from the layoutfont. Nicer on the screen :) Layout const & layout = par.layout(); - // as max get the first character of this row then it can - // increase but not decrease the height. Just some point to - // start with so we don't have to do the assignment below too - // often. - Buffer const & buffer = bv_->buffer(); - Font font = displayFont(pit, row.pos()); - FontSize const tmpsize = font.fontInfo().size(); - font.fontInfo() = text_->layoutFont(pit); - FontSize const size = font.fontInfo().size(); - font.fontInfo().setSize(tmpsize); + int asc = 0; + ParagraphList const & pars = text_->paragraphs(); + double const dh = defaultRowHeight(); - FontInfo labelfont = text_->labelFont(par); + BufferParams const & bparams = bv_->buffer().params(); + Inset const & inset = text_->inset(); + // some parskips VERY EASY IMPLEMENTATION + if (bparams.paragraph_separation == BufferParams::ParagraphSkipSeparation + && !inset.getLayout().parbreakIsNewline() + && !par.layout().parbreak_is_newline + && pit > 0 + && ((layout.isParagraph() && par.getDepth() == 0) + || (pars[pit - 1].layout().isParagraph() + && pars[pit - 1].getDepth() == 0))) { + asc += bparams.getDefSkip().inPixels(*bv_); + } - FontMetrics const & labelfont_metrics = theFontMetrics(labelfont); - FontMetrics const & fontmetrics = theFontMetrics(font); + if (par.params().startOfAppendix()) + asc += int(3 * dh); + + // special code for the top label + if (layout.labelIsAbove() + && (!layout.isParagraphGroup() || text_->isFirstInSequence(pit)) + && !par.labelString().empty()) { + FontInfo labelfont = text_->labelFont(par); + FontMetrics const & lfm = theFontMetrics(labelfont); + asc += int(lfm.maxHeight() * layout.spacing.getValue() + * text_->spacing(par) + + (layout.topsep + layout.labelbottomsep) * dh); + } - // these are minimum values - double const spacing_val = layout.spacing.getValue() - * text_->spacing(par); - //lyxerr << "spacing_val = " << spacing_val << endl; - int maxasc = int(fontmetrics.maxAscent() * spacing_val); - int maxdesc = int(fontmetrics.maxDescent() * spacing_val); + // Add the layout spaces, for example before and after + // a section, or between the items of a itemize or enumerate + // environment. - // insets may be taller - CoordCache::Insets const & insetCache = bv_->coordCache().getInsets(); - Row::const_iterator cit = row.begin(); - Row::const_iterator cend = row.end(); - for ( ; cit != cend; ++cit) { - if (cit->inset) { - Dimension const & dim = insetCache.dim(cit->inset); - maxasc = max(maxasc, dim.ascent()); - maxdesc = max(maxdesc, dim.descent()); - } + pit_type prev = text_->depthHook(pit, par.getDepth()); + Paragraph const & prevpar = pars[prev]; + double layoutasc = 0; + if (prev != pit + && prevpar.layout() == layout + && prevpar.getDepth() == par.getDepth() + && prevpar.getLabelWidthString() == par.getLabelWidthString()) { + layoutasc = layout.itemsep * dh; + } else if (pit != 0 && layout.topsep > 0) + layoutasc = layout.topsep * dh; + + asc += int(layoutasc * 2 / (2 + pars[pit].getDepth())); + + prev = text_->outerHook(pit); + if (prev != pit_type(pars.size())) { + asc += int(pars[prev].layout().parsep * dh); + } else if (pit != 0) { + Paragraph const & prevpar = pars[pit - 1]; + if (prevpar.getDepth() != 0 || prevpar.layout() == layout) + asc += int(layout.parsep * dh); } - // Check if any custom fonts are larger (Asger) - // This is not completely correct, but we can live with the small, - // cosmetic error for now. - int labeladdon = 0; - - FontSize maxsize = - par.highestFontInRange(row.pos(), row.endpos(), size); - if (maxsize > font.fontInfo().size()) { - // use standard paragraph font with the maximal size - FontInfo maxfont = font.fontInfo(); - maxfont.setSize(maxsize); - FontMetrics const & maxfontmetrics = theFontMetrics(maxfont); - maxasc = max(maxasc, maxfontmetrics.maxAscent()); - maxdesc = max(maxdesc, maxfontmetrics.maxDescent()); - } + return asc; +} - // This is nicer with box insets: - ++maxasc; - ++maxdesc; +int TextMetrics::parBottomSpacing(pit_type const pit) const +{ + double layoutdesc = 0; ParagraphList const & pars = text_->paragraphs(); - Inset const & inset = text_->inset(); + double const dh = defaultRowHeight(); - // is it a top line? - if (row.pos() == 0 && topBottomSpace) { - BufferParams const & bufparams = buffer.params(); - // some parskips VERY EASY IMPLEMENTATION - if (bufparams.paragraph_separation == BufferParams::ParagraphSkipSeparation - && !inset.getLayout().parbreakIsNewline() - && !par.layout().parbreak_is_newline - && pit > 0 - && ((layout.isParagraph() && par.getDepth() == 0) - || (pars[pit - 1].layout().isParagraph() - && pars[pit - 1].getDepth() == 0))) { - maxasc += bufparams.getDefSkip().inPixels(*bv_); + // add the layout spaces, for example before and after + // a section, or between the items of a itemize or enumerate + // environment + pit_type nextpit = pit + 1; + if (nextpit != pit_type(pars.size())) { + pit_type cpit = pit; + + if (pars[cpit].getDepth() > pars[nextpit].getDepth()) { + double usual = pars[cpit].layout().bottomsep * dh; + double unusual = 0; + cpit = text_->depthHook(cpit, pars[nextpit].getDepth()); + if (pars[cpit].layout() != pars[nextpit].layout() + || pars[nextpit].getLabelWidthString() != pars[cpit].getLabelWidthString()) + unusual = pars[cpit].layout().bottomsep * dh; + layoutdesc = max(unusual, usual); + } else if (pars[cpit].getDepth() == pars[nextpit].getDepth()) { + if (pars[cpit].layout() != pars[nextpit].layout() + || pars[nextpit].getLabelWidthString() != pars[cpit].getLabelWidthString()) + layoutdesc = int(pars[cpit].layout().bottomsep * dh); } + } - if (par.params().startOfAppendix()) - maxasc += int(3 * dh); - - // special code for the top label - if (layout.labelIsAbove() - && (!layout.isParagraphGroup() || text_->isFirstInSequence(pit)) - && !par.labelString().empty()) { - labeladdon = int( - labelfont_metrics.maxHeight() - * layout.spacing.getValue() - * text_->spacing(par) - + (layout.topsep + layout.labelbottomsep) * dh); - } + return int(layoutdesc * 2 / (2 + pars[pit].getDepth())); +} - // Add the layout spaces, for example before and after - // a section, or between the items of a itemize or enumerate - // environment. - pit_type prev = text_->depthHook(pit, par.getDepth()); - Paragraph const & prevpar = pars[prev]; - if (prev != pit - && prevpar.layout() == layout - && prevpar.getDepth() == par.getDepth() - && prevpar.getLabelWidthString() - == par.getLabelWidthString()) { - layoutasc = layout.itemsep * dh; - } else if (pit != 0 || row.pos() != 0) { - if (layout.topsep > 0) - layoutasc = layout.topsep * dh; - } +void TextMetrics::setRowHeight(Row & row) const +{ + Paragraph const & par = text_->getPar(row.pit()); + Layout const & layout = par.layout(); + double const spacing_val = layout.spacing.getValue() * text_->spacing(par); - prev = text_->outerHook(pit); - if (prev != pit_type(pars.size())) { - maxasc += int(pars[prev].layout().parsep * dh); - } else if (pit != 0) { - Paragraph const & prevpar = pars[pit - 1]; - if (prevpar.getDepth() != 0 || - prevpar.layout() == layout) { - maxasc += int(layout.parsep * dh); - } - } - } + // Initial value for ascent (useful if row is empty). + Font const font = displayFont(row.pit(), row.pos()); + FontMetrics const & fm = theFontMetrics(font); + int maxasc = int(fm.maxAscent() * spacing_val); + int maxdes = int(fm.maxDescent() * spacing_val); - // is it a bottom line? - if (row.endpos() >= par.size() && topBottomSpace) { - // add the layout spaces, for example before and after - // a section, or between the items of a itemize or enumerate - // environment - pit_type nextpit = pit + 1; - if (nextpit != pit_type(pars.size())) { - pit_type cpit = pit; - - if (pars[cpit].getDepth() > pars[nextpit].getDepth()) { - double usual = pars[cpit].layout().bottomsep * dh; - double unusual = 0; - cpit = text_->depthHook(cpit, pars[nextpit].getDepth()); - if (pars[cpit].layout() != pars[nextpit].layout() - || pars[nextpit].getLabelWidthString() != pars[cpit].getLabelWidthString()) - unusual = pars[cpit].layout().bottomsep * dh; - layoutdesc = max(unusual, usual); - } else if (pars[cpit].getDepth() == pars[nextpit].getDepth()) { - if (pars[cpit].layout() != pars[nextpit].layout() - || pars[nextpit].getLabelWidthString() != pars[cpit].getLabelWidthString()) - layoutdesc = int(pars[cpit].layout().bottomsep * dh); - } + // Find the ascent/descent of the row contents + Row::const_iterator cit = row.begin(); + Row::const_iterator cend = row.end(); + for ( ; cit != cend; ++cit) { + if (cit->inset) { + maxasc = max(maxasc, cit->dim.ascent()); + maxdes = max(maxdes, cit->dim.descent()); + } else { + FontMetrics const & fm = theFontMetrics(cit->font); + maxasc = max(maxasc, int(fm.maxAscent() * spacing_val)); + maxdes = max(maxdes, int(fm.maxDescent() * spacing_val)); } } - // incalculate the layout spaces - maxasc += int(layoutasc * 2 / (2 + pars[pit].getDepth())); - maxdesc += int(layoutdesc * 2 / (2 + pars[pit].getDepth())); - - // FIXME: the correct way is to do the following is to move the - // following code in another method specially tailored for the - // main Text. The following test is thus bogus. - // Top and bottom margin of the document (only at top-level) - if (main_text_ && topBottomSpace) { - if (pit == 0 && row.pos() == 0) - maxasc += 20; - if (pit + 1 == pit_type(pars.size()) && - row.endpos() == par.size() && - !(row.endpos() > 0 && par.isNewline(row.endpos() - 1))) - maxdesc += 20; - } + // This is nicer with box insets + ++maxasc; + ++maxdes; - row.dimension().asc = maxasc + labeladdon; - row.dimension().des = maxdesc; + row.dimension().asc = maxasc; + row.dimension().des = maxdes; } @@ -1079,6 +1137,10 @@ pos_type TextMetrics::getPosNearX(Row const & row, int & x, int const xo = origin_.x_; x -= xo; + // Adapt to cursor row scroll offset if applicable. + int const offset = bv_->horizScrollOffset(text_, row.pit(), row.pos()); + x += offset; + pos_type pos = row.pos(); boundary = false; if (row.empty()) @@ -1112,8 +1174,10 @@ pos_type TextMetrics::getPosNearX(Row const & row, int & x, * how boundary helps here. */ else if (pos == cit->endpos - && cit + 1 != row.end() - && cit->isRTL() != (cit + 1)->isRTL()) + && ((!cit->isRTL() && cit + 1 != row.end() + && (cit + 1)->isRTL()) + || (cit->isRTL() && cit != row.begin() + && !(cit - 1)->isRTL()))) boundary = true; } @@ -1124,11 +1188,18 @@ pos_type TextMetrics::getPosNearX(Row const & row, int & x, * row is larger than the end of its last element. */ if (!row.empty() && pos == row.back().endpos - && row.back().endpos == row.endpos()) - boundary = true; + && row.back().endpos == row.endpos()) { + Inset const * inset = row.back().inset; + if (inset && (inset->lyxCode() == NEWLINE_CODE + || inset->lyxCode() == SEPARATOR_CODE)) + pos = row.back().pos; + else + boundary = row.right_boundary(); + } - x += xo; + x += xo - offset; //LYXERR0("getPosNearX ==> pos=" << pos << ", boundary=" << boundary); + return pos; } @@ -1159,6 +1230,7 @@ void TextMetrics::newParMetricsDown() redoParagraph(pit); par_metrics_[pit].setPosition(last.second.position() + last.second.descent() + par_metrics_[pit].ascent()); + updatePosCache(pit); } @@ -1173,6 +1245,7 @@ void TextMetrics::newParMetricsUp() redoParagraph(pit); par_metrics_[pit].setPosition(first.second.position() - first.second.ascent() - par_metrics_[pit].descent()); + updatePosCache(pit); } // y is screen coordinate @@ -1293,23 +1366,19 @@ 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); cur.pit() = pit; // Do we cover an inset? - InsetList::InsetTable * it = checkInsetHit(pit, x, yy); + InsetList::InsetTable * it = checkInsetHit(pit, x, y); if (!it) { // No inset, set position in the text bool bound = false; // is modified by getPosNearX - int xx = x; // is modified by getPosNearX - cur.pos() = getPosNearX(row, xx, bound); + cur.pos() = getPosNearX(row, x, bound); cur.boundary(bound); cur.setCurrentFont(); - cur.setTargetX(xx); + cur.setTargetX(x); return 0; } @@ -1322,23 +1391,17 @@ Inset * TextMetrics::editXY(Cursor & cur, int x, int y, cur.setTargetX(x); // Try to descend recursively inside the inset. - Inset * edited = inset->editXY(cur, x, yy); - if (edited == inset && cur.pos() == it->pos) { + Inset * edited = inset->editXY(cur, x, y); + // FIXME: it is not clear that the test on position is needed + // Remove it if/when semantics of editXY is clarified + if (cur.text() == text_ && cur.pos() == it->pos) { // non-editable inset, set cursor after the inset if x is // nearer to that position (bug 9628) - CoordCache::Insets const & insetCache = bv_->coordCache().getInsets(); - Dimension const & dim = insetCache.dim(inset); - Point p = insetCache.xy(inset); - bool const is_rtl = text_->isRTL(text_->getPar(pit)); - if (is_rtl) { - // "in front of" == "right of" - if (abs(p.x_ - x) < abs(p.x_ + dim.wid - x)) - cur.posForward(); - } else { - // "in front of" == "left of" - if (abs(p.x_ + dim.wid - x) < abs(p.x_ - x)) - cur.posForward(); - } + bool bound = false; // is modified by getPosNearX + cur.pos() = getPosNearX(row, x, bound); + cur.boundary(bound); + cur.setCurrentFont(); + cur.setTargetX(x); } if (cur.top().text() == text_) @@ -1392,28 +1455,12 @@ InsetList::InsetTable * TextMetrics::checkInsetHit(pit_type pit, int x, int y) LYXERR(Debug::DEBUG, "x: " << x << " y: " << y << " pit: " << pit); - InsetList::const_iterator iit = par.insetList().begin(); - InsetList::const_iterator iend = par.insetList().end(); - for (; iit != iend; ++iit) { - Inset * inset = iit->inset; - - LYXERR(Debug::DEBUG, "examining inset " << inset); + for (auto const & it : par.insetList()) { + LYXERR(Debug::DEBUG, "examining inset " << it.inset); - if (!insetCache.has(inset)) { - LYXERR(Debug::DEBUG, "inset has no cached position"); - return 0; - } - - Dimension const & dim = insetCache.dim(inset); - Point p = insetCache.xy(inset); - - LYXERR(Debug::DEBUG, "xo: " << p.x_ << "..." << p.x_ + dim.wid - << " yo: " << p.y_ - dim.asc << "..." << p.y_ + dim.des); - - if (x >= p.x_ && x <= p.x_ + dim.wid - && y >= p.y_ - dim.asc && y <= p.y_ + dim.des) { - LYXERR(Debug::DEBUG, "Hit inset: " << inset); - return const_cast(&(*iit)); + if (insetCache.covers(it.inset, x, y)) { + LYXERR(Debug::DEBUG, "Hit inset: " << it.inset); + return const_cast(&it); } } @@ -1436,56 +1483,6 @@ Inset * TextMetrics::checkInsetHit(int x, int y) } -Row::const_iterator const -TextMetrics::findRowElement(Row const & row, pos_type const pos, - bool const boundary, double & x) const -{ - /** - * When boundary is true, position i is in the row element (pos, endpos) - * if - * pos < i <= endpos - * whereas, when boundary is false, the test is - * pos <= i < endpos - * The correction below allows to handle both cases. - */ - int const boundary_corr = (boundary && pos) ? -1 : 0; - - x = row.left_margin; - - /** Early return in trivial cases - * 1) the row is empty - * 2) the position is the left-most position of the row; there - * is a quirk here however: if the first element is virtual - * (end-of-par marker for example), then we have to look - * closer - */ - if (row.empty() - || (pos == row.begin()->left_pos() && !boundary - && !row.begin()->isVirtual())) - return row.begin(); - - Row::const_iterator cit = row.begin(); - for ( ; cit != row.end() ; ++cit) { - /** Look whether the cursor is inside the element's - * span. Note that it is necessary to take the - * boundary into account, and to accept virtual - * elements, which have pos == endpos. - */ - if (pos + boundary_corr >= cit->pos - && (pos + boundary_corr < cit->endpos || cit->isVirtual())) { - x += cit->pos2x(pos); - break; - } - x += cit->full_width(); - } - - if (cit == row.end()) - --cit; - - return cit; -} - - int TextMetrics::cursorX(CursorSlice const & sl, bool boundary) const { @@ -1498,7 +1495,7 @@ int TextMetrics::cursorX(CursorSlice const & sl, pos_type const pos = sl.pos(); double x = 0; - findRowElement(row, pos, boundary, x); + row.findElement(pos, boundary, x); return int(x); } @@ -1507,14 +1504,14 @@ int TextMetrics::cursorX(CursorSlice const & sl, int TextMetrics::cursorY(CursorSlice const & sl, bool boundary) const { //lyxerr << "TextMetrics::cursorY: boundary: " << boundary << endl; - ParagraphMetrics const & pm = par_metrics_[sl.pit()]; + ParagraphMetrics const & pm = parMetrics(sl.pit()); if (pm.rows().empty()) return 0; int h = 0; - h -= par_metrics_[0].rows()[0].ascent(); + h -= parMetrics(0).rows()[0].ascent(); for (pit_type pit = 0; pit < sl.pit(); ++pit) { - h += par_metrics_[pit].height(); + h += parMetrics(pit).height(); } int pos = sl.pos(); if (pos && boundary) @@ -1557,7 +1554,8 @@ bool TextMetrics::cursorEnd(Cursor & cur) boundary = true; else --end; - } + } else if (cur.paragraph().isEnvSeparator(end-1)) + --end; return text_->setCursor(cur, cur.pit(), end, true, boundary); } @@ -1570,41 +1568,40 @@ void TextMetrics::deleteLineForward(Cursor & cur) text_->cursorForward(cur); } else { cur.resetAnchor(); - cur.setSelection(true); // to avoid deletion + cur.selection(true); // to avoid deletion cursorEnd(cur); cur.setSelection(); // What is this test for ??? (JMarc) if (!cur.selection()) text_->deleteWordForward(cur); else - cap::cutSelection(cur, true, false); + cap::cutSelection(cur, false); cur.checkBufferStructure(); } } -bool TextMetrics::isLastRow(pit_type pit, Row const & row) const +bool TextMetrics::isLastRow(Row const & row) const { ParagraphList const & pars = text_->paragraphs(); - return row.endpos() >= pars[pit].size() - && pit + 1 == pit_type(pars.size()); + return row.endpos() >= pars[row.pit()].size() + && row.pit() + 1 == pit_type(pars.size()); } -bool TextMetrics::isFirstRow(pit_type pit, Row const & row) const +bool TextMetrics::isFirstRow(Row const & row) const { - return row.pos() == 0 && pit == 0; + return row.pos() == 0 && row.pit() == 0; } -int TextMetrics::leftMargin(int max_width, pit_type pit) const +int TextMetrics::leftMargin(pit_type pit) const { - return leftMargin(max_width, pit, text_->paragraphs()[pit].size()); + return leftMargin(pit, text_->paragraphs()[pit].size()); } -int TextMetrics::leftMargin(int max_width, - pit_type const pit, pos_type const pos) const +int TextMetrics::leftMargin(pit_type const pit, pos_type const pos) const { ParagraphList const & pars = text_->paragraphs(); @@ -1617,16 +1614,16 @@ int TextMetrics::leftMargin(int max_width, //lyxerr << "TextMetrics::leftMargin: pit: " << pit << " pos: " << pos << endl; DocumentClass const & tclass = buffer.params().documentClass(); Layout const & layout = par.layout(); + FontMetrics const & bfm = theFontMetrics(buffer.params().getFont()); docstring parindent = layout.parindent; int l_margin = 0; - if (text_->isMainText()) + if (text_->isMainText()) { l_margin += bv_->leftMargin(); - - l_margin += theFontMetrics(buffer.params().getFont()).signedWidth( - tclass.leftmargin()); + l_margin += bfm.signedWidth(tclass.leftmargin()); + } int depth = par.getDepth(); if (depth != 0) { @@ -1637,15 +1634,14 @@ int TextMetrics::leftMargin(int max_width, int nestmargin = depth * nestMargin(); if (text_->isMainText()) nestmargin += changebarMargin(); - l_margin = max(leftMargin(max_width, newpar), nestmargin); + l_margin = max(leftMargin(newpar), nestmargin); // Remove the parindent that has been added // if the paragraph was empty. if (pars[newpar].empty() && buffer.params().paragraph_separation == BufferParams::ParagraphIndentSeparation) { docstring pi = pars[newpar].layout().parindent; - l_margin -= theFontMetrics( - buffer.params().getFont()).signedWidth(pi); + l_margin -= bfm.signedWidth(pi); } } if (tclass.isDefaultLayout(par.layout()) @@ -1674,37 +1670,36 @@ int TextMetrics::leftMargin(int max_width, } FontInfo const labelfont = text_->labelFont(par); - FontMetrics const & labelfont_metrics = theFontMetrics(labelfont); + FontMetrics const & lfm = theFontMetrics(labelfont); switch (layout.margintype) { case MARGIN_DYNAMIC: if (!layout.leftmargin.empty()) { - l_margin += theFontMetrics(buffer.params().getFont()).signedWidth( - layout.leftmargin); + l_margin += bfm.signedWidth(layout.leftmargin); } if (!par.labelString().empty()) { - l_margin += labelfont_metrics.signedWidth(layout.labelindent); - l_margin += labelfont_metrics.width(par.labelString()); - l_margin += labelfont_metrics.width(layout.labelsep); + l_margin += lfm.signedWidth(layout.labelindent); + l_margin += lfm.width(par.labelString()); + l_margin += lfm.width(layout.labelsep); } break; case MARGIN_MANUAL: { - l_margin += labelfont_metrics.signedWidth(layout.labelindent); + l_margin += lfm.signedWidth(layout.labelindent); // The width of an empty par, even with manual label, should be 0 if (!par.empty() && pos >= par.beginOfBody()) { if (!par.getLabelWidthString().empty()) { docstring labstr = par.getLabelWidthString(); - l_margin += labelfont_metrics.width(labstr); - l_margin += labelfont_metrics.width(layout.labelsep); + l_margin += lfm.width(labstr); + l_margin += lfm.width(layout.labelsep); } } break; } case MARGIN_STATIC: { - l_margin += theFontMetrics(buffer.params().getFont()). - signedWidth(layout.leftmargin) * 4 / (par.getDepth() + 4); + l_margin += bfm.signedWidth(layout.leftmargin) * 4 + / (par.getDepth() + 4); break; } @@ -1712,20 +1707,20 @@ int TextMetrics::leftMargin(int max_width, if (layout.labeltype == LABEL_MANUAL) { // if we are at position 0, we are never in the body if (pos > 0 && pos >= par.beginOfBody()) - l_margin += labelfont_metrics.signedWidth(layout.leftmargin); + l_margin += lfm.signedWidth(layout.leftmargin); else - l_margin += labelfont_metrics.signedWidth(layout.labelindent); + l_margin += lfm.signedWidth(layout.labelindent); } else if (pos != 0 // Special case to fix problems with // theorems (JMarc) || (layout.labeltype == LABEL_STATIC && layout.latextype == LATEX_ENVIRONMENT && !text_->isFirstInSequence(pit))) { - l_margin += labelfont_metrics.signedWidth(layout.leftmargin); + l_margin += lfm.signedWidth(layout.leftmargin); } else if (!layout.labelIsAbove()) { - l_margin += labelfont_metrics.signedWidth(layout.labelindent); - l_margin += labelfont_metrics.width(layout.labelsep); - l_margin += labelfont_metrics.width(par.labelString()); + l_margin += lfm.signedWidth(layout.labelindent); + l_margin += lfm.width(layout.labelsep); + l_margin += lfm.width(par.labelString()); } break; @@ -1738,59 +1733,53 @@ int TextMetrics::leftMargin(int max_width, ParagraphMetrics const & pm = par_metrics_[pit]; RowList::const_iterator rit = pm.rows().begin(); RowList::const_iterator end = pm.rows().end(); - int minfill = max_width; + int minfill = max_width_; for ( ; rit != end; ++rit) if (rit->fill() < minfill) minfill = rit->fill(); - l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(layout.leftmargin); + l_margin += bfm.signedWidth(layout.leftmargin); l_margin += minfill; #endif // also wrong, but much shorter. - l_margin += max_width / 2; + l_margin += max_width_ / 2; break; } } if (!par.params().leftIndent().zero()) - l_margin += par.params().leftIndent().inPixels(max_width, labelfont_metrics.em()); + l_margin += par.params().leftIndent().inPixels(max_width_, lfm.em()); - LyXAlignment align; - - if (par.params().align() == LYX_ALIGN_LAYOUT) - align = layout.align; - else - align = par.params().align(); + LyXAlignment align = par.getAlign(bv_->buffer().params()); // set the correct parindent if (pos == 0 && (layout.labeltype == LABEL_NO_LABEL - || layout.labeltype == LABEL_ABOVE - || layout.labeltype == LABEL_CENTERED - || (layout.labeltype == LABEL_STATIC - && layout.latextype == LATEX_ENVIRONMENT - && !text_->isFirstInSequence(pit))) + || layout.labeltype == LABEL_ABOVE + || layout.labeltype == LABEL_CENTERED + || (layout.labeltype == LABEL_STATIC + && layout.latextype == LATEX_ENVIRONMENT + && !text_->isFirstInSequence(pit))) && (align == LYX_ALIGN_BLOCK || align == LYX_ALIGN_LEFT) && !par.params().noindent() // in some insets, paragraphs are never indented && !text_->inset().neverIndent() // display style insets are always centered, omit indentation && !(!par.empty() - && par.isInset(pos) - && par.getInset(pos)->display()) + && par.isInset(pos) + && par.getInset(pos)->display()) && (!(tclass.isDefaultLayout(par.layout()) - || tclass.isPlainLayout(par.layout())) + || tclass.isPlainLayout(par.layout())) || 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 - if (buffer.params().getIndentation().asLyXCommand() == "default") - l_margin += theFontMetrics( - buffer.params().getFont()).signedWidth(parindent); - else - l_margin += buffer.params().getIndentation().inPixels(*bv_); - } + /* use the parindent of the layout when the default + * indentation is used otherwise use the indentation set in + * the document settings + */ + if (buffer.params().getParIndent().empty()) + l_margin += bfm.signedWidth(parindent); + else + l_margin += buffer.params().getParIndent().inPixels(max_width_, bfm.em()); + } return l_margin; } @@ -1821,15 +1810,30 @@ void TextMetrics::draw(PainterInfo & pi, int x, int y) const void TextMetrics::drawParagraph(PainterInfo & pi, pit_type const pit, int const x, int y) const { - BufferParams const & bparams = bv_->buffer().params(); ParagraphMetrics const & pm = par_metrics_[pit]; if (pm.rows().empty()) return; - - bool const original_drawing_state = pi.pain.isDrawingEnabled(); - int const ww = bv_->workHeight(); size_t const nrows = pm.rows().size(); + // Use fast lane in nodraw stage. + if (pi.pain.isNull()) { + for (size_t i = 0; i != nrows; ++i) { + + Row const & row = pm.rows()[i]; + // Adapt to cursor row scroll offset if applicable. + int row_x = x - bv_->horizScrollOffset(text_, pit, row.pos()); + if (i) + y += row.ascent(); + + RowPainter rp(pi, *text_, row, row_x, y); + + rp.paintOnlyInsets(); + y += row.descent(); + } + return; + } + + int const ww = bv_->workHeight(); Cursor const & cur = bv_->cursor(); DocIterator sel_beg = cur.selectionBegin(); DocIterator sel_end = cur.selectionEnd(); @@ -1859,25 +1863,19 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type const pit, int const for (size_t i = 0; i != nrows; ++i) { Row const & row = pm.rows()[i]; - int row_x = x; + // Adapt to cursor row scroll offset if applicable. + int row_x = x - bv_->horizScrollOffset(text_, pit, row.pos()); if (i) y += row.ascent(); - CursorSlice rowSlice(const_cast(text_->inset())); - rowSlice.pit() = pit; - rowSlice.pos() = row.pos(); - + // It is not needed to draw on screen if we are not inside. bool const inside = (y + row.descent() >= 0 && y - row.ascent() < ww); - - // Adapt to cursor row scroll offset if applicable. - if (bv_->currentRowSlice() == rowSlice) - row_x -= bv_->horizScrollOffset(); - - // It is not needed to draw on screen if we are not inside. - pi.pain.setDrawingEnabled(inside && original_drawing_state); - - RowPainter rp(pi, *text_, pit, row, row_x, y); + if (!inside) { + // Inset positions have already been set in nodraw stage. + y += row.descent(); + continue; + } if (selection) row.setSelectionAndMargins(sel_beg_par, sel_end_par); @@ -1888,28 +1886,29 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type const pit, int const // whether this row is the first or last and update the margins. if (row.selection()) { if (row.sel_beg == 0) - row.begin_margin_sel = sel_beg.pit() < pit; + row.change(row.begin_margin_sel, sel_beg.pit() < pit); if (row.sel_end == sel_end_par.lastpos()) - row.end_margin_sel = sel_end.pit() > pit; + row.change(row.end_margin_sel, sel_end.pit() > pit); } - // Row signature; has row changed since last paint? - if (pi.pain.isDrawingEnabled()) - row.setCrc(pm.computeRowSignature(row, bparams)); + // has row changed since last paint? bool row_has_changed = row.changed() - || rowSlice == bv_->lastRowSlice(); + || bv_->hadHorizScrollOffset(text_, pit, row.pos()); // Take this opportunity to spellcheck the row contents. if (row_has_changed && pi.do_spellcheck && lyxrc.spellcheck_continuously) { text_->getPar(pit).spellCheck(); } + RowPainter rp(pi, *text_, row, row_x, y); + // 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) { // Paint only the insets if the text itself is // unchanged. rp.paintOnlyInsets(); + row.changed(false); y += row.descent(); continue; } @@ -1920,21 +1919,28 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type const pit, int const LYXERR(Debug::PAINTING, "Clear rect@(" << max(row_x, 0) << ", " << y - row.ascent() << ")=" << width() << " x " << row.height()); + // FIXME: this is a hack. We clear an amount equal to + // cursor width. This will not work if the caret has a + // ridiculous width like 6. (see ticket #10797) + // This is the same formula as in GuiWorkArea. + int const caret_width = lyxrc.cursor_width + ? lyxrc.cursor_width + : 1 + int((lyxrc.currentZoom + 50) / 200.0); pi.pain.fillRectangle(max(row_x, 0), y - row.ascent(), - width(), row.height(), pi.background_color); + width() + caret_width, + row.height(), pi.background_color); } // Instrumentation for testing row cache (see also // 12 lines lower): - if (lyxerr.debugging(Debug::PAINTING) && inside - && (row.selection() || pi.full_repaint || row_has_changed)) { - string const foreword = text_->isMainText() ? - "main text redraw " : "inset text redraw: "; - LYXERR(Debug::PAINTING, foreword << "pit=" << pit << " row=" << i - << " row_selection=" << row.selection() - << " full_repaint=" << pi.full_repaint - << " row_has_changed=" << row_has_changed - << " drawingEnabled=" << pi.pain.isDrawingEnabled()); + if (lyxerr.debugging(Debug::PAINTING) + && (row.selection() || pi.full_repaint || row_has_changed)) { + string const foreword = text_->isMainText() ? "main text redraw " + : "inset text redraw: "; + LYXERR0(foreword << "pit=" << pit << " row=" << i + << (row.selection() ? " row_selection": "") + << (pi.full_repaint ? " full_repaint" : "") + << (row_has_changed ? " row_has_changed" : "")); } // Backup full_repaint status and force full repaint @@ -1945,26 +1951,40 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type const pit, int const rp.paintSelection(); rp.paintAppendix(); rp.paintDepthBar(); - rp.paintChangeBar(); - bool const is_rtl = text_->isRTL(text_->getPar(pit)); - if (i == 0 && !is_rtl) + if (row.needsChangeBar()) + rp.paintChangeBar(); + if (i == 0 && !row.isRTL()) rp.paintFirst(); - if (i == nrows - 1 && is_rtl) + if (i == nrows - 1 && row.isRTL()) rp.paintLast(); rp.paintText(); - if (i == nrows - 1 && !is_rtl) + if (i == nrows - 1 && !row.isRTL()) rp.paintLast(); - if (i == 0 && is_rtl) + if (i == 0 && row.isRTL()) rp.paintFirst(); - rp.paintTooLargeMarks(row_x < row.left_x(), + rp.paintTooLargeMarks(row_x + row.left_x() < 0, row_x + row.right_x() > bv_->workWidth()); y += row.descent(); +#if 0 + // This debug code shows on screen which rows are repainted. + // FIXME: since the updates related to caret blinking restrict + // the painter to a small rectangle, the numbers are not + // updated when this happens. Change the code in + // GuiWorkArea::Private::show/hideCaret if this is important. + static int count = 0; + ++count; + FontInfo fi(sane_font); + fi.setSize(FONT_SIZE_TINY); + fi.setColor(Color_red); + pi.pain.text(row_x, y, convert(count), fi); +#endif + // Restore full_repaint status. pi.full_repaint = tmp; + + row.changed(false); } - // Re-enable screen drawing for future use of the painter. - pi.pain.setDrawingEnabled(original_drawing_state); //LYXERR(Debug::PAINTING, "."); } @@ -1980,18 +2000,19 @@ void TextMetrics::completionPosAndDim(Cursor const & cur, int & x, int & y, DocIterator wordStart = bvcur; wordStart.pos() -= word.length(); - // get position on screen of the word start and end - //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 Row row; + row.pit(bvcur.pit()); row.pos(wordStart.pos()); row.endpos(bvcur.pos()); - setRowHeight(row, bvcur.pit(), false); + setRowHeight(row); dim = row.dimension(); + + // get position on screen of the word start and end + //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); dim.wid = abs(rxy.x_ - lxy.x_); // calculate position of word