* \author John Levon
* \author André Pönitz
* \author Allan Rae
+ * \author Stefan Schimanski
* \author Dekel Tsur
* \author Jürgen Vigna
*
#include "BufferList.h"
#include "BufferParams.h"
#include "BufferView.h"
-#include "bufferview_funcs.h"
#include "Bullet.h"
-#include "CoordCache.h"
+#include "Color.h"
#include "Cursor.h"
#include "CutAndPaste.h"
#include "debug.h"
#include "FuncRequest.h"
#include "gettext.h"
#include "Language.h"
-#include "Color.h"
+#include "Layout.h"
+#include "Lexer.h"
#include "LyXFunc.h"
#include "LyXRC.h"
-#include "Row.h"
#include "Paragraph.h"
-#include "TextMetrics.h"
#include "paragraph_funcs.h"
#include "ParagraphParameters.h"
#include "ParIterator.h"
#include "Server.h"
#include "ServerSocket.h"
+#include "TextMetrics.h"
#include "Undo.h"
#include "VSpace.h"
#include "support/textutils.h"
#include <boost/current_function.hpp>
+#include <boost/next_prior.hpp>
#include <sstream>
-
-namespace lyx {
-
using std::endl;
using std::ostringstream;
using std::string;
using std::max;
using std::min;
+using std::istringstream;
+namespace lyx {
Text::Text()
- : current_font(Font::ALL_INHERIT),
- background_color_(Color::background),
- autoBreakRows_(false)
+ : autoBreakRows_(false)
{}
}
-//takes screen x,y coordinates
-Inset * Text::checkInsetHit(BufferView & bv, int x, int y)
-{
- pit_type pit = getPitNearY(bv, y);
- BOOST_ASSERT(pit != -1);
-
- Paragraph const & par = pars_[pit];
-
- LYXERR(Debug::DEBUG)
- << BOOST_CURRENT_FUNCTION
- << ": x: " << x
- << " y: " << y
- << " pit: " << pit
- << endl;
- InsetList::const_iterator iit = par.insetlist.begin();
- InsetList::const_iterator iend = par.insetlist.end();
- for (; iit != iend; ++iit) {
- Inset * inset = iit->inset;
-#if 1
- LYXERR(Debug::DEBUG)
- << BOOST_CURRENT_FUNCTION
- << ": examining inset " << inset << endl;
-
- if (bv.coordCache().getInsets().has(inset))
- LYXERR(Debug::DEBUG)
- << BOOST_CURRENT_FUNCTION
- << ": xo: " << inset->xo(bv) << "..."
- << inset->xo(bv) + inset->width()
- << " yo: " << inset->yo(bv) - inset->ascent()
- << "..."
- << inset->yo(bv) + inset->descent()
- << endl;
- else
- LYXERR(Debug::DEBUG)
- << BOOST_CURRENT_FUNCTION
- << ": inset has no cached position" << endl;
-#endif
- if (inset->covers(bv, x, y)) {
- LYXERR(Debug::DEBUG)
- << BOOST_CURRENT_FUNCTION
- << ": Hit inset: " << inset << endl;
- return inset;
- }
- }
- LYXERR(Debug::DEBUG)
- << BOOST_CURRENT_FUNCTION
- << ": No inset hit. " << endl;
- return 0;
-}
-
-
-
-// Gets the fully instantiated font at a given position in a paragraph
-// Basically the same routine as Paragraph::getFont() in Paragraph.cpp.
-// The difference is that this one is used for displaying, and thus we
-// are allowed to make cosmetic improvements. For instance make footnotes
-// smaller. (Asger)
-Font Text::getFont(Buffer const & buffer, Paragraph const & par,
- pos_type const pos) const
-{
- BOOST_ASSERT(pos >= 0);
-
- Layout_ptr const & layout = par.layout();
-#ifdef WITH_WARNINGS
-#warning broken?
-#endif
- BufferParams const & params = buffer.params();
- pos_type const body_pos = par.beginOfBody();
-
- // We specialize the 95% common case:
- if (!par.getDepth()) {
- Font f = par.getFontSettings(params, pos);
- if (!isMainText(buffer))
- applyOuterFont(buffer, f);
- Font lf;
- Font rlf;
- if (layout->labeltype == LABEL_MANUAL && pos < body_pos) {
- lf = layout->labelfont;
- rlf = layout->reslabelfont;
- } else {
- lf = layout->font;
- rlf = layout->resfont;
- }
- // In case the default family has been customized
- if (lf.family() == Font::INHERIT_FAMILY)
- rlf.setFamily(params.getFont().family());
- return f.realize(rlf);
- }
-
- // The uncommon case need not be optimized as much
- Font layoutfont;
- if (pos < body_pos)
- layoutfont = layout->labelfont;
- else
- layoutfont = layout->font;
-
- Font font = par.getFontSettings(params, pos);
- font.realize(layoutfont);
-
- if (!isMainText(buffer))
- applyOuterFont(buffer, font);
-
- // Find the pit value belonging to paragraph. This will not break
- // even if pars_ would not be a vector anymore.
- // Performance appears acceptable.
-
- pit_type pit = pars_.size();
- for (pit_type it = 0; it < pit; ++it)
- if (&pars_[it] == &par) {
- pit = it;
- break;
- }
- // Realize against environment font information
- // NOTE: the cast to pit_type should be removed when pit_type
- // changes to a unsigned integer.
- if (pit < pit_type(pars_.size()))
- font.realize(outerFont(pit, pars_));
-
- // Realize with the fonts of lesser depth.
- font.realize(params.getFont());
-
- return font;
-}
-
-// There are currently two font mechanisms in LyX:
-// 1. The font attributes in a lyxtext, and
-// 2. The inset-specific font properties, defined in an inset's
-// metrics() and draw() methods and handed down the inset chain through
-// the pi/mi parameters, and stored locally in a lyxtext in font_.
-// This is where the two are integrated in the final fully realized
-// font.
-void Text::applyOuterFont(Buffer const & buffer, Font & font) const {
- Font lf(font_);
- lf.reduce(buffer.params().getFont());
- lf.realize(font);
- lf.setLanguage(font.language());
- font = lf;
-}
-
-
Font Text::getLayoutFont(Buffer const & buffer, pit_type const pit) const
{
- Layout_ptr const & layout = pars_[pit].layout();
+ LayoutPtr const & layout = pars_[pit].layout();
if (!pars_[pit].getDepth()) {
Font lf = layout->resfont;
Font Text::getLabelFont(Buffer const & buffer, Paragraph const & par) const
{
- Layout_ptr const & layout = par.layout();
+ LayoutPtr const & layout = par.layout();
if (!par.getDepth()) {
Font lf = layout->reslabelfont;
void Text::setCharFont(Buffer const & buffer, pit_type pit,
- pos_type pos, Font const & fnt)
+ pos_type pos, Font const & fnt, Font const & display_font)
{
Font font = fnt;
- Layout_ptr const & layout = pars_[pit].layout();
+ LayoutPtr const & layout = pars_[pit].layout();
// Get concrete layout font to reduce against
Font layoutfont;
// Inside inset, apply the inset's font attributes if any
// (charstyle!)
if (!isMainText(buffer))
- layoutfont.realize(font_);
+ layoutfont.realize(display_font);
layoutfont.realize(buffer.params().getFont());
}
-void Text::setInsetFont(Buffer const & buffer, pit_type pit,
+void Text::setInsetFont(BufferView const & bv, pit_type pit,
pos_type pos, Font const & font, bool toggleall)
{
BOOST_ASSERT(pars_[pit].isInset(pos) &&
pars_[pit].getInset(pos)->noFontChange());
Inset * const inset = pars_[pit].getInset(pos);
- DocIterator dit = doc_iterator_begin(*inset);
- // start of the last cell
- DocIterator end = dit;
- end.idx() = end.lastidx();
-
- while (true) {
- Text * text = dit.text();
- Inset * cell = dit.realInset();
- if (text && cell) {
- DocIterator cellbegin = doc_iterator_begin(*cell);
+ CursorSlice::idx_type endidx = inset->nargs();
+ for (CursorSlice cs(*inset); cs.idx() != endidx; ++cs.idx()) {
+ Text * text = cs.text();
+ if (text) {
// last position of the cell
- DocIterator cellend = cellbegin;
+ CursorSlice cellend = cs;
cellend.pit() = cellend.lastpit();
cellend.pos() = cellend.lastpos();
- text->setFont(buffer, cellbegin, cellend, font, toggleall);
+ text->setFont(bv, cs, cellend, font, toggleall);
}
- if (dit == end)
- break;
- dit.forwardIdx();
}
}
void Text::setLayout(Buffer const & buffer, pit_type start, pit_type end,
- string const & layout)
+ docstring const & layout)
{
BOOST_ASSERT(start != end);
BufferParams const & bufparams = buffer.params();
- Layout_ptr const & lyxlayout = bufparams.getTextClass()[layout];
+ LayoutPtr const & lyxlayout = bufparams.getTextClass()[layout];
for (pit_type pit = start; pit != end; ++pit) {
Paragraph & par = pars_[pit];
// set layout over selection and make a total rebreak of those paragraphs
-void Text::setLayout(Cursor & cur, string const & layout)
+void Text::setLayout(Cursor & cur, docstring const & layout)
{
BOOST_ASSERT(this == cur.text());
// special handling of new environment insets
BufferView & bv = cur.bv();
- BufferParams const & params = bv.buffer()->params();
- Layout_ptr const & lyxlayout = params.getTextClass()[layout];
+ BufferParams const & params = bv.buffer().params();
+ LayoutPtr const & lyxlayout = params.getTextClass()[layout];
if (lyxlayout->is_environment) {
// move everything in a new environment inset
- LYXERR(Debug::DEBUG) << "setting layout " << layout << endl;
+ LYXERR(Debug::DEBUG) << "setting layout " << to_utf8(layout) << endl;
lyx::dispatch(FuncRequest(LFUN_LINE_BEGIN));
lyx::dispatch(FuncRequest(LFUN_LINE_END_SELECT));
lyx::dispatch(FuncRequest(LFUN_CUT));
layoutfont = getLayoutFont(cur.buffer(), pit);
// Update current font
- real_current_font.update(font,
+ cur.real_current_font.update(font,
cur.buffer().params().language,
toggleall);
// Reduce to implicit settings
- current_font = real_current_font;
- current_font.reduce(layoutfont);
+ cur.current_font = cur.real_current_font;
+ cur.current_font.reduce(layoutfont);
// And resolve it completely
- real_current_font.realize(layoutfont);
+ cur.real_current_font.realize(layoutfont);
// if there is no selection that's all we need to do
if (!cur.selection())
// Ok, we have a selection.
recordUndoSelection(cur);
- setFont(cur.buffer(), cur.selectionBegin(), cur.selectionEnd(), font,
- toggleall);
+ setFont(cur.bv(), cur.selectionBegin().top(),
+ cur.selectionEnd().top(), font, toggleall);
}
-void Text::setFont(Buffer const & buffer, DocIterator const & begin,
- DocIterator const & end, Font const & font,
+void Text::setFont(BufferView const & bv, CursorSlice const & begin,
+ CursorSlice const & end, Font const & font,
bool toggleall)
{
+ Buffer const & buffer = bv.buffer();
+
// Don't use forwardChar here as ditend might have
// pos() == lastpos() and forwardChar would miss it.
// Can't use forwardPos either as this descends into
// nested insets.
Language const * language = buffer.params().language;
- for (DocIterator dit = begin; dit != end; dit.forwardPosNoDescend()) {
+ for (CursorSlice dit = begin; dit != end; dit.forwardPos()) {
if (dit.pos() != dit.lastpos()) {
pit_type const pit = dit.pit();
pos_type const pos = dit.pos();
// text cells of the inset (bug 1973).
// FIXME: This should change, see documentation
// of noFontChange in Inset.h
- setInsetFont(buffer, pit, pos, font, toggleall);
- Font f = getFont(buffer, dit.paragraph(), pos);
+ setInsetFont(bv, pit, pos, font, toggleall);
+ TextMetrics const & tm = bv.textMetrics(this);
+ Font f = tm.getDisplayFont(pit, pos);
f.update(font, language, toggleall);
- setCharFont(buffer, pit, pos, f);
+ setCharFont(buffer, pit, pos, f, tm.font_);
}
}
}
-// the cursor set functions have a special mechanism. When they
-// realize you left an empty paragraph, they will delete it.
-
-bool Text::cursorHome(Cursor & cur)
-{
- BOOST_ASSERT(this == cur.text());
- ParagraphMetrics const & pm = cur.bv().parMetrics(this, cur.pit());
- Row const & row = pm.getRow(cur.pos(),cur.boundary());
- return setCursor(cur, cur.pit(), row.pos());
-}
-
-
-bool Text::cursorEnd(Cursor & cur)
-{
- BOOST_ASSERT(this == cur.text());
- // if not on the last row of the par, put the cursor before
- // the final space exept if I have a spanning inset or one string
- // is so long that we force a break.
- pos_type end = cur.textRow().endpos();
- if (end == 0)
- // empty text, end-1 is no valid position
- return false;
- bool boundary = false;
- if (end != cur.lastpos()) {
- if (!cur.paragraph().isLineSeparator(end-1)
- && !cur.paragraph().isNewline(end-1))
- boundary = true;
- else
- --end;
- }
- return setCursor(cur, cur.pit(), end, true, boundary);
-}
-
-
bool Text::cursorTop(Cursor & cur)
{
BOOST_ASSERT(this == cur.text());
}
-void Text::setParagraph(Cursor & cur,
- Spacing const & spacing, LyXAlignment align,
- docstring const & labelwidthstring, bool noindent)
+void Text::setParagraphs(Cursor & cur, docstring arg, bool merge)
{
BOOST_ASSERT(cur.text());
// make sure that the depth behind the selection are restored, too
for (pit_type pit = cur.selBegin().pit(), end = cur.selEnd().pit();
pit <= end; ++pit) {
Paragraph & par = pars_[pit];
- ParagraphParameters & params = par.params();
- params.spacing(spacing);
+ ParagraphParameters params = par.params();
+ params.read(to_utf8(arg), merge);
+ Layout const & layout = *(par.layout());
+ par.params().apply(params, layout);
+ }
+}
- // does the layout allow the new alignment?
- Layout_ptr const & layout = par.layout();
- if (align == LYX_ALIGN_LAYOUT)
- align = layout->align;
- if (align & layout->alignpossible) {
- if (align == layout->align)
- params.align(LYX_ALIGN_LAYOUT);
- else
- params.align(align);
- }
- par.setLabelWidthString(labelwidthstring);
- params.noindent(noindent);
- }
+//FIXME This is a little redundant now, but it's probably worth keeping,
+//especially if we're going to go away from using serialization internally
+//quite so much.
+void Text::setParagraphs(Cursor & cur, ParagraphParameters const & p)
+{
+ BOOST_ASSERT(cur.text());
+ // make sure that the depth behind the selection are restored, too
+ pit_type undopit = undoSpan(cur.selEnd().pit());
+ recUndo(cur, cur.selBegin().pit(), undopit - 1);
+
+ for (pit_type pit = cur.selBegin().pit(), end = cur.selEnd().pit();
+ pit <= end; ++pit) {
+ Paragraph & par = pars_[pit];
+ Layout const & layout = *(par.layout());
+ par.params().apply(p, layout);
+ }
}
{
BOOST_ASSERT(this == cur.text());
BOOST_ASSERT(inset);
- cur.paragraph().insertInset(cur.pos(), inset,
+ cur.paragraph().insertInset(cur.pos(), inset, cur.current_font,
Change(cur.buffer().params().trackChanges ?
Change::INSERTED : Change::UNCHANGED));
}
void Text::insertStringAsLines(Cursor & cur, docstring const & str)
{
cur.buffer().insertStringAsLines(pars_, cur.pit(), cur.pos(),
- current_font, str, autoBreakRows_);
+ cur.current_font, str, autoBreakRows_);
}
cur.boundary(boundary);
setCursor(cur.top(), par, pos);
if (setfont)
- setCurrentFont(cur);
-}
-
-
-void Text::setCurrentFont(Cursor & cur)
-{
- BOOST_ASSERT(this == cur.text());
- pos_type pos = cur.pos();
- Paragraph & par = cur.paragraph();
-
- // ignore empty paragraph
- if (par.empty())
- return;
-
- // if on boundary or at paragraph end, set font of previous char
- if ((pos > 0 && cur.boundary()) || pos == cur.lastpos())
- --pos;
-
- // we changed the line and the bidi tables are outdated?
- if (!bidi.inRange(pos))
- bidi.computeTables(par, cur.buffer(), cur.textRow());
-
- // now in range?
- if (!bidi.inRange(pos))
- return;
-
- if (pos > 0) {
- if (pos == cur.lastpos())
- --pos;
- else // potentional bug... BUG (Lgb)
- if (par.isSeparator(pos)) {
- if (pos > cur.textRow().pos() &&
- bidi.level(pos) % 2 ==
- bidi.level(pos - 1) % 2)
- --pos;
- else if (pos + 1 < cur.lastpos())
- ++pos;
- }
- }
-
- BufferParams const & bufparams = cur.buffer().params();
- current_font = par.getFontSettings(bufparams, pos);
- real_current_font = getFont(cur.buffer(), par, pos);
-
- if (cur.pos() == cur.lastpos()
- && bidi.isBoundary(cur.buffer(), par, cur.pos())
- && !cur.boundary()) {
- Language const * lang = par.getParLanguage(bufparams);
- current_font.setLanguage(lang);
- current_font.setNumber(Font::OFF);
- real_current_font.setLanguage(lang);
- real_current_font.setNumber(Font::OFF);
- }
-}
-
-// y is screen coordinate
-pit_type Text::getPitNearY(BufferView & bv, int y) const
-{
- BOOST_ASSERT(!paragraphs().empty());
- BOOST_ASSERT(bv.coordCache().getParPos().find(this) != bv.coordCache().getParPos().end());
- CoordCache::InnerParPosCache const & cc = bv.coordCache().getParPos().find(this)->second;
- LYXERR(Debug::DEBUG)
- << BOOST_CURRENT_FUNCTION
- << ": y: " << y << " cache size: " << cc.size()
- << endl;
-
- // look for highest numbered paragraph with y coordinate less than given y
- pit_type pit = 0;
- int yy = -1;
- CoordCache::InnerParPosCache::const_iterator it = cc.begin();
- CoordCache::InnerParPosCache::const_iterator et = cc.end();
- CoordCache::InnerParPosCache::const_iterator last = et; last--;
-
- TextMetrics & tm = bv.textMetrics(this);
- ParagraphMetrics const & pm = tm.parMetrics(it->first);
-
- // If we are off-screen (before the visible part)
- if (y < 0
- // and even before the first paragraph in the cache.
- && y < it->second.y_ - int(pm.ascent())) {
- // and we are not at the first paragraph in the inset.
- if (it->first == 0)
- return 0;
- // then this is the paragraph we are looking for.
- pit = it->first - 1;
- // rebreak it and update the CoordCache.
- tm.redoParagraph(pit);
- bv.coordCache().parPos()[this][pit] =
- Point(0, it->second.y_ - pm.descent());
- return pit;
- }
-
- ParagraphMetrics const & pm_last = bv.parMetrics(this, last->first);
-
- // If we are off-screen (after the visible part)
- if (y > bv.workHeight()
- // and even after the first paragraph in the cache.
- && y >= last->second.y_ + int(pm_last.descent())) {
- pit = last->first + 1;
- // and we are not at the last paragraph in the inset.
- if (pit == int(pars_.size()))
- return last->first;
- // then this is the paragraph we are looking for.
- // rebreak it and update the CoordCache.
- tm.redoParagraph(pit);
- bv.coordCache().parPos()[this][pit] =
- Point(0, last->second.y_ + pm_last.ascent());
- return pit;
- }
-
- for (; it != et; ++it) {
- LYXERR(Debug::DEBUG)
- << BOOST_CURRENT_FUNCTION
- << " examining: pit: " << it->first
- << " y: " << it->second.y_
- << endl;
-
- ParagraphMetrics const & pm = bv.parMetrics(this, it->first);
-
- if (it->first >= pit && int(it->second.y_) - int(pm.ascent()) <= y) {
- pit = it->first;
- yy = it->second.y_;
- }
- }
-
- LYXERR(Debug::DEBUG)
- << BOOST_CURRENT_FUNCTION
- << ": found best y: " << yy << " for pit: " << pit
- << endl;
-
- return pit;
-}
-
-
-Row const & Text::getRowNearY(BufferView const & bv, int y, pit_type pit) const
-{
- ParagraphMetrics const & pm = bv.parMetrics(this, pit);
-
- int yy = bv.coordCache().get(this, pit).y_ - pm.ascent();
- BOOST_ASSERT(!pm.rows().empty());
- RowList::const_iterator rit = pm.rows().begin();
- RowList::const_iterator const rlast = boost::prior(pm.rows().end());
- for (; rit != rlast; yy += rit->height(), ++rit)
- if (yy + rit->height() > y)
- break;
- return *rit;
-}
-
-
-// x,y are absolute screen coordinates
-// sets cursor recursively descending into nested editable insets
-Inset * Text::editXY(Cursor & cur, int x, int y)
-{
- if (lyxerr.debugging(Debug::WORKAREA)) {
- lyxerr << "Text::editXY(cur, " << x << ", " << y << ")" << std::endl;
- cur.bv().coordCache().dump();
- }
- pit_type pit = getPitNearY(cur.bv(), y);
- BOOST_ASSERT(pit != -1);
-
- Row const & row = getRowNearY(cur.bv(), y, pit);
- bool bound = false;
-
- TextMetrics const & tm = cur.bv().textMetrics(this);
- int xx = x; // is modified by getColumnNearX
- pos_type const pos = row.pos()
- + tm.getColumnNearX(pit, row, xx, bound);
- cur.pit() = pit;
- cur.pos() = pos;
- cur.boundary(bound);
- cur.setTargetX(x);
-
- // try to descend into nested insets
- Inset * inset = checkInsetHit(cur.bv(), x, y);
- //lyxerr << "inset " << inset << " hit at x: " << x << " y: " << y << endl;
- if (!inset) {
- // Either we deconst editXY or better we move current_font
- // and real_current_font to Cursor
- setCurrentFont(cur);
- return 0;
- }
-
- Inset * insetBefore = pos? pars_[pit].getInset(pos - 1): 0;
- //Inset * insetBehind = pars_[pit].getInset(pos);
-
- // This should be just before or just behind the
- // cursor position set above.
- BOOST_ASSERT((pos != 0 && inset == insetBefore)
- || inset == pars_[pit].getInset(pos));
-
- // Make sure the cursor points to the position before
- // this inset.
- if (inset == insetBefore) {
- --cur.pos();
- cur.boundary(false);
- }
-
- // Try to descend recursively inside the inset.
- inset = inset->editXY(cur, x, y);
-
- if (cur.top().text() == this)
- setCurrentFont(cur);
- return inset;
+ cur.setCurrentFont();
}
if (!front && cur.pos() == 0)
return false;
Inset * inset = front ? cur.nextInset() : cur.prevInset();
- if (!isHighlyEditableInset(inset))
+ if (!inset || inset->editable() != Inset::HIGHLY_EDITABLE)
return false;
/*
* Apparently, when entering an inset we are expected to be positioned
// move to the previous paragraph or do nothing
if (cur.pit() > 0)
- return setCursor(cur, cur.pit() - 1, getPar(cur.pit() - 1).size());
+ return setCursor(cur, cur.pit() - 1, getPar(cur.pit() - 1).size(), true, false);
return false;
}
if (checkAndActivateInset(cur, true))
return false;
+ TextMetrics const & tm = cur.bv().textMetrics(this);
// if left of boundary -> just jump to right side
- // but for RTL boundaries don't, because: abc|DDEEFFghi -> abcDDEEF|Fghi
- if (cur.boundary() &&
- !bidi.isBoundary(cur.buffer(), cur.paragraph(), cur.pos()))
+ // but for RTL boundaries don't, because: abc|DDEEFFghi -> abcDDEEF|Fghi
+ if (cur.boundary() && !tm.isRTLBoundary(cur.pit(), cur.pos()))
return setCursor(cur, cur.pit(), cur.pos(), true, false);
// next position is left of boundary,
// in front of RTL boundary? Stay on this side of the boundary because:
// ab|cDDEEFFghi -> abc|DDEEFFghi
- if (bidi.isBoundary(cur.buffer(), cur.paragraph(), cur.pos() + 1))
+ if (tm.isRTLBoundary(cur.pit(), cur.pos() + 1))
return setCursor(cur, cur.pit(), cur.pos() + 1, true, true);
// move right
// move to next paragraph
if (cur.pit() != cur.lastpit())
- return setCursor(cur, cur.pit() + 1, 0);
+ return setCursor(cur, cur.pit() + 1, 0, true, false);
return false;
}
&& old.pos() < oldpar.size()
&& oldpar.isLineSeparator(old.pos())
&& oldpar.isLineSeparator(old.pos() - 1)
- && !oldpar.isDeleted(old.pos() - 1)) {
+ && !oldpar.isDeleted(old.pos() - 1)
+ && !oldpar.isDeleted(old.pos())) {
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
+// FIXME: 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
// other bufferviews. It will probably be easier to do that in a more
// automated way in CursorSlice code. (JMarc 26/09/2001)
-#endif
// correct all cursor parts
if (same_par) {
fixCursorAfterDelete(cur.top(), old.top());
max(old.pit() - 1, pit_type(0)),
min(old.pit() + 1, old.lastpit()));
ParagraphList & plist = old.text()->paragraphs();
+ bool const soa = oldpar.params().startOfAppendix();
plist.erase(boost::next(plist.begin(), old.pit()));
+ // do not lose start of appendix marker (bug 4212)
+ if (soa)
+ plist[old.pit()].params().startOfAppendix(true);
- // see #warning above
+ // see #warning (FIXME?) above
if (cur.depth() >= old.depth()) {
CursorSlice & curslice = cur[old.depth() - 1];
if (&curslice.inset() == &old.inset()