#include "CoordCache.h"
#include "Cursor.h"
#include "CutAndPaste.h"
-#include "debug.h"
#include "FontIterator.h"
#include "FuncRequest.h"
#include "InsetList.h"
#include "frontends/FontMetrics.h"
#include "frontends/Painter.h"
-#include <boost/current_function.hpp>
+#include "support/debug.h"
-using std::make_pair;
-using std::max;
-using std::min;
-using std::endl;
-using std::pair;
+using namespace std;
namespace lyx {
int TextMetrics::rightMargin(ParagraphMetrics const & pm) const
{
- return main_text_? pm.rightMargin(bv_->buffer()) : 0;
+ return main_text_? pm.rightMargin(*bv_) : 0;
}
int TextMetrics::rightMargin(pit_type const pit) const
{
- return main_text_? par_metrics_[pit].rightMargin(bv_->buffer()) : 0;
+ return main_text_? par_metrics_[pit].rightMargin(*bv_) : 0;
}
pm.reset(par);
Buffer & buffer = bv_->buffer();
- BufferParams const & bparams = buffer.params();
main_text_ = (text_ == &buffer.text());
bool changed = false;
// so better to calculate that once here.
int const right_margin = rightMargin(pm);
+ // iterator pointing to paragraph to resolve macros
+ DocIterator parPos = text_->macrocontextPosition();
+ if (!parPos.empty())
+ parPos.pit() = pit;
+ else {
+ LYXERR(Debug::INFO, "MacroContext not initialised!"
+ << " Going through the buffer again and hope"
+ << " the context is better then.");
+ updateLabels(bv_->buffer());
+ parPos = text_->macrocontextPosition();
+ BOOST_ASSERT(!parPos.empty());
+ parPos.pit() = pit;
+ }
+
// redo insets
// FIXME: We should always use getFont(), see documentation of
// noFontChange() in Inset.h.
Font const bufferfont = buffer.params().getFont();
- MacroContext mc(buffer, par);
InsetList::const_iterator ii = par.insetList().begin();
InsetList::const_iterator iend = par.insetList().end();
for (; ii != iend; ++ii) {
- // the macro must come here, _before_ the metric call, because
- // the macro should see itself to detect recursions. To find out
- // whether the macro definition is a redefinition it will look
- // at the MacroData::redefinition_. So it doesn't get confused
- // by the already existing macro definition of itself in the
- // macro context.
- if (ii->inset->lyxCode() == MATHMACRO_CODE) {
- // get macro data
- MathMacroTemplate const & macroTemplate
- = static_cast<MathMacroTemplate const &>(*ii->inset);
-
- // valid?
- if (macroTemplate.validMacro()) {
- MacroData macro = macroTemplate.asMacroData();
-
- // redefinition?
- macro.setRedefinition(mc.has(macroTemplate.name()));
-
- // register macro (possibly overwrite the previous one of this paragraph)
- mc.insert(macroTemplate.name(), macro);
- }
+ // position already initialized?
+ if (!parPos.empty()) {
+ parPos.pos() = ii->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)
+ parPos.pos()++;
}
// do the metric calculation
- right_margin;
Font const & font = ii->inset->noFontChange() ?
bufferfont : getDisplayFont(pit, ii->pos);
+ MacroContext mc(buffer, parPos);
MetricsInfo mi(bv_, font.fontInfo(), w, mc);
ii->inset->metrics(mi, dim);
Dimension const old_dim = pm.insetDimension(ii->inset);
row.setDimension(dim);
int const max_row_width = max(dim_.wid, dim.wid);
computeRowMetrics(pit, row, max_row_width);
- pm.computeRowSignature(row, bparams);
first = end;
++row_index;
- pm.dim().wid = std::max(pm.dim().wid, dim.wid);
+ pm.dim().wid = max(pm.dim().wid, dim.wid);
pm.dim().des += dim.height();
} while (first < par.size());
row.setDimension(dim);
int const max_row_width = max(dim_.wid, dim.wid);
computeRowMetrics(pit, row, max_row_width);
- pm.computeRowSignature(row, bparams);
pm.dim().des += dim.height();
}
void TextMetrics::computeRowMetrics(pit_type const pit,
Row & row, int width) const
{
-
row.label_hfill = 0;
- row.hfill = 0;
row.separator = 0;
Buffer & buffer = bv_->buffer();
row.label_hfill = labelFill(pit, row) / double(nlh);
}
+ double hfill = 0;
// are there any hfills in the row?
- int const nh = numberOfHfills(par, row);
-
- if (nh) {
+ if (int const nh = numberOfHfills(par, row)) {
if (w > 0)
- row.hfill = w / nh;
+ hfill = w / double(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!
align = par.params().align();
// Display-style insets should always be on a centred row
- // The test on par.size() is to catch zero-size pars, which
- // would trigger the assert in Paragraph::getInset().
- //inset = par.size() ? par.getInset(row.pos()) : 0;
- if (row.pos() < par.size() && par.isInset(row.pos())) {
- switch(par.getInset(row.pos())->display()) {
+ if (Inset const * inset = par.getInset(row.pos())) {
+ switch (inset->display()) {
case Inset::AlignLeft:
align = LYX_ALIGN_BLOCK;
break;
row.x += row.label_hfill;
}
}
+
+ 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];
+ InsetList::const_iterator ii = par.insetList().begin();
+ InsetList::const_iterator iend = par.insetList().end();
+ for ( ; ii != iend; ++ii) {
+ if (ii->pos >= endpos || ii->pos < row.pos()
+ || ii->inset->lyxCode() != HFILL_CODE)
+ continue;
+ Dimension dim = row.dimension();
+ if (pm.hfillExpansion(row, ii->pos))
+ dim.wid = int(ii->pos >= body_pos ?
+ max(hfill, 5.0) : row.label_hfill);
+ else
+ dim.wid = 5;
+ // Cache the inset dimension.
+ bv_->coordCache().insets().add(ii->inset, dim);
+ pm.setInsetDimension(ii->inset, dim);
+ }
}
if (par.isLineSeparator(i - 1))
add -= singleWidth(pit, i - 1);
- add = std::max(add, label_end - x);
+ add = max(add, label_end - x);
thiswidth += add;
}
point = i + 1;
break;
}
+ Inset const * inset = 0;
// Break before...
if (i + 1 < end) {
- if (par.isInset(i + 1) && par.getInset(i + 1)->display()) {
+ if ((inset = par.getInset(i + 1)) && inset->display()) {
point = i + 1;
break;
}
// ...and after.
- if (par.isInset(i) && par.getInset(i)->display()) {
+ if ((inset = par.getInset(i)) && inset->display()) {
point = i + 1;
break;
}
}
- if (!par.isInset(i) || par.getInset(i)->isChar()) {
+ inset = par.getInset(i);
+ if (!inset || inset->isChar()) {
// some insets are line separators too
if (par.isLineSeparator(i)) {
// register breakpoint:
int const xo = origin_.x_;
x -= xo;
Paragraph const & par = text_->getPar(pit);
- ParagraphMetrics const & pm = par_metrics_[pit];
Bidi bidi;
bidi.computeTables(par, buffer, row);
tmpx -= singleWidth(pit, body_pos - 1);
}
- if (pm.hfillExpansion(row, c)) {
- tmpx += singleWidth(pit, c);
- if (c >= body_pos)
- tmpx += row.hfill;
- else
- tmpx += row.label_hfill;
- } else if (par.isSeparator(c)) {
- tmpx += singleWidth(pit, c);
- if (c >= body_pos)
+ tmpx += singleWidth(pit, c);
+ if (par.isSeparator(c) && c >= body_pos)
tmpx += row.separator;
- } else {
- tmpx += singleWidth(pit, c);
- }
++vc;
}
bool const rtl = lastrow ? text_->isRTL(buffer, par) : false;
if (lastrow &&
((rtl && left_side && vc == row.pos() && x < tmpx - 5) ||
- (!rtl && !left_side && vc == end && x > tmpx + 5)))
- c = end;
- else if (vc == row.pos()) {
+ (!rtl && !left_side && vc == end && x > tmpx + 5))) {
+ if (!par.isNewline(end - 1))
+ c = end;
+ } else if (vc == row.pos()) {
c = bidi.vis2log(vc);
if (bidi.level(c) % 2 == 1)
++c;
// do it and update its position.
redoParagraph(pit);
par_metrics_[pit].setPosition(last.second.position()
- + last.second.descent());
+ + last.second.descent() + par_metrics_[pit].ascent());
}
// do it and update its position.
redoParagraph(pit);
par_metrics_[pit].setPosition(first.second.position()
- - first.second.ascent());
+ - first.second.ascent() - par_metrics_[pit].descent());
}
// y is screen coordinate
pit_type TextMetrics::getPitNearY(int y)
{
BOOST_ASSERT(!text_->paragraphs().empty());
- LYXERR(Debug::DEBUG, BOOST_CURRENT_FUNCTION
- << ": y: " << y << " cache size: " << par_metrics_.size());
+ LYXERR(Debug::DEBUG, "y: " << y << " cache size: " << par_metrics_.size());
// look for highest numbered paragraph with y coordinate less than given y
- pit_type pit = 0;
+ pit_type pit = -1;
int yy = -1;
ParMetricsCache::const_iterator it = par_metrics_.begin();
ParMetricsCache::const_iterator et = par_metrics_.end();
ParagraphMetrics const & pm = it->second;
- // If we are off-screen (before the visible part)
- if (y < 0
- // and even before the first paragraph in the cache.
- && y < it->second.position() - int(pm.ascent())) {
- // and we are not at the first paragraph in the inset.
+ if (y < it->second.position() - int(pm.ascent())) {
+ // We are looking for a position that is before the first paragraph in
+ // the cache (which is in priciple off-screen, that is before the
+ // visible part.
if (it->first == 0)
+ // We are already at the first paragraph in the inset.
return 0;
- // then this is the paragraph we are looking for.
+ // OK, this is the paragraph we are looking for.
pit = it->first - 1;
- // rebreak it and update the CoordCache.
- redoParagraph(pit);
- par_metrics_[pit].setPosition(it->second.position() - pm.descent());
+ newParMetricsUp();
return pit;
}
ParagraphMetrics const & pm_last = par_metrics_[last->first];
- // If we are off-screen (after the visible part)
- if (y > bv_->workHeight()
- // and even after the first paragraph in the cache.
- && y >= last->second.position() + int(pm_last.descent())) {
+ if (y >= last->second.position() + int(pm_last.descent())) {
+ // We are looking for a position that is after the last paragraph in
+ // the cache (which is in priciple off-screen, that is before the
+ // visible part.
pit = last->first + 1;
- // and we are not at the last paragraph in the inset.
if (pit == int(text_->paragraphs().size()))
+ // We are already at the last paragraph in the inset.
return last->first;
- // then this is the paragraph we are looking for.
- // rebreak it and update the CoordCache.
- redoParagraph(pit);
- par_metrics_[pit].setPosition(last->second.position() + pm_last.ascent());
+ // OK, this is the paragraph we are looking for.
+ newParMetricsDown();
return pit;
}
for (; it != et; ++it) {
- LYXERR(Debug::DEBUG, BOOST_CURRENT_FUNCTION
- << " examining: pit: " << it->first
+ LYXERR(Debug::DEBUG, "examining: pit: " << it->first
<< " y: " << it->second.position());
ParagraphMetrics const & pm = par_metrics_[it->first];
}
}
- LYXERR(Debug::DEBUG, BOOST_CURRENT_FUNCTION
- << ": found best y: " << yy << " for pit: " << pit);
+ LYXERR(Debug::DEBUG, "found best y: " << yy << " for pit: " << pit);
return pit;
}
Inset * TextMetrics::editXY(Cursor & cur, int x, int y)
{
if (lyxerr.debugging(Debug::WORKAREA)) {
- lyxerr << "TextMetrics::editXY(cur, " << x << ", " << y << ")" << std::endl;
+ LYXERR0("TextMetrics::editXY(cur, " << x << ", " << y << ")");
cur.bv().coordCache().dump();
}
pit_type pit = getPitNearY(y);
ParagraphMetrics const & pm = par_metrics_[pit];
int yy = pm.position() - pm.ascent();
- LYXERR(Debug::DEBUG, BOOST_CURRENT_FUNCTION
- << ": x: " << x << " y: " << y << " pit: " << pit << " yy: " << yy);
+ LYXERR(Debug::DEBUG, "x: " << x << " y: " << y <<
+ " pit: " << pit << " yy: " << yy);
int r = 0;
BOOST_ASSERT(pm.rows().size());
Row const & row = pm.rows()[r];
- LYXERR(Debug::DEBUG, BOOST_CURRENT_FUNCTION
- << ": row " << r << " from pos: " << row.pos());
+ LYXERR(Debug::DEBUG, "row " << r << " from pos: " << row.pos());
bool bound = false;
int xx = x;
pos_type const pos = row.pos() + getColumnNearX(pit, row, xx, bound);
- LYXERR(Debug::DEBUG, BOOST_CURRENT_FUNCTION
- << ": setting cursor pit: " << pit << " pos: " << pos);
+ LYXERR(Debug::DEBUG, "setting cursor pit: " << pit << " pos: " << pos);
text_->setCursor(cur, pit, pos, true, bound);
// remember new position.
Paragraph const & par = text_->paragraphs()[pit];
ParagraphMetrics const & pm = par_metrics_[pit];
- LYXERR(Debug::DEBUG, BOOST_CURRENT_FUNCTION
- << ": x: " << x << " y: " << y << " pit: " << pit);
+ 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, BOOST_CURRENT_FUNCTION
- << ": examining inset " << inset);
+ LYXERR(Debug::DEBUG, "examining inset " << inset);
if (!bv_->coordCache().getInsets().has(inset)) {
- LYXERR(Debug::DEBUG, BOOST_CURRENT_FUNCTION
- << ": inset has no cached position");
+ LYXERR(Debug::DEBUG, "inset has no cached position");
return 0;
}
Dimension const & dim = pm.insetDimension(inset);
Point p = bv_->coordCache().getInsets().xy(inset);
- LYXERR(Debug::DEBUG, BOOST_CURRENT_FUNCTION
- << ": xo: " << p.x_ << "..." << p.x_ + dim.wid
+ 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, BOOST_CURRENT_FUNCTION
- << ": Hit inset: " << inset);
+ LYXERR(Debug::DEBUG, "Hit inset: " << inset);
return inset;
}
}
- LYXERR(Debug::DEBUG, BOOST_CURRENT_FUNCTION << ": No inset hit. ");
+ LYXERR(Debug::DEBUG, "No inset hit. ");
return 0;
}
x += pm.singleWidth(pos, font);
- if (pm.hfillExpansion(row, pos))
- x += (pos >= body_pos) ? row.hfill : row.label_hfill;
- else if (par.isSeparator(pos) && pos >= body_pos)
+ if (par.isSeparator(pos) && pos >= body_pos)
x += row.separator;
}
int TextMetrics::cursorY(CursorSlice const & sl, bool boundary) const
{
- //lyxerr << "TextMetrics::cursorY: boundary: " << boundary << std::endl;
+ //lyxerr << "TextMetrics::cursorY: boundary: " << boundary << endl;
ParagraphMetrics const & pm = par_metrics_[sl.pit()];
if (pm.rows().empty())
return 0;
text_->deleteWordForward(cur);
else
cap::cutSelection(cur, true, false);
- checkBufferStructure(cur.buffer(), cur);
+ cur.checkBufferStructure();
}
}
int l_margin = 0;
if (text_->isMainText(buffer))
- l_margin += changebarMargin();
+ l_margin += bv_->leftMargin();
l_margin += theFontMetrics(buffer.params().getFont()).signedWidth(
tclass.leftmargin());
if (pars[newpar].layout()->isEnvironment()) {
l_margin = leftMargin(max_width, newpar);
}
+ //FIXME Should this check for emptyLayout() as well?
if (par.layout() == tclass.defaultLayout()) {
if (pars[newpar].params().noindent())
parindent.erase();
|| layout->labeltype == LABEL_TOP_ENVIRONMENT
|| layout->labeltype == LABEL_CENTERED_TOP_ENVIRONMENT
|| (layout->labeltype == LABEL_STATIC
- && layout->latextype == LATEX_ENVIRONMENT
+ && layout->latextype == LATEX_ENVIRONMENT
&& !isFirstInSequence(pit, pars)))
&& align == LYX_ALIGN_BLOCK
&& !par.params().noindent()
&& !(!par.empty()
&& par.isInset(pos)
&& par.getInset(pos)->display())
- && (par.layout() != tclass.defaultLayout()
+ && (par.layout() != tclass.defaultLayout() //should this check emptyLayout()?
|| buffer.params().paragraph_separation ==
BufferParams::PARSEP_INDENT))
{
}
-// only used for inset right now. should also be used for main text
void TextMetrics::draw(PainterInfo & pi, int x, int y) const
{
if (par_metrics_.empty())
void TextMetrics::drawParagraph(PainterInfo & pi, pit_type pit, int x, int y) const
{
-// lyxerr << " paintPar: pit: " << pit << " at y: " << y << endl;
- int const ww = bv_->workHeight();
-
+ BufferParams const & bparams = bv_->buffer().params();
ParagraphMetrics const & pm = par_metrics_[pit];
if (pm.rows().empty())
return;
- RowList::const_iterator const rb = pm.rows().begin();
- RowList::const_iterator const re = pm.rows().end();
-
Bidi bidi;
-
bool const original_drawing_state = pi.pain.isDrawingEnabled();
+ int const ww = bv_->workHeight();
+ size_t const nrows = pm.rows().size();
- size_t nrows = pm.rows().size();
for (size_t i = 0; i != nrows; ++i) {
+
Row const & row = pm.rows()[i];
if (i)
y += row.ascent();
bool const inside = (y + row.descent() >= 0
&& y - row.ascent() < ww);
- // it is not needed to draw on screen if we are not inside.
+ // 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, bidi, x, y);
// Row signature; has row changed since last paint?
+ row.setCrc(pm.computeRowSignature(row, bparams));
bool row_has_changed = row.changed();
- bool row_selection = row.sel_beg != -1 && row.sel_end != -1;
-
- if (!row_selection && !pi.full_repaint && !row_has_changed) {
- // Paint the only the insets if the text itself is
+ // 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();
y += row.descent();
continue;
}
- // Paint the row if a full repaint has been requested or it has
- // changed.
- // Clear background of this row
- // (if paragraph background was not cleared)
- if (row_selection || (!pi.full_repaint && row_has_changed)) {
+ // Clear background of this row if paragraph background was not
+ // already cleared because of a full repaint.
+ if (!pi.full_repaint && row_has_changed) {
pi.pain.fillRectangle(x, y - row.ascent(),
width(), row.height(), pi.background_color);
}
+
+ bool row_selection = row.sel_beg != -1 && row.sel_end != -1;
if (row_selection) {
DocIterator beg = bv_->cursor().selectionBegin();
DocIterator end = bv_->cursor().selectionEnd();
// Instrumentation for testing row cache (see also
// 12 lines lower):
- if (lyxerr.debugging(Debug::PAINTING)) {
- if (text_->isMainText(bv_->buffer()))
- LYXERR(Debug::PAINTING, "\n{" << inside <<
- pi.full_repaint << row_has_changed << "}");
- else
- LYXERR(Debug::PAINTING, "[" << inside <<
- pi.full_repaint << row_has_changed << "]");
+ if (lyxerr.debugging(Debug::PAINTING) && inside
+ && (row_selection || pi.full_repaint || row_has_changed)) {
+ string const foreword = text_->isMainText(bv_->buffer()) ?
+ "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);
}
// Backup full_repaint status and force full repaint
// Re-enable screen drawing for future use of the painter.
pi.pain.setDrawingEnabled(original_drawing_state);
- //LYXERR(Debug::PAINTING) << "." << endl;
+ //LYXERR(Debug::PAINTING, ".");
}
projects / lyx.git / blobdiff