#include "encoding.h"
#include "gettext.h"
#include "language.h"
+#include "lyxrow.h"
#include "lyxtext.h"
#include "outputparams.h"
#include "paragraph_pimpl.h"
namespace {
bool moveItem(Paragraph & from, Paragraph & to,
- BufferParams const & params, pos_type i, pos_type j)
+ 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)
{
Paragraph::value_type const tmpchar = from.getChar(i);
LyXFont tmpfont = from.getFontSettings(params, i);
return false;
}
if (tmpinset)
- to.insertInset(j, tmpinset, tmpfont);
+ to.insertInset(j, tmpinset, tmpfont, change);
} else {
if (!to.checkInsertChar(tmpfont))
return false;
- to.insertChar(j, tmpchar, tmpfont);
+ to.insertChar(j, tmpchar, tmpfont, change);
}
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());
Paragraph & tmp = *pars.insert(pars.begin() + par_offset + 1, Paragraph());
Paragraph & par = pars[par_offset];
+ if (bparams.tracking_changes)
+ tmp.trackChanges();
+
tmp.makeSameLayout(par);
// When can pos > size()?
// paragraph
pos_type pos_end = par.size() - 1;
- for (pos_type i = pos, j = pos; i <= pos_end; ++i)
- if (moveItem(par, tmp, bparams, i, j - pos))
+ for (pos_type i = pos, j = pos; i <= pos_end; ++i) {
+ Change::Type change = par.lookupChange(i);
+ if (moveItem(par, tmp, bparams, i, j - pos, change))
++j;
-
- for (pos_type k = pos_end; k >= pos; --k)
+ }
+ // 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.tracking_changes)
+ par.setChange(k, Change::INSERTED);
par.erase(k);
+ }
}
}
pos_type pos_insert = par.size();
// ok, now copy the paragraph
- for (pos_type i = 0, j = 0; i <= pos_end; ++i)
- if (moveItem(next, par, bparams, i, pos_insert + j))
+ for (pos_type i = 0, j = 0; i <= pos_end; ++i) {
+ Change::Type change = next.lookupChange(i);
+ if (moveItem(next, par, bparams, i, pos_insert + j, change))
++j;
+ }
pars.erase(pars.begin() + par_offset + 1);
}
}
-pit_type outerPar(Buffer const & buf, InsetBase const * inset)
-{
- ParIterator pit = const_cast<Buffer &>(buf).par_iterator_begin();
- ParIterator end = const_cast<Buffer &>(buf).par_iterator_end();
- for ( ; pit != end; ++pit) {
- LyXText * text;
- // the second '=' below is intentional
- for (int i = 0; (text = inset->getText(i)); ++i)
- if (&text->paragraphs() == &pit.plist())
- return pit.outerPar();
-
- InsetList::const_iterator ii = pit->insetlist.begin();
- InsetList::const_iterator iend = pit->insetlist.end();
- for ( ; ii != iend; ++ii)
- if (ii->inset == inset)
- return pit.outerPar();
- }
- lyxerr << "outerPar: should not happen" << endl;
- BOOST_ASSERT(false);
- return buf.paragraphs().size(); // shut up compiler
-}
-
-
-/// return the range of pars [beg, end[ owning the range of y [ystart, yend]
-void getParsInRange(ParagraphList & pars, int ystart, int yend,
- pit_type & beg, pit_type & end)
-{
- BOOST_ASSERT(!pars.empty());
- pit_type const endpar = pars.size();
- pit_type const begpar = 0;
-
- for (beg = endpar - 1; beg != begpar && pars[beg].y > ystart; --beg)
- ;
-
- for (end = beg ; end != endpar && pars[end].y <= yend; ++end)
- ;
-}
-
-
/// return the number of InsetOptArg in a paragraph
int numberOfOptArgs(Paragraph const & par)
{
int num = 0;
-
+
InsetList::const_iterator it = par.insetlist.begin();
InsetList::const_iterator end = par.insetlist.end();
for (; it != end ; ++it) {
- if (it->inset->lyxCode() == InsetBase::OPTARG_CODE)
+ if (it->inset->lyxCode() == InsetBase::OPTARG_CODE)
++num;
}
return num;
}
-
-