#include "Row.h"
#include "DocIterator.h"
+#include "Language.h"
#include "frontends/FontMetrics.h"
}
-pos_type Row::Element::x2pos(int &x, bool const select) const
+pos_type Row::Element::x2pos(int &x) const
{
//lyxerr << "x2pos: x=" << x << " w=" << width() << " " << *this;
size_t i = 0;
x = isRTL() ? int(full_width()) : 0;
break;
case INSET:
- case SPACE: {
- int const boundary = select ? (full_width() + 1) / 2 : full_width();
+ case SPACE:
// those elements contain only one position. Round to
// the closest side.
- if (x > boundary) {
+ if (x > (full_width() + 1) / 2) {
x = int(full_width());
i = !isRTL();
} else {
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),
+ changed_(true),
pit_(0), pos_(0), end_(0),
- right_boundary_(false), flushed_(false), rtl_(false)
+ 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,
+bool Row::isMarginSelected(bool left, DocIterator const & beg,
DocIterator const & end) const
{
- pos_type const sel_pos = left_margin ? sel_beg : sel_end;
- pos_type const margin_pos = left_margin ? pos_ : end_;
-
- // Is the chosen margin selected ?
- if (sel_pos == margin_pos) {
- if (beg.pos() == end.pos())
- // This is a special case in which the space between after
- // pos i-1 and before pos i is selected, i.e. the margins
- // (see DocIterator::boundary_).
- return beg.boundary() && !end.boundary();
- else if (end.pos() == margin_pos)
- // If the selection ends around the margin, it is only
- // drawn if the cursor is after the margin.
- return !end.boundary();
- else if (beg.pos() == margin_pos)
- // If the selection begins around the margin, it is
- // only drawn if the cursor is before the margin.
- return beg.boundary();
- else
- return true;
- }
- return false;
+ pos_type const sel_pos = left ? sel_beg : sel_end;
+ pos_type const margin_pos = left ? pos_ : end_;
+
+ // Is there a selection and is the chosen margin selected ?
+ if (!selection() || sel_pos != margin_pos)
+ return false;
+ else if (beg.pos() == end.pos())
+ // This is a special case in which the space between after
+ // pos i-1 and before pos i is selected, i.e. the margins
+ // (see DocIterator::boundary_).
+ return beg.boundary() && !end.boundary();
+ else if (end.pos() == margin_pos)
+ // If the selection ends around the margin, it is only
+ // drawn if the cursor is after the margin.
+ return !end.boundary();
+ else if (beg.pos() == margin_pos)
+ // If the selection begins around the margin, it is
+ // only drawn if the cursor is before the margin.
+ return beg.boundary();
+ else
+ return true;
}
{
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::clearSelectionAndMargins() const
+{
+ change(sel_beg, -1);
+ change(sel_end, -1);
+ change(end_margin_sel, false);
+ change(begin_margin_sel, false);
}
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();
if (elt.final)
return;
elt.final = true;
+ if (elt.change.changed())
+ changebar_ = true;
if (elt.type == STRING) {
dim_.wid -= elt.dim.wid;
e.dim = dim;
elements_.push_back(e);
dim_.wid += dim.wid;
+ changebar_ |= ins->isChanged();
}
// 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.
+ */
+ bool const word_wrap = brk.font.language()->wordWrap();
+ // When there is text before the body part (think description
+ // environment), do not try to break.
+ if (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), !word_wrap)) {
/* 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
projects / lyx.git / blobdiff