#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;
}
{
// create a new paragraph, and insert into the list
ParagraphList::iterator tmp =
- pars.insert(pars.begin() + par_offset + 1, Paragraph());
+ pars.insert(boost::next(pars.begin(), par_offset + 1),
+ Paragraph());
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());
if (flag) {
tmp->layout(par.layout());
tmp->setLabelWidthString(par.params().labelWidthString());
+ tmp->params().depth(par.params().depth());
}
bool const isempty = (par.allowEmpty() && par.empty());
// Make sure that we keep the language when
// breaking paragrpah.
if (tmp->empty()) {
- LyXFont changed = tmp->getFirstFontSettings();
+ LyXFont changed = tmp->getFirstFontSettings(bparams);
LyXFont old = par.getFontSettings(bparams, par.size());
changed.setLanguage(old.language());
tmp->setFont(0, changed);
return;
}
- par.params().clear();
-
- par.layout(bparams.getLyXTextClass().defaultLayout());
+ if (!isempty) {
+ par.params().clear();
+ par.layout(bparams.getLyXTextClass().defaultLayout());
+ }
// layout stays the same with latex-environments
if (flag) {
ParagraphList & pars, pit_type par_offset, pos_type pos)
{
// create a new paragraph
- Paragraph & tmp = *pars.insert(pars.begin() + par_offset + 1, Paragraph());
+ Paragraph & tmp = *pars.insert(boost::next(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)
+ }
+ // Move over end-of-par change attr
+ tmp.setChange(tmp.size(), par.lookupChange(par.size()));
+
+ // 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_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
+ par.setChange(par.size(), Change::UNCHANGED);
+
+ Change::Type cr = next.lookupChange(next.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;
+ }
+ // Move the change status of "carriage return" over
+ par.setChange(par.size(), cr);
- pars.erase(pars.begin() + par_offset + 1);
+ pars.erase(boost::next(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)
{
}
return num;
}
-
-