if (i < pos || i > endpos)
return 0;
- bool const rtl = font.isVisibleRightToLeft();
-
double w = 0;
//handle first the two bounds of the element
if (i == endpos && type != VIRTUAL
&& !(inset && inset->lyxCode() == SEPARATOR_CODE))
- w = rtl ? 0 : full_width();
+ w = isRTL() ? 0 : full_width();
else if (i == pos || type != STRING)
- w = rtl ? full_width() : 0;
+ w = isRTL() ? full_width() : 0;
else {
FontMetrics const & fm = theFontMetrics(font);
- w = fm.pos2x(str, i - pos, font.isVisibleRightToLeft(), extra);
+ w = fm.pos2x(str, i - pos, isRTL(), extra);
}
return w;
pos_type Row::Element::x2pos(int &x) const
{
//lyxerr << "x2pos: x=" << x << " w=" << width() << " " << *this;
- bool const rtl = font.isVisibleRightToLeft();
size_t i = 0;
switch (type) {
case STRING: {
FontMetrics const & fm = theFontMetrics(font);
- i = fm.x2pos(str, x, rtl, extra);
+ i = fm.x2pos(str, x, isRTL(), extra);
break;
}
case VIRTUAL:
// those elements are actually empty (but they have a width)
i = 0;
- x = rtl ? int(full_width()) : 0;
+ x = isRTL() ? int(full_width()) : 0;
break;
- case SEPARATOR:
case INSET:
case SPACE:
// those elements contain only one position. Round to
// the closest side.
if (x > full_width()) {
x = int(full_width());
- i = !rtl;
+ i = !isRTL();
} else {
x = 0;
- i = rtl;
+ i = isRTL();
}
}
if (type != STRING || dim.wid <= w)
return false;
- bool const rtl = font.isVisibleRightToLeft();
FontMetrics const & fm = theFontMetrics(font);
int x = w;
- if(fm.breakAt(str, x, rtl, force)) {
+ if(fm.breakAt(str, x, isRTL(), force)) {
dim.wid = x;
endpos = pos + str.length();
//lyxerr << "breakAt(" << w << ") Row element Broken at " << x << "(w(str)=" << fm.width(str) << "): e=" << *this << endl;
pos_type Row::Element::left_pos() const
{
- return font.isVisibleRightToLeft() ? endpos : pos;
+ return isRTL() ? endpos : pos;
}
pos_type Row::Element::right_pos() const
{
- return font.isVisibleRightToLeft() ? pos : endpos;
+ return isRTL() ? pos : endpos;
}
ostream & operator<<(ostream & os, Row::Element const & e)
{
- if (e.font.isVisibleRightToLeft())
+ if (e.isRTL())
os << e.endpos << "<<" << e.pos << " ";
else
os << e.pos << ">>" << e.endpos << " ";
switch (e.type) {
case Row::STRING:
- os << "STRING: `" << to_utf8(e.str) << "', ";
+ os << "STRING: `" << to_utf8(e.str) << "' ("
+ << e.countSeparators() << " sep.), ";
break;
case Row::VIRTUAL:
os << "VIRTUAL: `" << to_utf8(e.str) << "', ";
case Row::INSET:
os << "INSET: " << to_utf8(e.inset->layoutName()) << ", ";
break;
- case Row::SEPARATOR:
- os << "SEPARATOR: extra=" << e.extra << ", ";
- break;
case Row::SPACE:
os << "SPACE: ";
break;
Element e(STRING, pos, f, ch);
elements_.push_back(e);
}
- dim_.wid -= back().dim.wid;
- back().str += c;
- back().endpos = pos + 1;
- back().dim.wid = theFontMetrics(back().font).width(back().str);
- dim_.wid += back().dim.wid;
+ if (back().str.length() % 30 == 0) {
+ dim_.wid -= back().dim.wid;
+ back().str += c;
+ back().endpos = pos + 1;
+ back().dim.wid = theFontMetrics(back().font).width(back().str);
+ dim_.wid += back().dim.wid;
+ } else {
+ back().str += c;
+ back().endpos = pos + 1;
+ }
}
}
-void Row::addSeparator(pos_type const pos, char_type const c,
- Font const & f, Change const & ch)
-{
- finalizeLast();
- Element e(SEPARATOR, pos, f, ch);
- e.str += c;
- e.dim.wid = theFontMetrics(f).width(c);
- elements_.push_back(e);
- dim_.wid += e.dim.wid;
-}
-
-
void Row::addSpace(pos_type const pos, int const width,
Font const & f, Change const & ch)
{
{
if (empty() || width() <= w)
return;
+
Elements::iterator const beg = elements_.begin();
Elements::iterator const end = elements_.end();
int wid = left_margin;
+ // Search for the first element that goes beyond right margin
Elements::iterator cit = beg;
for ( ; cit != end ; ++cit) {
- if (cit->endpos >= keep && wid + cit->dim.wid > w)
+ if (wid + cit->dim.wid > w)
break;
wid += cit->dim.wid;
}
return;
}
+ // Iterate backwards over breakable elements and try to break them
+ Elements::iterator cit_brk = cit;
+ int wid_brk = wid + cit_brk->dim.wid;
+ ++cit_brk;
+ while (cit_brk != beg) {
+ --cit_brk;
+ // make a copy of the element to work on it.
+ Element brk = *cit_brk;
+ wid_brk -= brk.dim.wid;
+ if (brk.countSeparators() == 0 || brk.pos < keep)
+ continue;
+ /* We have found a suitable separable element. This is the common case.
+ * Try to break it cleanly (at word boundary) at a length that is both
+ * - less than the available space on the row
+ * - shorter than the natural width of the element, in order to enforce
+ * break-up.
+ */
+ if (brk.breakAt(min(w - wid_brk, brk.dim.wid - 2), false)) {
+ /* if this element originally did not cause a row overflow
+ * in itself, and the remainder of the row would still be
+ * too large after breaking, then we will have issues in
+ * next row. Thus breaking does not help.
+ */
+ if (wid_brk + cit_brk->dim.wid < w
+ && dim_.wid - (wid_brk + brk.dim.wid) >= w) {
+ break;
+ }
+ end_ = brk.endpos;
+ /* after breakAt, there may be spaces at the end of the
+ * string, but they are not counted in the string length
+ * (QTextLayout feature, actually). We remove them, but do
+ * not change the endo of the row, since the spaces at row
+ * break are invisible.
+ */
+ brk.str = rtrim(brk.str);
+ brk.endpos = brk.pos + brk.str.length();
+ *cit_brk = brk;
+ dim_.wid = wid_brk + brk.dim.wid;
+ // If there are other elements, they should be removed.
+ elements_.erase(cit_brk + 1, end);
+ return;
+ }
+ }
+
if (cit != beg && cit->type == VIRTUAL) {
// It is not possible to separate a virtual element from the
// previous one.
wid -= cit->dim.wid;
}
- // Try to break this row cleanly (at word boundary)
- if (cit->breakAt(w - wid, false)) {
- end_ = cit->endpos;
- // after breakAt, there may be spaces at the end of the
- // string, but they are not counted in the string length
- // (qtextlayout feature, actually). We remove them, but do not
- // change the endo of the row, since the spaces at row break
- // are invisible.
- cit->str = rtrim(cit->str);
- cit->endpos = cit->pos + cit->str.length();
- dim_.wid = wid + cit->dim.wid;
- // If there are other elements, they should be removed.
- elements_.erase(next(cit, 1), end);
- return;
- }
-
if (cit != beg) {
- // There is no separator, but several elements have been
- // added. We can cut right here.
+ // There is no usable separator, but several elements have
+ // been added. We can cut right here.
end_ = cit->pos;
dim_.wid = wid;
elements_.erase(cit, end);
pos_type const end = elements_.size();
while (i < end) {
// gather a sequence of elements with the same direction
- bool const rtl = elements_[i].font.isVisibleRightToLeft();
+ bool const rtl = elements_[i].isRTL();
pos_type j = i;
- while (j < end && elements_[j].font.isVisibleRightToLeft() == rtl)
+ while (j < end && elements_[j].isRTL() == rtl)
++j;
// if the direction is not the same as the paragraph
// direction, the sequence has to be reverted.