#include "bufferparams.h"
#include "lyxtext.h"
#include "paragraph_pimpl.h"
+#include "debug.h"
-using lyx::pos_type;
-using lyx::pit_type;
-
-using std::string;
+namespace lyx {
-namespace {
+using std::string;
+using std::endl;
-bool moveItem(Paragraph & from, Paragraph & to,
- BufferParams const & params, pos_type i, pos_type j,
- Change change = Change(Change::INSERTED));
-bool moveItem(Paragraph & from, Paragraph & to,
- BufferParams const & params, pos_type i, pos_type j,
- Change change)
+static bool moveItem(Paragraph & fromPar, pos_type fromPos,
+ Paragraph & toPar, pos_type toPos, BufferParams const & params)
{
- Paragraph::value_type const tmpchar = from.getChar(i);
- LyXFont tmpfont = from.getFontSettings(params, i);
-
- if (tmpchar == Paragraph::META_INSET) {
- InsetBase * tmpinset = 0;
- if (from.getInset(i)) {
- // the inset is not in a paragraph anymore
- tmpinset = from.insetlist.release(i);
- from.insetlist.erase(i);
+ // 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 the paragraph any more
+ tmpInset = fromPar.insetlist.release(fromPos);
}
- if (!to.insetAllowed(tmpinset->lyxCode())) {
- delete tmpinset;
+ fromPar.eraseChar(fromPos, false);
+
+ if (!toPar.insetAllowed(tmpInset->lyxCode())) {
+ delete tmpInset;
return false;
}
- if (tmpinset)
- to.insertInset(j, tmpinset, tmpfont, change);
+
+ toPar.insertInset(toPos, tmpInset, tmpFont, tmpChange);
} else {
- to.insertChar(j, tmpchar, tmpfont, change);
+ fromPar.eraseChar(fromPos, false);
+ toPar.insertChar(toPos, tmpChar, tmpFont, tmpChange);
}
- return true;
-}
+ 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) {
- Change::Type change = par.lookupChange(i).type;
- if (moveItem(par, *tmp, bparams, i, j - pos)) {
- // FIXME: change tracking (MG)
- tmp->setChange(j - pos, Change(change));
+ 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)
- par.erase(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) {
- Change::Type change = par.lookupChange(i).type;
- // FIXME: change tracking (MG)
- if (moveItem(par, tmp, bparams, i, j - pos, Change(change)))
+ 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 Type::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.erase(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();
- // What happens is the following. Later on, moveItem() will copy
- // over characters from the next paragraph to be inserted into this
- // position. Now, if the first char to be so copied is "red" (i.e.,
- // marked deleted) and the paragraph break is marked "blue",
- // insertChar will trigger (eventually, through record(), and see
- // del() and erase() in changes.C) a "hard" character deletion.
- // Which doesn't make sense of course at this pos, but the effect is
- // to shorten the change range to which this para break belongs, by
- // one. It will (should) remain "orphaned", having no CT info to it,
- // and check() in changes.C will assert. Setting the para break
- // forcibly to "black" prevents this scenario. -- MV 13.3.2006
- // FIXME: change tracking (MG)
- par.setChange(par.size(), Change(Change::UNCHANGED));
-
- Change::Type cr = next.lookupChange(next.size()).type;
- // ok, now copy the paragraph
- for (pos_type i = 0, j = 0; i <= pos_end; ++i) {
- Change::Type change = next.lookupChange(i).type;
- // FIXME: change tracking (MG)
- if (moveItem(next, par, bparams, i, pos_insert + j, Change(change)))
+ // 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.
+ 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());
+
+ // 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 status of "carriage return" over
- // FIXME: change tracking (MG)
- par.setChange(par.size(), Change(cr));
+
+ // 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 depthHook(pit_type pit,
- ParagraphList const & pars, Paragraph::depth_type depth)
+pit_type depthHook(pit_type pit, ParagraphList const & pars, depth_type depth)
{
pit_type newpit = pit;
if (par.getDepth() == 0)
return pars.size();
- return depthHook(par_offset, pars, Paragraph::depth_type(par.getDepth() - 1));
+ return depthHook(par_offset, pars, depth_type(par.getDepth() - 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();
}
int getEndLabel(pit_type p, ParagraphList const & pars)
{
pit_type pit = p;
- Paragraph::depth_type par_depth = pars[p].getDepth();
+ depth_type par_depth = pars[p].getDepth();
while (pit != pit_type(pars.size())) {
LyXLayout_ptr const & layout = pars[pit].layout();
int const endlabeltype = layout->endlabeltype;
if (p + 1 == pit_type(pars.size()))
return endlabeltype;
- Paragraph::depth_type const next_depth =
+ depth_type const next_depth =
pars[p + 1].getDepth();
if (par_depth > next_depth ||
(par_depth == next_depth && layout != pars[p + 1].layout()))
LyXFont const outerFont(pit_type par_offset, ParagraphList const & pars)
{
- Paragraph::depth_type par_depth = pars[par_offset].getDepth();
+ depth_type par_depth = pars[par_offset].getDepth();
LyXFont tmpfont(LyXFont::ALL_INHERIT);
// Resolve against environment font information
}
return num;
}
+
+
+} // namespace lyx
projects / lyx.git / blobdiff