public:
//
- flexible_const_iterator operator++() {
+ flexible_const_iterator & operator++() {
if (pile_.empty())
++cit_;
else
if (!at_end && !row.flushed())
row.back().rtrim();
// boundary exists when there was no space at the end of row
- row.right_boundary(!at_end && row.back().endpos == row.endpos());
+ row.end_boundary(!at_end && row.back().endpos == row.endpos());
// make sure that the RTL elements are in reverse ordering
row.reverseRTL();
}
rb.push_back(elt);
rb.finalizeLast();
if (rb.width() > width) {
- LATTEST(tail.empty());
+ // Keep the tail for later; this ought to be rare, but play safe.
+ if (!tail.empty())
+ fcit.put(tail);
// if the row is too large, try to cut at last separator.
tail = rb.shortenIfNeeded(width, next_width);
}
|| inset->lyxCode() == SEPARATOR_CODE))
pos = row.back().pos;
else
- boundary = row.right_boundary();
+ boundary = row.end_boundary();
}
x += xo - offset;