#include "bufferparams.h"
#include "lyxtext.h"
#include "paragraph_pimpl.h"
+#include "debug.h"
namespace lyx {
using std::string;
+using std::endl;
static bool moveItem(Paragraph & fromPar, pos_type fromPos,
Paragraph & toPar, pos_type toPos, BufferParams const & params)
{
+ // Note: moveItem() does not honour change tracking!
+ // Therefore, it should only be used for breaking and merging paragraphs
+
Paragraph::value_type const tmpChar = fromPar.getChar(fromPos);
LyXFont const tmpFont = fromPar.getFontSettings(params, fromPos);
Change const tmpChange = fromPar.lookupChange(fromPos);
if (tmpChar == Paragraph::META_INSET) {
InsetBase * tmpInset = 0;
if (fromPar.getInset(fromPos)) {
- // the inset is not in a paragraph anymore
+ // the inset is not in the paragraph any more
tmpInset = fromPar.insetlist.release(fromPos);
- fromPar.insetlist.erase(fromPos);
}
+ fromPar.eraseChar(fromPos, false);
+
if (!toPar.insetAllowed(tmpInset->lyxCode())) {
delete tmpInset;
return false;
}
- if (tmpInset)
- toPar.insertInset(toPos, tmpInset, tmpFont, tmpChange);
+
+ toPar.insertInset(toPos, tmpInset, tmpFont, tmpChange);
} else {
+ fromPar.eraseChar(fromPos, false);
toPar.insertChar(toPos, tmpChar, tmpFont, tmpChange);
}
+
return true;
}
Paragraph & par = pars[par_offset];
- // we will invalidate the row cache
- par.rows().clear();
-
// without doing that we get a crash when typing <Return> at the
// end of a paragraph
tmp->layout(bparams.getLyXTextClass().defaultLayout());
// remember to set the inset_owner
tmp->setInsetOwner(par.inInset());
- // this is an idea for a more userfriendly layout handling, I will
- // see what the users say
-
// layout stays the same with latex-environments
if (flag) {
tmp->layout(par.layout());
tmp->params().depth(par.params().depth());
tmp->params().noindent(par.params().noindent());
- // copy everything behind the break-position
+ // move everything behind the break position
// to the new paragraph
/* Note: if !keepempty, empty() == true, then we reach
*/
pos_type pos_end = par.size() - 1;
- for (pos_type i = pos, j = pos; i <= pos_end; ++i) {
- if (moveItem(par, i, *tmp, j - pos, bparams)) {
+ for (pos_type i = pos, j = 0; i <= pos_end; ++i) {
+ if (moveItem(par, pos, *tmp, j, bparams)) {
++j;
}
}
-
- for (pos_type i = pos_end; i >= pos; --i)
- // FIXME: change tracking (MG)
- par.eraseChar(i, false); // erase without change tracking
}
+ // Move over the end-of-par change information
+ tmp->setChange(tmp->size(), par.lookupChange(par.size()));
+ par.setChange(par.size(), Change(bparams.trackChanges ?
+ Change::INSERTED : Change::UNCHANGED));
+
if (pos) {
// Make sure that we keep the language when
- // breaking paragrpah.
+ // breaking paragraph.
if (tmp->empty()) {
LyXFont changed = tmp->getFirstFontSettings(bparams);
LyXFont old = par.getFontSettings(bparams, par.size());
par.setLabelWidthString(tmp->params().labelWidthString());
par.params().depth(tmp->params().depth());
}
-
- // subtle, but needed to get empty pars working right
- if (bparams.trackChanges) {
- // FIXME: Change tracking (MG)
- // if (!par.size())
- // set 'par' text to INSERTED in CT mode; clear CT info otherwise
- // else if (!tmp->size())
- // set 'tmp' text to INSERTED in CT mode; clear CT info otherwise
- }
}
tmp.makeSameLayout(par);
- // When can pos > size()?
- // I guess pos == size() is possible.
- if (par.size() > pos) {
- // copy everything behind the break-position to the new
- // paragraph
+ BOOST_ASSERT(pos <= par.size());
+
+ if (pos < par.size()) {
+ // move everything behind the break position to the new paragraph
pos_type pos_end = par.size() - 1;
- for (pos_type i = pos, j = pos; i <= pos_end; ++i) {
- if (moveItem(par, i, tmp, j - pos, bparams)) {
+ for (pos_type i = pos, j = 0; i <= pos_end; ++i) {
+ if (moveItem(par, pos, tmp, j, bparams)) {
++j;
}
}
- // Move over end-of-par change attr
- // FIXME: change tracking (MG)
- tmp.setChange(tmp.size(), Change(par.lookupChange(par.size()).type));
-
- // If tracking changes, set all the text that is to be
- // erased to Change::INSERTED.
- for (pos_type k = pos_end; k >= pos; --k) {
- if (bparams.trackChanges)
- // FIXME: Change tracking (MG)
- par.setChange(k, Change(Change::INSERTED));
- // FIXME: change tracking (MG)
- par.eraseChar(k, false);
- }
+ // Move over the end-of-par change information
+ tmp.setChange(tmp.size(), par.lookupChange(par.size()));
+ par.setChange(par.size(), Change(bparams.trackChanges ?
+ Change::INSERTED : Change::UNCHANGED));
}
}
pos_type pos_end = next.size() - 1;
pos_type pos_insert = par.size();
- // The imaginary end-of-paragraph character (at par.size()) has to be
+ // the imaginary end-of-paragraph character (at par.size()) has to be
// marked as unmodified. Otherwise, its change is adopted by the first
// character of the next paragraph.
-
- // FIXME: change tracking (MG)
- par.setChange(par.size(), Change(Change::UNCHANGED));
+ if (par.lookupChange(par.size()).type != Change::UNCHANGED) {
+ LYXERR(Debug::CHANGES) <<
+ "merging par with inserted/deleted end-of-par character" << endl;
+ par.setChange(par.size(), Change(Change::UNCHANGED));
+ }
Change change = next.lookupChange(next.size());
- // ok, now copy the paragraph
- for (pos_type i = 0, j = 0; i <= pos_end; ++i) {
- if (moveItem(next, i, par, pos_insert + j, bparams)) {
+
+ // move the content of the second paragraph to the end of the first one
+ for (pos_type i = 0, j = pos_insert; i <= pos_end; ++i) {
+ if (moveItem(next, 0, par, j, bparams)) {
++j;
}
}
- // Move the change of the end-of-paragraph character
- // FIXME: change tracking (MG)
+
+ // move the change of the end-of-paragraph character
par.setChange(par.size(), change);
pars.erase(boost::next(pars.begin(), par_offset + 1));
pit_type dhook_offset = depthHook(par_offset, pars, par.getDepth());
+ if (dhook_offset == par_offset)
+ return true;
+
Paragraph const & dhook = pars[dhook_offset];
- return dhook_offset == par_offset
- || dhook.layout() != par.layout()
+ return dhook.layout() != par.layout()
|| dhook.getDepth() != par.getDepth();
}