}
-pos_type Row::Element::x2pos(int &x) const
+pos_type Row::Element::x2pos(int &x, bool const select) const
{
//lyxerr << "x2pos: x=" << x << " w=" << width() << " " << *this;
size_t i = 0;
x = isRTL() ? int(full_width()) : 0;
break;
case INSET:
- case SPACE:
+ case SPACE: {
+ double const boundary = select ? (full_width() + 1) / 2 : full_width();
// those elements contain only one position. Round to
// the closest side.
- if (x > full_width()) {
+ if (x > boundary) {
x = int(full_width());
i = !isRTL();
} else {
x = 0;
i = isRTL();
}
-
+ }
}
//lyxerr << "=> p=" << pos + i << " x=" << x << endl;
return pos + i;
-
}
sel_beg(-1), sel_end(-1),
begin_margin_sel(false), end_margin_sel(false),
changed_(false), crc_(0),
- pit_(0), pos_(0), end_(0), right_boundary_(false)
+ pit_(0), pos_(0), end_(0),
+ right_boundary_(false), flushed_(false), rtl_(false)
{}
int exp_amount = 0;
for (Row::Element const & e : elements_)
exp_amount += e.expansionAmount();
+ if (!exp_amount)
+ return false;
// extra length per expander per em
double extra_per_em = double(w) / exp_amount;
if (extra_per_em > MAX_SPACE_STRETCH)
}
-bool Row::shortenIfNeeded(pos_type const keep, int const w)
+bool Row::shortenIfNeeded(pos_type const keep, int const w, int const next_width)
{
if (empty() || width() <= w)
return false;
* next row. Thus breaking does not help.
*/
if (wid_brk + cit_brk->dim.wid < w
- && dim_.wid - (wid_brk + brk.dim.wid) >= w) {
+ && dim_.wid - (wid_brk + brk.dim.wid) >= next_width) {
break;
}
end_ = brk.endpos;
// If the paragraph itself is RTL, reverse everything
if (rtl_par)
reverse(elements_.begin(), elements_.end());
+ rtl_ = rtl_par;
}
+Row::const_iterator const
+Row::findElement(pos_type const pos, bool const boundary, double & x) const
+{
+ /**
+ * When boundary is true, position i is in the row element (pos, endpos)
+ * if
+ * pos < i <= endpos
+ * whereas, when boundary is false, the test is
+ * pos <= i < endpos
+ * The correction below allows to handle both cases.
+ */
+ int const boundary_corr = (boundary && pos) ? -1 : 0;
+
+ x = left_margin;
+
+ /** Early return in trivial cases
+ * 1) the row is empty
+ * 2) the position is the left-most position of the row; there
+ * is a quirk here however: if the first element is virtual
+ * (end-of-par marker for example), then we have to look
+ * closer
+ */
+ if (empty()
+ || (pos == begin()->left_pos() && !boundary
+ && !begin()->isVirtual()))
+ return begin();
+
+ Row::const_iterator cit = begin();
+ for ( ; cit != end() ; ++cit) {
+ /** Look whether the cursor is inside the element's
+ * span. Note that it is necessary to take the
+ * boundary into account, and to accept virtual
+ * elements, which have pos == endpos.
+ */
+ if (pos + boundary_corr >= cit->pos
+ && (pos + boundary_corr < cit->endpos || cit->isVirtual())) {
+ x += cit->pos2x(pos);
+ break;
+ }
+ x += cit->full_width();
+ }
+
+ if (cit == end())
+ --cit;
+
+ return cit;
+}
+
+
} // namespace lyx