#include "support/convert.h"
#include "support/debug.h"
#include "support/lassert.h"
+#include "support/lyxlib.h"
#include <stdlib.h>
#include <cmath>
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)
{
}
-ParagraphMetrics const & TextMetrics::parMetrics(pit_type pit) const
-{
- return const_cast<TextMetrics *>(this)->parMetrics(pit, true);
-}
-
-
-
pair<pit_type, ParagraphMetrics const *> TextMetrics::first() const
{
ParMetricsCache::const_iterator it = par_metrics_.begin();
}
+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);
}
-bool TextMetrics::metrics(MetricsInfo & mi, Dimension & dim, int min_width)
+ParagraphMetrics const & TextMetrics::parMetrics(pit_type pit) const
+{
+ return const_cast<TextMetrics *>(this)->parMetrics(pit, true);
+}
+
+
+void TextMetrics::newParMetricsDown()
+{
+ pair<pit_type, ParagraphMetrics> 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<pit_type, ParagraphMetrics> 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)
{
LBUFERR(mi.base.textwidth > 0);
max_width_ = mi.base.textwidth;
dim_ = Dimension();
dim_.wid = min_width;
pit_type const npar = text_->paragraphs().size();
- if (npar > 1)
+ if (npar > 1 && expand_on_multipars)
// If there is more than one row, expand the text to
// the full allowable width.
dim_.wid = max_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;
}
-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
par.setBeginOfBody();
Font const bufferfont = buffer.params().getFont();
CoordCache::Insets & insetCache = bv_->coordCache().insets();
- InsetList::const_iterator ii = par.insetList().begin();
- InsetList::const_iterator iend = par.insetList().end();
- for (; ii != iend; ++ii) {
+ for (auto const & e : par.insetList()) {
// FIXME Doesn't this HAVE to be non-empty?
// position already initialized?
if (!parPos.empty()) {
- parPos.pos() = ii->pos;
+ parPos.pos() = e.pos;
// A macro template would normally not be visible
// by itself. But the tex macro semantics allow
// recursion, so we artifically take the context
// after the macro template to simulate this.
- if (ii->inset->lyxCode() == MATHMACRO_CODE)
+ if (e.inset->lyxCode() == MATHMACRO_CODE)
parPos.pos()++;
}
// 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()
+ if (lyxrc.paragraph_markers && e.pos + 1 == par.size()
&& size_type(pit + 1) < text_->paragraphs().size()) {
Font f(text_->layoutFont(pit));
// ¶ U+00B6 PILCROW SIGN
// do the metric calculation
Dimension dim;
- int const w = max_width_ - leftMargin(pit, ii->pos)
+ int const w = max_width_ - leftMargin(pit, e.pos)
- right_margin - eop;
- Font const & font = ii->inset->inheritFont() ?
- displayFont(pit, ii->pos) : bufferfont;
+ Font const & font = e.inset->inheritFont() ?
+ displayFont(pit, e.pos) : bufferfont;
MacroContext mc(&buffer, parPos);
MetricsInfo mi(bv_, font.fontInfo(), w, mc);
- ii->inset->metrics(mi, dim);
- if (!insetCache.has(ii->inset) || insetCache.dim(ii->inset) != dim) {
- insetCache.add(ii->inset, dim);
+ e.inset->metrics(mi, dim);
+ if (!insetCache.has(e.inset) || insetCache.dim(e.inset) != dim) {
+ insetCache.add(e.inset, dim);
changed = true;
}
}
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 ((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).
+ * 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;
// 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).
}
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();
}
-void TextMetrics::computeRowMetrics(Row & row, int width) const
+void TextMetrics::setRowAlignment(Row & row, int width) const
{
row.label_hfill = 0;
row.separator = 0;
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:
// 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();
body_pos = 0;
CoordCache::Insets & insetCache = bv_->coordCache().insets();
- Row::iterator cit = row.begin();
- Row::iterator const cend = row.end();
- for ( ; cit != cend; ++cit) {
- if (row.label_hfill && cit->endpos == body_pos
- && cit->type == Row::SPACE)
- cit->dim.wid -= int(row.label_hfill * (nlh - 1));
- if (cit->inset && pm.hfillExpansion(row, cit->pos)) {
- if (cit->pos >= body_pos) {
- cit->dim.wid += hfill;
+ for (Row::Element & e : row) {
+ if (row.label_hfill && e.endpos == body_pos
+ && e.type == Row::SPACE)
+ e.dim.wid -= int(row.label_hfill * (nlh - 1));
+ if (e.inset && pm.hfillExpansion(row, e.pos)) {
+ if (e.pos >= body_pos) {
+ e.dim.wid += hfill;
--nh;
if (nh == 0)
- cit->dim.wid += hfill_rem;
+ e.dim.wid += hfill_rem;
} else
- cit->dim.wid += int(row.label_hfill);
+ e.dim.wid += int(row.label_hfill);
// Cache the inset dimension.
- insetCache.add(cit->inset, cit->dim);
+ insetCache.add(e.inset, e.dim);
}
}
}
LBUFERR(par.beginOfBody() > 0 || par.isEnvSeparator(0));
int w = 0;
- Row::const_iterator cit = row.begin();
- Row::const_iterator const end = row.end();
// iterate over elements before main body (except the last one,
// which is extra space).
- while (cit!= end && cit->endpos < par.beginOfBody()) {
- w += cit->dim.wid;
- ++cit;
+ for (Row::Element const & e : row) {
+ if (e.endpos >= par.beginOfBody())
+ break;
+ w += e.dim.wid;
}
docstring const & label = par.params().labelWidthString();
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;
// ¶ 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
// 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
- 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 & fm2 = theFontMetrics(cit->font);
- maxasc = max(maxasc, int(fm2.maxAscent() * spacing_val));
- maxdes = max(maxdes, int(fm2.maxDescent() * spacing_val));
- }
+ for (Row::Element const & e : row) {
+ 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);
}
}
-void TextMetrics::newParMetricsDown()
-{
- pair<pit_type, ParagraphMetrics> 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<pit_type, ParagraphMetrics> 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)
{
cur.pit() = pit;
// Do we cover an inset?
- InsetList::InsetTable * it = checkInsetHit(pit, x, y);
+ InsetList::Element * e = checkInsetHit(pit, x, y);
- if (!it) {
+ if (!e) {
// No inset, set position in the text
bool bound = false; // is modified by getPosNearX
cur.pos() = getPosNearX(row, x, bound);
return 0;
}
- Inset * inset = it->inset;
+ Inset * inset = e->inset;
//lyxerr << "inset " << inset << " hit at x: " << x << " y: " << y << endl;
// Set position in front of inset
- cur.pos() = it->pos;
+ cur.pos() = e->pos;
cur.boundary(false);
cur.setTargetX(x);
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) {
+ if (cur.text() == text_ && cur.pos() == e->pos) {
// non-editable inset, set cursor after the inset if x is
// nearer to that position (bug 9628)
bool bound = false; // is modified by getPosNearX
//takes screen x,y coordinates
-InsetList::InsetTable * TextMetrics::checkInsetHit(pit_type pit, int x, int y)
+InsetList::Element * TextMetrics::checkInsetHit(pit_type pit, int x, int y)
{
Paragraph const & par = text_->paragraphs()[pit];
CoordCache::Insets const & insetCache = bv_->coordCache().getInsets();
LYXERR(Debug::DEBUG, "x: " << x << " y: " << y << " pit: " << pit);
- for (auto const & it : par.insetList()) {
- LYXERR(Debug::DEBUG, "examining inset " << it.inset);
+ for (InsetList::Element const & e : par.insetList()) {
+ LYXERR(Debug::DEBUG, "examining inset " << e.inset);
- if (insetCache.covers(it.inset, x, y)) {
- LYXERR(Debug::DEBUG, "Hit inset: " << it.inset);
- return const_cast<InsetList::InsetTable *>(&it);
+ if (insetCache.covers(e.inset, x, y)) {
+ LYXERR(Debug::DEBUG, "Hit inset: " << e.inset);
+ return const_cast<InsetList::Element *>(&e);
}
}
{
pit_type const pit = getPitNearY(y);
LASSERT(pit != -1, return 0);
- InsetList::InsetTable * it = checkInsetHit(pit, x, y);
+ InsetList::Element * e = checkInsetHit(pit, x, y);
- if (!it)
+ if (!e)
return 0;
- return it->inset;
+ return e->inset;
}
if (!cur.selection())
text_->deleteWordForward(cur);
else
- cap::cutSelection(cur, true, false);
+ cap::cutSelection(cur, false);
cur.checkBufferStructure();
}
}
-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());
int l_margin = 0;
- if (text_->isMainText())
+ if (text_->isMainText()) {
l_margin += bv_->leftMargin();
-
- l_margin += bfm.signedWidth(tclass.leftmargin());
+ l_margin += bfm.signedWidth(tclass.leftmargin());
+ }
int depth = par.getDepth();
if (depth != 0) {
// same time this function is used in redoParagraph to construct
// the rows.
ParagraphMetrics const & pm = par_metrics_[pit];
- RowList::const_iterator rit = pm.rows().begin();
- RowList::const_iterator end = pm.rows().end();
int minfill = max_width_;
- for ( ; rit != end; ++rit)
- if (rit->fill() < minfill)
- minfill = rit->fill();
+ for (row : pm.rows())
+ if (row.fill() < minfill)
+ minfill = row.fill();
l_margin += bfm.signedWidth(layout.leftmargin);
l_margin += minfill;
#endif
origin_.x_ = x;
origin_.y_ = y;
- ParMetricsCache::iterator it = par_metrics_.begin();
- ParMetricsCache::iterator const pm_end = par_metrics_.end();
- y -= it->second.ascent();
- for (; it != pm_end; ++it) {
- ParagraphMetrics const & pmi = it->second;
- y += pmi.ascent();
- pit_type const pit = it->first;
+ y -= par_metrics_.begin()->second.ascent();
+ for (auto & pm_pair : par_metrics_) {
+ pit_type const pit = pm_pair.first;
+ ParagraphMetrics & pm = pm_pair.second;
+ y += pm.ascent();
// Save the paragraph position in the cache.
- it->second.setPosition(y);
+ pm.setPosition(y);
drawParagraph(pi, pit, x, y);
- y += pmi.descent();
+ y += pm.descent();
}
}
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())
- || bv_->needRepaint(text_, row);
-
// 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();
}
// 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();
// 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());
// 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
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();
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?
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
projects / lyx.git / blobdiff