* Licence details can be found in the file COPYING.
*
* \author Asger Alstrup
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
* \author Jean-Marc Lasgouttes
* \author John Levon
- * \author André Pönitz
+ * \author André Pönitz
* \author Dekel Tsur
- * \author Jürgen Vigna
+ * \author Jürgen Vigna
* \author Abdelrazak Younes
*
* Full author contact details are available in file CREDITS.
bool TextMetrics::metrics(MetricsInfo & mi, Dimension & dim, int min_width)
{
- LASSERT(mi.base.textwidth, /**/);
+ LASSERT(mi.base.textwidth > 0, /**/);
max_width_ = mi.base.textwidth;
// backup old dimension.
Dimension const old_dim = dim_;
if (pos == 0)
return false;
- Paragraph const & par = text_->getPar(pit);
+ Font const & left_font = displayFont(pit, pos - 1);
- bool left = displayFont(pit, pos - 1).isVisibleRightToLeft();
- bool right;
- if (pos == par.size())
- right = par.isRTL(bv_->buffer().params());
- else
- right = displayFont(pit, pos).isVisibleRightToLeft();
- return left != right;
+ return isRTLBoundary(pit, pos, left_font);
}
LYXERR(Debug::INFO, "MacroContext not initialised!"
<< " Going through the buffer again and hope"
<< " the context is better then.");
- updateLabels(bv_->buffer());
+ bv_->buffer().updateLabels();
parPos = text_->macrocontextPosition();
LASSERT(!parPos.empty(), /**/);
parPos.pit() = pit;
InsetList::const_iterator ii = par.insetList().begin();
InsetList::const_iterator iend = par.insetList().end();
for ( ; ii != iend; ++ii) {
- Dimension const & dim = pm.insetDimension(ii->inset);
if (ii->pos >= first && ii->pos < end) {
+ Dimension const & dim = pm.insetDimension(ii->inset);
maxasc = max(maxasc, dim.ascent());
maxdesc = max(maxdesc, dim.descent());
}
// y is screen coordinate
pit_type TextMetrics::getPitNearY(int y)
{
- LASSERT(!text_->paragraphs().empty(), /**/);
+ LASSERT(!text_->paragraphs().empty(), return -1);
+ LASSERT(!par_metrics_.empty(), return -1);
LYXERR(Debug::DEBUG, "y: " << y << " cache size: " << par_metrics_.size());
// look for highest numbered paragraph with y coordinate less than given y
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
+ // the cache (which is in priciple off-screen), that is before the
// visible part.
pit = last->first + 1;
if (pit == int(text_->paragraphs().size()))
}
-Row const & TextMetrics::getRowNearY(int y, pit_type pit) const
+Row const & TextMetrics::getPitAndRowNearY(int y, pit_type & pit,
+ bool assert_in_view, bool up)
{
ParagraphMetrics const & pm = par_metrics_[pit];
for (; rit != rlast; yy += rit->height(), ++rit)
if (yy + rit->height() > y)
break;
+
+ if (assert_in_view && yy + rit->height() != y) {
+ if (!up) {
+ if (rit != pm.rows().begin())
+ --rit;
+ else if (pit != 0) {
+ --pit;
+ newParMetricsUp();
+ ParagraphMetrics const & pm2 = par_metrics_[pit];
+ rit = pm2.rows().end();
+ --rit;
+ }
+ } else {
+ if (rit != rlast)
+ ++rit;
+ else if (pit != int(par_metrics_.size())) {
+ ++pit;
+ newParMetricsDown();
+ ParagraphMetrics const & pm2 = par_metrics_[pit];
+ rit = pm2.rows().begin();
+ }
+ }
+ }
return *rit;
}
// x,y are absolute screen coordinates
// sets cursor recursively descending into nested editable insets
-Inset * TextMetrics::editXY(Cursor & cur, int x, int y)
+Inset * TextMetrics::editXY(Cursor & cur, int x, int y,
+ bool assert_in_view, bool up)
{
if (lyxerr.debugging(Debug::WORKAREA)) {
LYXERR0("TextMetrics::editXY(cur, " << x << ", " << y << ")");
cur.bv().coordCache().dump();
}
pit_type pit = getPitNearY(y);
- LASSERT(pit != -1, /**/);
+ LASSERT(pit != -1, return 0);
- Row const & row = getRowNearY(y, pit);
+ Row const & row = getPitAndRowNearY(y, pit, assert_in_view, up);
bool bound = false;
int xx = x; // is modified by getColumnNearX
}
ParagraphList const & pars = text_->paragraphs();
- Inset const * insetBefore = pos? pars[pit].getInset(pos - 1): 0;
+ Inset const * insetBefore = pos ? pars[pit].getInset(pos - 1) : 0;
//Inset * insetBehind = pars[pit].getInset(pos);
// This should be just before or just behind the
{
LASSERT(text_ == cur.text(), /**/);
pit_type pit = getPitNearY(y);
+ LASSERT(pit != -1, return);
ParagraphMetrics const & pm = par_metrics_[pit];
Inset * TextMetrics::checkInsetHit(int x, int y)
{
pit_type pit = getPitNearY(y);
- LASSERT(pit != -1, /**/);
+ LASSERT(pit != -1, return 0);
Paragraph const & par = text_->paragraphs()[pit];
ParagraphMetrics const & pm = par_metrics_[pit];
text_->cursorForward(cur);
} else {
cur.resetAnchor();
- cur.selection() = true; // to avoid deletion
+ cur.setSelection(true); // to avoid deletion
cursorEnd(cur);
cur.setSelection();
// What is this test for ??? (JMarc)
case MARGIN_FIRST_DYNAMIC:
if (layout.labeltype == LABEL_MANUAL) {
- if (pos >= par.beginOfBody()) {
+ // 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);
- } else {
+ else
l_margin += labelfont_metrics.signedWidth(layout.labelindent);
- }
} else if (pos != 0
// Special case to fix problems with
// theorems (JMarc)
// whether this row is the first or last and update the margins.
if (row.selection()) {
if (row.sel_beg == 0)
- row.left_margin_sel = sel_beg.pit() < pit;
+ row.begin_margin_sel = sel_beg.pit() < pit;
if (row.sel_end == sel_end_par.lastpos())
- row.right_margin_sel = sel_end.pit() > pit;
+ row.end_margin_sel = sel_end.pit() > pit;
}
// Row signature; has row changed since last paint?
cur.boundary(begin_boundary);
int x1 = cursorX(beg.top(), begin_boundary);
int x2 = cursorX(end.top(), end_boundary);
- int y1 = bv_->getPos(cur, cur.boundary()).y_ - row.ascent();
- int y2 = y1 + row.height();
+ int const y1 = bv_->getPos(cur, cur.boundary()).y_ - row.ascent();
+ int const y2 = y1 + row.height();
+
+ int const rm = text_->isMainText(buffer) ? bv_->rightMargin() : 0;
+ int const lm = text_->isMainText(buffer) ? bv_->leftMargin() : 0;
// draw the margins
- if (row.left_margin_sel) {
+ if (row.begin_margin_sel) {
if (text_->isRTL(buffer, beg.paragraph())) {
- int const w = width() - bv_->leftMargin() - x1;
- pi.pain.fillRectangle(x + x1, y1, w, y2 - y1, Color_selection);
+ pi.pain.fillRectangle(x + x1, y1, width() - rm - x1, y2 - y1,
+ Color_selection);
} else {
- int const rm = bv_->rightMargin();
- pi.pain.fillRectangle(rm, y1, x1 - rm, y2 - y1, Color_selection);
+ pi.pain.fillRectangle(x + lm, y1, x1 - lm, y2 - y1,
+ Color_selection);
}
}
- if (row.right_margin_sel) {
+ if (row.end_margin_sel) {
if (text_->isRTL(buffer, beg.paragraph())) {
- int rm = bv_->rightMargin();
- pi.pain.fillRectangle(x + rm, y1, x2 - rm, y2 - y1, Color_selection);
+ pi.pain.fillRectangle(x + lm, y1, x2 - lm, y2 - y1,
+ Color_selection);
} else {
- int lm = bv_->leftMargin();
- pi.pain.fillRectangle(x + x2, y1, width() - lm - x2, y2 - y1, Color_selection);
+ pi.pain.fillRectangle(x + x2, y1, width() - rm - x2, y2 - y1,
+ Color_selection);
}
}
// descend into insets and which does not go into the
// next line. Compare the logic with the original cursorForward
- // if left of boundary -> just jump to right side
- // but for RTL boundaries don't, because: abc|DDEEFFghi -> abcDDEEF|Fghi
+ // if left of boundary -> just jump to right side, but
+ // for RTL boundaries don't, because: abc|DDEEFFghi -> abcDDEEF|Fghi
if (cur.boundary()) {
cur.boundary(false);
} else if (isRTLBoundary(cur.pit(), cur.pos() + 1)) {
- // in front of RTL boundary -> Stay on this side of the boundary because:
- // ab|cDDEEFFghi -> abc|DDEEFFghi
+ // in front of RTL boundary -> Stay on this side of the boundary
+ // because: ab|cDDEEFFghi -> abc|DDEEFFghi
++cur.pos();
cur.boundary(true);
drawNow = true;