#include "TextMetrics.h"
#include "Buffer.h"
-#include "buffer_funcs.h"
#include "BufferParams.h"
#include "BufferView.h"
#include "CoordCache.h"
#include "Cursor.h"
#include "CutAndPaste.h"
-#include "InsetList.h"
-#include "Language.h"
#include "Layout.h"
#include "LyXRC.h"
#include "MetricsInfo.h"
#include "insets/InsetText.h"
-#include "mathed/InsetMathMacroTemplate.h"
+#include "mathed/MacroTable.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 "support/lyxlib.h"
-#include "support/RefChanger.h"
+#include "support/Changer.h"
#include <stdlib.h>
#include <cmath>
}
+ParagraphMetrics & TextMetrics::parMetrics(pit_type pit)
+{
+ return parMetrics(pit, true);
+}
+
+
void TextMetrics::newParMetricsDown()
{
pair<pit_type, ParagraphMetrics> const & last = *par_metrics_.rbegin();
}
-bool TextMetrics::metrics(MetricsInfo & mi, Dimension & dim, int min_width,
+bool TextMetrics::metrics(MetricsInfo const & mi, Dimension & dim, int min_width,
bool const expand_on_multipars)
{
LBUFERR(mi.base.textwidth > 0);
|| !contains(pit))
return false;
- ParagraphMetrics & pm = par_metrics_[pit];
+ ParagraphMetrics const & pm = par_metrics_[pit];
// no RTL boundary in empty paragraph
if (pm.rows().empty())
return false;
- pos_type endpos = pm.getRow(pos - 1, false).endpos();
- pos_type startpos = pm.getRow(pos, false).pos();
+ pos_type const endpos = pm.getRow(pos - 1, false).endpos();
+ pos_type const startpos = pm.getRow(pos, false).pos();
// no RTL boundary at line start:
// abc\n -> toggle to RTL -> abc\n (and not: abc\n|
// | | )
|| par.isSeparator(pos - 1)))
return false;
- bool left = font.isVisibleRightToLeft();
+ bool const left = font.isVisibleRightToLeft();
bool right;
if (pos == par.size())
right = par.isRTL(bv_->buffer().params());
Font const & font = e.inset->inheritFont() ?
displayFont(pit, e.pos) : bufferfont;
MacroContext mc(&buffer, parPos);
- MetricsInfo mi(bv_, font.fontInfo(), w, mc);
+ MetricsInfo mi(bv_, font.fontInfo(), w, mc, e.pos == 0);
e.inset->metrics(mi, dim);
if (!insetCache.has(e.inset) || insetCache.dim(e.inset) != dim) {
insetCache.add(e.inset, dim);
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() || need_new_row);
if (row_index < pm.rows().size())
pm.rows().resize(row_index);
- // 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 = bv_->zoomedPixels(20);
- if (pit == 0) {
- 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).
- */
- // coverity[copy_paste_error]
- pm.dim().des += margin;
- }
- ParagraphList const & pars = text_->paragraphs();
- if (pit + 1 == pit_type(pars.size())) {
- 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().dim().asc += top;
pm.dim().asc += pm.rows()[0].ascent();
pm.dim().des -= pm.rows()[0].ascent();
+ // Top and bottom margin of the document (only at top-level)
+ // FIXME: It might be better to move this in another method
+ // specially tailored for the main text.
+ if (text_->isMainText()) {
+ if (pit == 0)
+ pm.dim().asc += bv_->topMargin();
+ ParagraphList const & pars = text_->paragraphs();
+ if (pit + 1 == pit_type(pars.size())) {
+ pm.dim().des += bv_->bottomMargin();
+ }
+ }
+
changed |= old_dim.height() != pm.dim().height();
return changed;
}
// are there any hfills in the row?
- ParagraphMetrics & pm = par_metrics_[row.pit()];
+ ParagraphMetrics const & pm = par_metrics_[row.pit()];
int nh = numberOfHfills(row, pm, par.beginOfBody());
int hfill = 0;
int hfill_rem = 0;
int maxasc = int(fm.maxAscent() * spacing_val);
int maxdes = int(fm.maxDescent() * spacing_val);
+ // Take label string into account (useful if labelfont is large)
+ if (row.pos() == 0 && layout.labelIsInline()) {
+ FontInfo const labelfont = text_->labelFont(par);
+ FontMetrics const & lfm = theFontMetrics(labelfont);
+ maxasc = max(maxasc, int(lfm.maxAscent() * spacing_val));
+ maxdes = max(maxdes, int(lfm.maxDescent() * spacing_val));
+ }
+
// Find the ascent/descent of the row contents
for (Row::Element const & e : row) {
if (e.inset) {
{
ParagraphMetrics const & pm = par_metrics_[pit];
- int yy = pm.position() - pm.ascent();
+ int yy = pm.position() - pm.rows().front().ascent();
LBUFERR(!pm.rows().empty());
RowList::const_iterator rit = pm.rows().begin();
RowList::const_iterator rlast = pm.rows().end();
ParagraphMetrics const & pm = par_metrics_[pit];
- int yy = pm.position() - pm.ascent();
+ int yy = pm.position() - pm.rows().front().ascent();
LYXERR(Debug::DEBUG, "x: " << x << " y: " << y <<
" pit: " << pit << " yy: " << yy);
}
LYXERR(Debug::DEBUG, "No inset hit. ");
- return 0;
+ return nullptr;
}
return;
size_t const nrows = pm.rows().size();
// Remember left and right margin for drawing math numbers
- Changer changeleft = make_change(pi.leftx, x + leftMargin(pit));
- Changer changeright = make_change(pi.rightx, x + width() - rightMargin(pit));
+ Changer changeleft = changeVar(pi.leftx, x + leftMargin(pit));
+ Changer changeright = changeVar(pi.rightx, x + width() - rightMargin(pit));
// Use fast lane in nodraw stage.
if (pi.pain.isNull()) {
void TextMetrics::completionPosAndDim(Cursor const & cur, int & x, int & y,
Dimension & dim) const
{
- Cursor const & bvcur = cur.bv().cursor();
-
- // get word in front of cursor
- docstring word = text_->previousWord(bvcur.top());
- DocIterator wordStart = bvcur;
- wordStart.pos() -= word.length();
+ DocIterator from = cur.bv().cursor();
+ DocIterator to = from;
+ text_->getWord(from.top(), to.top(), PREVIOUS_WORD);
- // calculate dimensions of the word
- Row row;
- row.pit(bvcur.pit());
- row.pos(wordStart.pos());
- row.endpos(bvcur.pos());
- setRowHeight(row);
- dim = row.dim();
+ // The vertical dimension of the word
+ Font const font = displayFont(cur.pit(), from.pos());
+ FontMetrics const & fm = theFontMetrics(font);
+ // the +1's below are related to the extra pixels added in setRowHeight
+ dim.asc = fm.maxAscent() + 1;
+ dim.des = fm.maxDescent() + 1;
// 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);
+ from.boundary(false);
+ Point lxy = cur.bv().getPos(from);
+ Point rxy = cur.bv().getPos(to);
dim.wid = abs(rxy.x_ - lxy.x_);
// calculate position of word