#include <algorithm>
#include <ostream>
+#include <boost/next_prior.hpp>
+
using namespace std;
namespace lyx {
double Row::Element::pos2x(pos_type const i) const
{
+ // This can happen with inline completion when clicking on the
+ // row after the completion.
+ if (i < pos || i > endpos)
+ return 0;
+
bool const rtl = font.isVisibleRightToLeft();
- // handle first the two bounds of the element
- if ((!rtl && pos >= i) || (rtl && endpos <= i))
- return 0;
- if ((!rtl && endpos <= i) || (rtl && pos >= i))
- return width();
+ double w = 0;
+ //handle first the two bounds of the element
+ if (i == endpos && !(inset && inset->lyxCode() == SEPARATOR_CODE))
+ w = rtl ? 0 : width();
+ else if (i == pos || type != STRING)
+ w = rtl ? width() : 0;
+ else {
+ FontMetrics const & fm = theFontMetrics(font);
+ w = fm.pos2x(str, i - pos, font.isVisibleRightToLeft());
+ }
- FontMetrics const & fm = theFontMetrics(font);
- // FIXME Avoid caching of metrics there?
- int const w = fm.width(str.substr(0, i - pos));
- if (rtl)
- return width() - w;
- else
- return w;
+ return w;
}
-pos_type Row::Element::x2pos(double &x, bool const low) const
+pos_type Row::Element::x2pos(double &x) const
{
//lyxerr << "x2pos: x=" << x << " w=" << width() << " " << *this;
- // if element is rtl, flip x value
bool const rtl = font.isVisibleRightToLeft();
- double x2 = rtl ? (width() - x) : x;
-
- FontMetrics const & fm = theFontMetrics(font);
- double last_w = 0;
- double w = 0;
size_t i = 0;
- // non-STRING element only contain one position
- if (type != STRING) {
- w = width();
- } else {
- // FIXME: implement dichotomy search?
- for ( ; i < str.size() ; ++i) {
- last_w = w;
- w = fm.width(str.substr(0, i + 1));
- if (w > x2)
- break;
- }
- // if (i == str.size())
- // lyxerr << " NOT FOUND ";
- }
- if (i == str.size())
- x2 = w;
- // round to the closest side
- else if (!low && (x2 - last_w > w - x2)) {
- x2 = w;
- ++i;
- } else
- x2 = last_w;
-
- // is element is rtl, flip values
- if (rtl) {
- x = width() - x2;
- } else {
- x = x2;
+ switch (type) {
+ case STRING: {
+ FontMetrics const & fm = theFontMetrics(font);
+ // FIXME: is it really necessary for x to be a double?
+ int xx = int(x);
+ i = fm.x2pos(str, xx, rtl);
+ x = xx;
+ break;
}
+ case VIRTUAL:
+ // those elements are actually empty (but they have a width)
+ i = 0;
+ x = rtl ? width() : 0;
+ break;
+ case SEPARATOR:
+ case INSET:
+ case SPACE:
+ // those elements contain only one position. Round to
+ // the closest side.
+ if (x > width()) {
+ x = width();
+ i = !rtl;
+ } else {
+ x = 0;
+ i = rtl;
+ }
- //lyxerr << "=> p=" << i << " x=" << x << endl;
+ }
+ //lyxerr << "=> p=" << pos + i << " x=" << x << endl;
return pos + i;
+
+}
+
+
+bool Row::Element::breakAt(double w)
+{
+ if (type != STRING || width() <= w)
+ return false;
+
+ bool const rtl = font.isVisibleRightToLeft();
+ if (rtl)
+ w = width() - w;
+ pos_type new_pos = x2pos(w);
+ if (new_pos == pos)
+ return false;
+ str = str.substr(0, new_pos - pos);
+ if (rtl)
+ dim.wid -= int(w);
+ else
+ dim.wid = int(w);
+ endpos = new_pos;
+ return true;
+}
+
+
+pos_type Row::Element::left_pos() const
+{
+ return font.isVisibleRightToLeft() ? endpos : pos;
+}
+
+
+pos_type Row::Element::right_pos() const
+{
+ return font.isVisibleRightToLeft() ? pos : endpos;
}
switch (e.type) {
case Row::STRING:
- os << "STRING: `" << to_utf8(e.str) << "' " << e.dim.wid;
+ os << "STRING: `" << to_utf8(e.str) << "', ";
break;
case Row::VIRTUAL:
- os << "VIRTUAL: `" << to_utf8(e.str) << "'";
+ os << "VIRTUAL: `" << to_utf8(e.str) << "', ";
break;
case Row::INSET:
- os << "INSET: " << to_utf8(e.inset->layoutName());
+ os << "INSET: " << to_utf8(e.inset->layoutName()) << ", ";
break;
case Row::SEPARATOR:
- os << "SEPARATOR: " << e.dim.wid << "+" << e.extra;
+ os << "SEPARATOR: extra=" << e.extra << ", ";
break;
case Row::SPACE:
- os << "SPACE: " << e.dim.wid;
+ os << "SPACE: ";
break;
}
+ os << "width=" << e.width();
return os;
}
<< " ascent: " << row.dim_.asc
<< " descent: " << row.dim_.des
<< " separator: " << row.separator
- << " label_hfill : " << row.label_hfill << "\n";
+ << " label_hfill: " << row.label_hfill
+ << " row_boundary: " << row.right_boundary() << "\n";
double x = row.x;
Row::Elements::const_iterator it = row.elements_.begin();
for ( ; it != row.elements_.end() ; ++it) {
Element e(STRING, pos, f, ch);
elements_.push_back(e);
}
- //lyxerr << "FONT " <<back().font.language() << endl;
back().str += c;
back().endpos = pos + 1;
}
finalizeLast();
Element e(VIRTUAL, pos, f, ch);
e.str = s;
- // A completion has no size
+ e.dim.wid = theFontMetrics(f).width(s);
+ dim_.wid += e.dim.wid;
e.endpos = pos;
elements_.push_back(e);
finalizeLast();
}
-void Row::shorten_if_needed(pos_type const keep, int const w)
+void Row::shortenIfNeeded(pos_type const keep, int const w)
{
- if (empty() || width() < w)
+ if (empty() || width() <= w)
return;
/** First, we try to remove elements one by one from the end
- * until a separator is found.
+ * until a separator is found. cit points to the first element
+ * we want to remove from the row.
*/
- int i = elements_.size();
+ Elements::iterator const beg = elements_.begin();
+ Elements::iterator const end = elements_.end();
+ Elements::iterator cit = end;
+ Elements::iterator first_below = end;
int new_end = end_;
int new_wid = dim_.wid;
- if (i > 0 && elements_[i - 1].type == SEPARATOR && new_end > keep) {
- --i;
- new_end = elements_[i].pos;
- new_wid -= elements_[i].dim.wid;
+ // if the row ends with a separator, skip it.
+ if (cit != beg && boost::prior(cit)->type == SEPARATOR && new_end > keep) {
+ --cit;
+ new_end = cit->pos;
+ new_wid -= cit->dim.wid;
}
- while (i > 0 && elements_[i - 1].type != SEPARATOR && new_end > keep) {
- --i;
- new_end = elements_[i].pos;
- new_wid -= elements_[i].dim.wid;
+ // Search for a separator where the row can be broken.
+ while (cit != beg && boost::prior(cit)->type != SEPARATOR && new_end > keep) {
+ --cit;
+ new_end = cit->pos;
+ new_wid -= cit->dim.wid;
+ if (new_wid < w && first_below == end)
+ first_below = cit;
}
- if (i == 0) {
- /* If we are here, it means that we have not found a
- * separator to shorten the row. There is one case
- * where we can do something: when we have one big
- * string, maybe with a paragraph marker after it.
- */
- Element & front = elements_.front();
- if (!(front.type == STRING
- && (elements_.size() == 1
- || (elements_.size() == 2
- && back().type == VIRTUAL))))
- return;
-
- // If this is a string element, we can try to split it.
- if (front.type != STRING)
- return;
- double xstr = w - x;
- // If there is a paragraph marker, it should be taken in account
- if (elements_.size() == 2)
- xstr -= back().width();
- pos_type new_pos = front.x2pos(xstr, true);
- front.str = front.str.substr(0, new_pos - pos_);
- front.dim.wid = xstr;
- front.endpos = new_pos;
- end_ = new_pos;
- dim_.wid = x + xstr;
- // If there is a paragraph marker, it should be removed.
- if (elements_.size() == 2)
- elements_.pop_back();
+
+ if (cit != beg) {
+ // We have found a suitable separator. This is the
+ // common case.
+ end_ = new_end;
+ dim_.wid = new_wid;
+ elements_.erase(cit, end);
return;
}
- end_ = new_end;
- dim_.wid = new_wid;
- elements_.erase(elements_.begin() + i, elements_.end());
+
+ /* If we are here, it means that we have not found a separator
+ * to shorten the row. There is one case where we can do
+ * something: when we have one big string, maybe with some
+ * other things after it.
+ */
+ double max_w = w - x;
+ if (first_below->breakAt(max_w)) {
+ end_ = first_below->endpos;
+ dim_.wid = int(x + first_below->width());
+ // If there are other elements, they should be removed.
+ elements_.erase(boost::next(first_below), end);
+ } else if (first_below->pos > pos_) {
+ end_ = first_below->pos;
+ dim_.wid = new_wid;
+ // Remove all elements from first_below.
+ elements_.erase(first_below, end);
+ }
}
projects / lyx.git / blobdiff