#include "Row.h"
#include "DocIterator.h"
+#include "Language.h"
#include "frontends/FontMetrics.h"
case SPACE:
// those elements contain only one position. Round to
// the closest side.
- if (x > full_width()) {
+ if (x > (full_width() + 1) / 2) {
x = int(full_width());
i = !isRTL();
} else {
x = 0;
i = isRTL();
}
-
}
//lyxerr << "=> p=" << pos + i << " x=" << x << endl;
return pos + i;
-
}
: separator(0), label_hfill(0), left_margin(0), right_margin(0),
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)
+ changed_(true),
+ pit_(0), pos_(0), end_(0),
+ right_boundary_(false), flushed_(false), rtl_(false),
+ changebar_(false)
{}
-void Row::setCrc(size_type crc) const
-{
- changed_ = crc != crc_;
- crc_ = crc;
-}
-
-
bool Row::isMarginSelected(bool left_margin, DocIterator const & beg,
DocIterator const & end) const
{
setSelection(beg.pos(), end.pos());
if (selection()) {
- end_margin_sel = isMarginSelected(false, beg, end);
- begin_margin_sel = isMarginSelected(true, beg, end);
+ change(end_margin_sel, isMarginSelected(false, beg, end));
+ change(begin_margin_sel, isMarginSelected(true, beg, end));
}
}
void Row::setSelection(pos_type beg, pos_type end) const
{
if (pos_ >= beg && pos_ <= end)
- sel_beg = pos_;
+ change(sel_beg, pos_);
else if (beg > pos_ && beg <= end_)
- sel_beg = beg;
+ change(sel_beg, beg);
else
- sel_beg = -1;
+ change(sel_beg, -1);
if (end_ >= beg && end_ <= end)
- sel_end = end_;
+ change(sel_end,end_);
else if (end < end_ && end >= pos_)
- sel_end = end;
+ change(sel_end, end);
else
- sel_end = -1;
+ change(sel_end, -1);
}
<< " ascent: " << row.dim_.asc
<< " descent: " << row.dim_.des
<< " separator: " << row.separator
- << " label_hfill: " << row.label_hfill
+ << " label_hfill: " << row.label_hfill
<< " row_boundary: " << row.right_boundary() << "\n";
double x = row.left_margin;
Row::Elements::const_iterator it = row.elements_.begin();
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)
if (elt.final)
return;
elt.final = true;
+ if (elt.change.changed())
+ changebar_ = true;
if (elt.type == STRING) {
dim_.wid -= elt.dim.wid;
}
-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;
// 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)
+ /*
+ * Some Asian languages split lines anywhere (no notion of
+ * word). It seems that QTextLayout is not aware of this fact.
+ * See for reference:
+ * https://en.wikipedia.org/wiki/Line_breaking_rules_in_East_Asian_languages
+ *
+ * FIXME: Something shall be done about characters which are
+ * not allowed at the beginning or end of line.
+ *
+ * FIXME: hardcoding languages is bad. Put this information in
+ * `languages' file.
+ */
+ string const lang = brk.font.language()->lang();
+ bool force = lang == "chinese-simplified"
+ || lang == "chinese-traditional"
+ || lang == "japanese"
+ || lang == "japanese-cjk"
+ || lang == "korean";
+ // FIXME: is it important to check for separators?
+ if ((!force && 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
* - 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 (brk.breakAt(min(w - wid_brk, brk.dim.wid - 2), force)) {
/* 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) {
+ && 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
projects / lyx.git / blobdiff