LyXLayout_ptr const & lyxlayout = bufparams.getLyXTextClass()[layout];
for (pit_type pit = start; pit != end; ++pit) {
- pars_[pit].applyLayout(lyxlayout);
+ Paragraph & par = pars_[pit];
+ par.applyLayout(lyxlayout);
if (lyxlayout->margintype == MARGIN_MANUAL)
- pars_[pit].setLabelWidthString(buffer.translateLabel(lyxlayout->labelstring()));
+ par.setLabelWidthString(par.translateIfPossible(
+ lyxlayout->labelstring(), buffer.params()));
}
}
}
}
-
-// x is an absolute screen coord
-// returns the column near the specified x-coordinate of the row
-// x is set to the real beginning of this column
-pos_type LyXText::getColumnNearX(BufferView const & bv, int right_margin,
- pit_type const pit, Row const & row, int & x, bool & boundary) const
-{
- Buffer const & buffer = *bv.buffer();
- TextMetrics const & tm = bv.textMetrics(this);
- int const xo = bv.coordCache().get(this, pit).x_;
- x -= xo;
- int max_witdh = tm.maxWidth();
- RowMetrics const r = tm.computeRowMetrics(pit, row);
- Paragraph const & par = pars_[pit];
-
- pos_type vc = row.pos();
- pos_type end = row.endpos();
- pos_type c = 0;
- LyXLayout_ptr const & layout = par.layout();
-
- bool left_side = false;
-
- pos_type body_pos = par.beginOfBody();
-
- double tmpx = r.x;
- double last_tmpx = tmpx;
-
- if (body_pos > 0 &&
- (body_pos > end || !par.isLineSeparator(body_pos - 1)))
- body_pos = 0;
-
- // check for empty row
- if (vc == end) {
- x = int(tmpx) + xo;
- return 0;
- }
-
- frontend::FontMetrics const & fm
- = theFontMetrics(getLabelFont(buffer, par));
-
- while (vc < end && tmpx <= x) {
- c = bidi.vis2log(vc);
- last_tmpx = tmpx;
- if (body_pos > 0 && c == body_pos - 1) {
- // FIXME UNICODE
- docstring const lsep = from_utf8(layout->labelsep);
- tmpx += r.label_hfill + fm.width(lsep);
- if (par.isLineSeparator(body_pos - 1))
- tmpx -= singleWidth(buffer, par, body_pos - 1);
- }
-
- if (par.hfillExpansion(row, c)) {
- tmpx += singleWidth(buffer, par, c);
- if (c >= body_pos)
- tmpx += r.hfill;
- else
- tmpx += r.label_hfill;
- } else if (par.isSeparator(c)) {
- tmpx += singleWidth(buffer, par, c);
- if (c >= body_pos)
- tmpx += r.separator;
- } else {
- tmpx += singleWidth(buffer, par, c);
- }
- ++vc;
- }
-
- if ((tmpx + last_tmpx) / 2 > x) {
- tmpx = last_tmpx;
- left_side = true;
- }
-
- BOOST_ASSERT(vc <= end); // This shouldn't happen.
-
- boundary = false;
- // This (rtl_support test) is not needed, but gives
- // some speedup if rtl_support == false
- bool const lastrow = lyxrc.rtl_support && row.endpos() == par.size();
-
- // If lastrow is false, we don't need to compute
- // the value of rtl.
- bool const rtl = lastrow ? isRTL(buffer, par) : false;
- if (lastrow &&
- ((rtl && left_side && vc == row.pos() && x < tmpx - 5) ||
- (!rtl && !left_side && vc == end && x > tmpx + 5)))
- c = end;
- else if (vc == row.pos()) {
- c = bidi.vis2log(vc);
- if (bidi.level(c) % 2 == 1)
- ++c;
- } else {
- c = bidi.vis2log(vc - 1);
- bool const rtl = (bidi.level(c) % 2 == 1);
- if (left_side == rtl) {
- ++c;
- boundary = bidi.isBoundary(buffer, par, c);
- }
- }
-
-// I believe this code is not needed anymore (Jug 20050717)
-#if 0
- // The following code is necessary because the cursor position past
- // the last char in a row is logically equivalent to that before
- // the first char in the next row. That's why insets causing row
- // divisions -- Newline and display-style insets -- must be treated
- // specially, so cursor up/down doesn't get stuck in an air gap -- MV
- // Newline inset, air gap below:
- if (row.pos() < end && c >= end && par.isNewline(end - 1)) {
- if (bidi.level(end -1) % 2 == 0)
- tmpx -= singleWidth(buffer, par, end - 1);
- else
- tmpx += singleWidth(buffer, par, end - 1);
- c = end - 1;
- }
-
- // Air gap above display inset:
- if (row.pos() < end && c >= end && end < par.size()
- && par.isInset(end) && par.getInset(end)->display()) {
- c = end - 1;
- }
- // Air gap below display inset:
- if (row.pos() < end && c >= end && par.isInset(end - 1)
- && par.getInset(end - 1)->display()) {
- c = end - 1;
- }
-#endif
-
- x = int(tmpx) + xo;
- pos_type const col = c - row.pos();
-
- if (!c || end == par.size())
- return col;
-
- if (c==end && !par.isLineSeparator(c-1) && !par.isNewline(c-1)) {
- boundary = true;
- return col;
- }
-
- return min(col, end - 1 - row.pos());
-}
-
-
// y is screen coordinate
pit_type LyXText::getPitNearY(BufferView & bv, int y)
{
TextMetrics & tm = bv.textMetrics(this);
ParagraphMetrics const & pm = tm.parMetrics(it->first);
- int max_width = tm.maxWidth();
// If we are off-screen (before the visible part)
if (y < 0
Row const & LyXText::getRowNearY(BufferView const & bv, int y, pit_type pit) const
{
- Paragraph const & par = pars_[pit];
ParagraphMetrics const & pm = bv.parMetrics(this, pit);
int yy = bv.coordCache().get(this, pit).y_ - pm.ascent();
bool bound = false;
TextMetrics const & tm = cur.bv().textMetrics(this);
- ParagraphMetrics const & pm = tm.parMetrics(pit);
- Buffer const & buffer = cur.buffer();
- int right_margin = tm.rightMargin(pm);
int xx = x; // is modified by getColumnNearX
pos_type const pos = row.pos()
- + getColumnNearX(cur.bv(), right_margin, pit, row, xx, bound);
+ + tm.getColumnNearX(pit, row, xx, bound);
cur.pit() = pit;
cur.pos() = pos;
cur.boundary(bound);
return setCursor(cur, cur.pit(), cur.pos(), true, true);
}
if (cur.pos() != 0) {
- bool boundary = cur.boundary();
bool updateNeeded = setCursor(cur, cur.pit(), cur.pos() - 1, true, false);
if (!checkAndActivateInset(cur, false)) {
+ /** FIXME: What's this cause purpose???
+ bool boundary = cur.boundary();
if (false && !boundary &&
bidi.isBoundary(cur.buffer(), cur.paragraph(), cur.pos() + 1))
updateNeeded |=
setCursor(cur, cur.pit(), cur.pos() + 1, true, true);
+ */
}
return updateNeeded;
}
// Tell BufferView to test for FitCursor in any case!
cur.updateFlags(Update::FitCursor);
- Paragraph const & par = cur.paragraph();
- ParagraphMetrics const & pm = cur.bv().parMetrics(this, cur.pit());
+ TextMetrics const & tm = cur.bv().textMetrics(this);
+ ParagraphMetrics const & pm = tm.parMetrics(cur.pit());
int row;
- int const x = cur.targetX();
-
if (cur.pos() && cur.boundary())
row = pm.pos2row(cur.pos()-1);
else
row = pm.pos2row(cur.pos());
+ // remember current position only if we are not at the end of a row.
+ if (cur.pos() != pm.rows()[row].endpos())
+ cur.setTargetX();
+ int const x = cur.targetX();
+
if (!cur.selection()) {
int const y = bv_funcs::getPos(cur.bv(), cur, cur.boundary()).y_;
LCursor old = cur;
++dummy.pos();
cur.bv().checkDepm(dummy, old);
+ return false;
}
bool updateNeeded = false;
if (row > 0) {
updateNeeded |= setCursor(cur, cur.pit(),
- x2pos(cur.bv(), cur.pit(), row - 1, x));
+ tm.x2pos(cur.pit(), row - 1, x));
} else if (cur.pit() > 0) {
--cur.pit();
//cannot use 'par' now
ParagraphMetrics const & pmcur = cur.bv().parMetrics(this, cur.pit());
updateNeeded |= setCursor(cur, cur.pit(),
- x2pos(cur.bv(), cur.pit(), pmcur.rows().size() - 1, x));
+ tm.x2pos(cur.pit(), pmcur.rows().size() - 1, x));
}
cur.x_target() = x;
// Tell BufferView to test for FitCursor in any case!
cur.updateFlags(Update::FitCursor);
- Paragraph const & par = cur.paragraph();
- ParagraphMetrics const & pm = cur.bv().parMetrics(this, cur.pit());
+ TextMetrics const & tm = cur.bv().textMetrics(this);
+ ParagraphMetrics const & pm = tm.parMetrics(cur.pit());
int row;
- int const x = cur.targetX();
-
if (cur.pos() && cur.boundary())
row = pm.pos2row(cur.pos()-1);
else
row = pm.pos2row(cur.pos());
+ // remember current position only if we are not at the end of a row.
+ if (cur.pos() != pm.rows()[row].endpos())
+ cur.setTargetX();
+ int const x = cur.targetX();
+
if (!cur.selection()) {
int const y = bv_funcs::getPos(cur.bv(), cur, cur.boundary()).y_;
LCursor old = cur;
if (row + 1 < int(pm.rows().size())) {
updateNeeded |= setCursor(cur, cur.pit(),
- x2pos(cur.bv(), cur.pit(), row + 1, x));
+ tm.x2pos(cur.pit(), row + 1, x));
} else if (cur.pit() + 1 < int(paragraphs().size())) {
++cur.pit();
updateNeeded |= setCursor(cur, cur.pit(),
- x2pos(cur.bv(), cur.pit(), 0, x));
+ tm.x2pos(cur.pit(), 0, x));
}
cur.x_target() = x;
LCursor & old, bool & need_anchor_change)
{
//lyxerr[Debug::DEBUG] << "DEPM: cur:\n" << cur << "old:\n" << old << endl;
- // old should point to us
- BOOST_ASSERT(old.text() == this);
Paragraph & oldpar = old.paragraph();
&& oldpar.isLineSeparator(old.pos())
&& oldpar.isLineSeparator(old.pos() - 1)
&& !oldpar.isDeleted(old.pos() - 1)) {
- oldpar.eraseChar(old.pos() - 1, false); // do not track changes in DEPM
+ oldpar.eraseChar(old.pos() - 1, cur.buffer().params().trackChanges);
#ifdef WITH_WARNINGS
#warning This will not work anymore when we have multiple views of the same buffer
// In this case, we will have to correct also the cursors held by
return true;
}
- if (oldpar.stripLeadingSpaces())
+ if (oldpar.stripLeadingSpaces(cur.buffer().params().trackChanges)) {
need_anchor_change = true;
+ // We return true here because the Paragraph contents changed and
+ // we need a redraw before further action is processed.
+ return true;
+ }
return false;
}
+void LyXText::deleteEmptyParagraphMechanism(pit_type first, pit_type last, bool trackChanges)
+{
+ BOOST_ASSERT(first >= 0 && first <= last && last < (int) pars_.size());
+
+ for (pit_type pit = first; pit <= last; ++pit) {
+ Paragraph & par = pars_[pit];
+
+ // We allow all kinds of "mumbo-jumbo" when freespacing.
+ if (par.isFreeSpacing())
+ continue;
+
+ for (pos_type pos = 1; pos < par.size(); ++pos) {
+ if (par.isLineSeparator(pos) && par.isLineSeparator(pos - 1)
+ && !par.isDeleted(pos - 1)) {
+ if (par.eraseChar(pos - 1, trackChanges)) {
+ --pos;
+ }
+ }
+ }
+
+ // don't delete anything if this is the only remaining paragraph within the given range
+ // note: LyXText::acceptOrRejectChanges() sets the cursor to 'first' after calling DEPM
+ if (first == last)
+ continue;
+
+ // don't delete empty paragraphs with keepempty set
+ if (par.allowEmpty())
+ continue;
+
+ if (par.empty() || (par.size() == 1 && par.isLineSeparator(0))) {
+ pars_.erase(boost::next(pars_.begin(), pit));
+ --pit;
+ --last;
+ continue;
+ }
+
+ par.stripLeadingSpaces(trackChanges);
+ }
+}
+
+
void LyXText::recUndo(LCursor & cur, pit_type first, pit_type last) const
{
recordUndo(cur, Undo::ATOMIC, first, last);
projects / lyx.git / blobdiff