X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FTextMetrics.cpp;h=88ffa6f874bef6aa8f9badab41a9615235081d01;hb=cd4ae51f7787046e8852abc4b339b5191c6adc16;hp=4661b76fdbb377c2fa52c5d195f23eab10d02eed;hpb=b28ec44476d3f2c5858d06596ed5bd975012ec33;p=lyx.git diff --git a/src/TextMetrics.cpp b/src/TextMetrics.cpp index 4661b76fdb..88ffa6f874 100644 --- a/src/TextMetrics.cpp +++ b/src/TextMetrics.cpp @@ -48,6 +48,7 @@ #include "support/convert.h" #include "support/debug.h" #include "support/lassert.h" +#include "support/lyxlib.h" #include #include @@ -61,6 +62,10 @@ using frontend::FontMetrics; namespace { +// the somewhat arbitrary leading added between rows. This is 20% of +// the characters height, inluding the possible leading of the font. +// 20% is a standard value used by LaTeX and word processors. +double const extra_leading = 0.2; int numberOfLabelHfills(Paragraph const & par, Row const & row) { @@ -125,13 +130,6 @@ bool TextMetrics::contains(pit_type pit) const } -ParagraphMetrics const & TextMetrics::parMetrics(pit_type pit) const -{ - return const_cast(this)->parMetrics(pit, true); -} - - - pair TextMetrics::first() const { ParMetricsCache::const_iterator it = par_metrics_.begin(); @@ -147,6 +145,30 @@ pair TextMetrics::last() const } +bool TextMetrics::isLastRow(Row const & row) const +{ + ParagraphList const & pars = text_->paragraphs(); + return row.endpos() >= pars[row.pit()].size() + && row.pit() + 1 == pit_type(pars.size()); +} + + +bool TextMetrics::isFirstRow(Row const & row) const +{ + return row.pos() == 0 && row.pit() == 0; +} + + +void TextMetrics::setRowChanged(pit_type pit, pos_type pos) +{ + for (auto & pm_pair : par_metrics_) + if (pm_pair.first == pit) + for (Row & row : pm_pair.second.rows()) + if (row.pos() == pos) + row.changed(true); +} + + ParagraphMetrics & TextMetrics::parMetrics(pit_type pit, bool redo) { ParMetricsCache::iterator pmc_it = par_metrics_.find(pit); @@ -160,6 +182,42 @@ ParagraphMetrics & TextMetrics::parMetrics(pit_type pit, bool redo) } +ParagraphMetrics const & TextMetrics::parMetrics(pit_type pit) const +{ + return const_cast(this)->parMetrics(pit, true); +} + + +void TextMetrics::newParMetricsDown() +{ + pair const & last = *par_metrics_.rbegin(); + pit_type const pit = last.first + 1; + if (pit == int(text_->paragraphs().size())) + return; + + // do it and update its position. + redoParagraph(pit); + par_metrics_[pit].setPosition(last.second.position() + + last.second.descent() + par_metrics_[pit].ascent()); + updatePosCache(pit); +} + + +void TextMetrics::newParMetricsUp() +{ + pair const & first = *par_metrics_.begin(); + if (first.first == 0) + return; + + pit_type const pit = first.first - 1; + // do it and update its position. + redoParagraph(pit); + par_metrics_[pit].setPosition(first.second.position() + - first.second.ascent() - par_metrics_[pit].descent()); + updatePosCache(pit); +} + + bool TextMetrics::metrics(MetricsInfo & mi, Dimension & dim, int min_width, bool const expand_on_multipars) { @@ -182,13 +240,21 @@ bool TextMetrics::metrics(MetricsInfo & mi, Dimension & dim, int min_width, bool changed = false; unsigned int h = 0; for (pit_type pit = 0; pit != npar; ++pit) { - changed |= redoParagraph(pit); + // create rows, but do not set alignment yet + changed |= redoParagraph(pit, false); ParagraphMetrics const & pm = par_metrics_[pit]; h += pm.height(); if (dim_.wid < pm.width()) dim_.wid = pm.width(); } + // Now set alignment for all rows (the width might not have been known before). + for (pit_type pit = 0; pit != npar; ++pit) { + ParagraphMetrics & pm = par_metrics_[pit]; + for (Row & row : pm.rows()) + setRowAlignment(row, dim_.wid); + } + dim_.asc = par_metrics_[0].ascent(); dim_.des = h - dim_.asc; //lyxerr << "dim_.wid " << dim_.wid << endl; @@ -354,7 +420,7 @@ bool TextMetrics::isRTLBoundary(pit_type pit, pos_type pos, } -bool TextMetrics::redoParagraph(pit_type const pit) +bool TextMetrics::redoParagraph(pit_type const pit, bool const align_rows) { Paragraph & par = text_->getPar(pit); // IMPORTANT NOTE: We pass 'false' explicitly in order to not call @@ -474,14 +540,14 @@ bool TextMetrics::redoParagraph(pit_type const pit) /* 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. + * needed for the setRowAlignment() below. * We do nothing when inside a table cell. */ if (dim_.wid < max_width_) dim_.wid = max_width_; } - int const max_row_width = max(dim_.wid, row.width()); - computeRowMetrics(row, max_row_width); + if (align_rows) + setRowAlignment(row, max(dim_.wid, row.width())); first = row.endpos(); ++row_index; @@ -499,7 +565,7 @@ bool TextMetrics::redoParagraph(pit_type const pit) // original value was 20px, which is 0.2in at 100dpi int const margin = bv_->zoomedPixels(20); if (pit == 0) { - pm.rows().front().dimension().asc += margin; + pm.rows().front().dim().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). @@ -509,16 +575,16 @@ bool TextMetrics::redoParagraph(pit_type const pit) } ParagraphList const & pars = text_->paragraphs(); if (pit + 1 == pit_type(pars.size())) { - pm.rows().back().dimension().des += margin; + pm.rows().back().dim().des += margin; pm.dim().des += margin; } } // The space above and below the paragraph. int const top = parTopSpacing(pit); - pm.rows().front().dimension().asc += top; + pm.rows().front().dim().asc += top; int const bottom = parBottomSpacing(pit); - pm.rows().back().dimension().des += bottom; + pm.rows().back().dim().des += bottom; pm.dim().des += top + bottom; pm.dim().asc += pm.rows()[0].ascent(); @@ -557,13 +623,19 @@ LyXAlignment TextMetrics::getAlign(Paragraph const & par, Row const & row) const // Display-style insets should always be on a centered row if (Inset const * inset = par.getInset(row.pos())) { - if (inset->display() & Inset::Display) { - if (inset->display() & Inset::AlignLeft) - align = LYX_ALIGN_BLOCK; - else if (inset->display() & Inset::AlignRight) - align = LYX_ALIGN_RIGHT; - else - align = LYX_ALIGN_CENTER; + switch (inset->display()) { + case Inset::AlignLeft: + align = LYX_ALIGN_BLOCK; + break; + case Inset::AlignCenter: + align = LYX_ALIGN_CENTER; + break; + case Inset::Inline: + // unchanged (use align) + break; + case Inset::AlignRight: + align = LYX_ALIGN_RIGHT; + break; } } @@ -582,7 +654,7 @@ LyXAlignment TextMetrics::getAlign(Paragraph const & par, Row const & row) const } -void TextMetrics::computeRowMetrics(Row & row, int width) const +void TextMetrics::setRowAlignment(Row & row, int width) const { row.label_hfill = 0; row.separator = 0; @@ -635,28 +707,28 @@ void TextMetrics::computeRowMetrics(Row & row, int width) const 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; + row.dim().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_); + row.dim().wid += inset->indent(*bv_); } break; case LYX_ALIGN_RIGHT: 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; + row.dim().wid += new_w; } else { row.left_margin += w; - row.dimension().wid += w; + row.dim().wid += w; } break; case LYX_ALIGN_CENTER: - row.dimension().wid += w / 2; + row.dim().wid += w / 2; row.left_margin += w / 2; break; case LYX_ALIGN_NONE: @@ -671,7 +743,7 @@ void TextMetrics::computeRowMetrics(Row & row, int width) const // Case nh > 0. There are hfill separators. hfill = w / nh; hfill_rem = w % nh; - row.dimension().wid += w; + row.dim().wid += w; // Set size of hfill insets pos_type const endpos = row.endpos(); pos_type body_pos = par.beginOfBody(); @@ -827,7 +899,7 @@ bool TextMetrics::breakRow(Row & row, int const right_margin) const swap(row.left_margin, row.right_margin); // Remember that the row width takes into account the left_margin // but not the right_margin. - row.dimension().wid = row.left_margin; + row.dim().wid = row.left_margin; // the width available for the row. int const width = max_width_ - row.right_margin; @@ -886,17 +958,8 @@ bool TextMetrics::breakRow(Row & row, int const right_margin) const // ¶ 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") { - if (c == '(') - c = ')'; - else if (c == ')') - c = '('; - } + } else row.add(i, c, *fi, par.lookupChange(i)); - } // add inline completion width // draw logically behind the previous character @@ -914,12 +977,15 @@ bool TextMetrics::breakRow(Row & row, int const right_margin) const } // Handle some situations that abruptly terminate the row - // - Before an inset with BreakBefore - // - After an inset with BreakAfter - Inset const * prevInset = !row.empty() ? row.back().inset : 0; - Inset const * nextInset = (i + 1 < end) ? par.getInset(i + 1) : 0; - if ((nextInset && nextInset->display() & Inset::BreakBefore) - || (prevInset && prevInset->display() & Inset::BreakAfter)) { + // - A newline inset + // - Before a display inset + // - After a display inset + Inset const * inset = 0; + if (par.isNewline(i) || par.isEnvSeparator(i) + || (i + 1 < end && (inset = par.getInset(i + 1)) + && inset->display()) + || (!row.empty() && row.back().inset + && row.back().inset->display())) { row.flushed(true); need_new_row = par.isNewline(i); ++i; @@ -1080,27 +1146,19 @@ void TextMetrics::setRowHeight(Row & row) const // 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); + int maxasc = fm.maxAscent() + fm.leading(); + int maxdes = fm.maxDescent(); // Find the ascent/descent of the row contents for (Row::Element const & e : row) { - if (e.inset) { - maxasc = max(maxasc, e.dim.ascent()); - maxdes = max(maxdes, e.dim.descent()); - } else { - FontMetrics const & fm2 = theFontMetrics(e.font); - maxasc = max(maxasc, int(fm2.maxAscent() * spacing_val)); - maxdes = max(maxdes, int(fm2.maxDescent() * spacing_val)); - } + maxasc = max(maxasc, e.dim.ascent()); + maxdes = max(maxdes, e.dim.descent()); } - // This is nicer with box insets - ++maxasc; - ++maxdes; - - row.dimension().asc = maxasc; - row.dimension().des = maxdes; + // Add some leading (split between before and after) + int const leading = support::iround(extra_leading * (maxasc + maxdes)); + row.dim().asc = int((maxasc + leading - leading / 2) * spacing_val); + row.dim().des = int((maxdes + leading / 2) * spacing_val); } @@ -1199,35 +1257,6 @@ pos_type TextMetrics::x2pos(pit_type pit, int row, int x) const } -void TextMetrics::newParMetricsDown() -{ - pair const & last = *par_metrics_.rbegin(); - pit_type const pit = last.first + 1; - if (pit == int(text_->paragraphs().size())) - return; - - // do it and update its position. - redoParagraph(pit); - par_metrics_[pit].setPosition(last.second.position() - + last.second.descent() + par_metrics_[pit].ascent()); - updatePosCache(pit); -} - - -void TextMetrics::newParMetricsUp() -{ - pair const & first = *par_metrics_.begin(); - if (first.first == 0) - return; - - pit_type const pit = first.first - 1; - // do it and update its position. - redoParagraph(pit); - par_metrics_[pit].setPosition(first.second.position() - - first.second.ascent() - par_metrics_[pit].descent()); - updatePosCache(pit); -} - // y is screen coordinate pit_type TextMetrics::getPitNearY(int y) { @@ -1561,20 +1590,6 @@ void TextMetrics::deleteLineForward(Cursor & cur) } -bool TextMetrics::isLastRow(Row const & row) const -{ - ParagraphList const & pars = text_->paragraphs(); - return row.endpos() >= pars[row.pit()].size() - && row.pit() + 1 == pit_type(pars.size()); -} - - -bool TextMetrics::isFirstRow(Row const & row) const -{ - return row.pos() == 0 && row.pit() == 0; -} - - int TextMetrics::leftMargin(pit_type pit) const { return leftMargin(pit, text_->paragraphs()[pit].size()); @@ -1744,7 +1759,7 @@ int TextMetrics::leftMargin(pit_type const pit, pos_type const pos) const // display style insets are always centered, omit indentation && !(!par.empty() && par.isInset(pos) - && par.getInset(pos)->display() & Inset::Display) + && par.getInset(pos)->display()) && (!(tclass.isDefaultLayout(par.layout()) || tclass.isPlainLayout(par.layout())) || buffer.params().paragraph_separation @@ -1867,12 +1882,8 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type const pit, int const row.change(row.end_margin_sel, sel_end.pit() > pit); } - // has row changed since last paint? - bool row_has_changed = row.changed() - || bv_->hadHorizScrollOffset(text_, pit, row.pos()); - // Take this opportunity to spellcheck the row contents. - if (row_has_changed && pi.do_spellcheck && lyxrc.spellcheck_continuously) { + if (row.changed() && pi.do_spellcheck && lyxrc.spellcheck_continuously) { text_->getPar(pit).spellCheck(); } @@ -1880,7 +1891,7 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type const pit, int const // 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) { + if (!pi.full_repaint && !row.changed()) { // Paint only the insets if the text itself is // unchanged. rp.paintOnlyInsets(); @@ -1891,7 +1902,7 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type const pit, int const // Clear background of this row if paragraph background was not // already cleared because of a full repaint. - if (!pi.full_repaint && row_has_changed) { + if (!pi.full_repaint && row.changed()) { LYXERR(Debug::PAINTING, "Clear rect@(" << max(row_x, 0) << ", " << y - row.ascent() << ")=" << width() << " x " << row.height()); @@ -1910,13 +1921,13 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type const pit, int const // Instrumentation for testing row cache (see also // 12 lines lower): if (lyxerr.debugging(Debug::PAINTING) - && (row.selection() || pi.full_repaint || row_has_changed)) { + && (row.selection() || pi.full_repaint || row.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" : "")); + << (row.changed() ? " row.changed" : "")); } // Backup full_repaint status and force full repaint @@ -1929,15 +1940,11 @@ void TextMetrics::drawParagraph(PainterInfo & pi, pit_type const pit, int const rp.paintDepthBar(); if (row.needsChangeBar()) rp.paintChangeBar(); - if (i == 0 && !row.isRTL()) + if (i == 0) rp.paintFirst(); - if (i == nrows - 1 && row.isRTL()) + if (i == nrows - 1) rp.paintLast(); rp.paintText(); - if (i == nrows - 1 && !row.isRTL()) - rp.paintLast(); - if (i == 0 && row.isRTL()) - rp.paintFirst(); rp.paintTooLargeMarks(row_x + row.left_x() < 0, row_x + row.right_x() > bv_->workWidth()); y += row.descent(); @@ -1982,7 +1989,7 @@ void TextMetrics::completionPosAndDim(Cursor const & cur, int & x, int & y, row.pos(wordStart.pos()); row.endpos(bvcur.pos()); setRowHeight(row); - dim = row.dimension(); + dim = row.dim(); // get position on screen of the word start and end //FIXME: Is it necessary to explicitly set this to false? @@ -2001,7 +2008,8 @@ void TextMetrics::completionPosAndDim(Cursor const & cur, int & x, int & y, int defaultRowHeight() { - return int(theFontMetrics(sane_font).maxHeight() * 1.2); + FontMetrics const & fm = theFontMetrics(sane_font); + return support::iround(fm.maxHeight() * (1 + extra_leading) + fm.leading()); } } // namespace lyx