X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fparagraph_funcs.C;h=a43217cc055591222a2b62d954aecafec8812a6d;hb=e2cd4d4c44f7c604a45dd9de9c9ade0d7c09eefc;hp=20f9bcb8191f28dc135d050512320206ff827b7a;hpb=6ae4dc23f47b751abcb418094b1bdf31331d239c;p=lyx.git diff --git a/src/paragraph_funcs.C b/src/paragraph_funcs.C index 20f9bcb819..a43217cc05 100644 --- a/src/paragraph_funcs.C +++ b/src/paragraph_funcs.C @@ -19,6 +19,7 @@ #include "encoding.h" #include "gettext.h" #include "language.h" +#include "lyxrow.h" #include "lyxtext.h" #include "outputparams.h" #include "paragraph_pimpl.h" @@ -35,7 +36,7 @@ #include using lyx::pos_type; -using lyx::par_type; +using lyx::pit_type; using lyx::support::ascii_lowercase; using lyx::support::bformat; @@ -57,7 +58,12 @@ using std::pair; 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); @@ -75,11 +81,9 @@ bool moveItem(Paragraph & from, Paragraph & to, 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; } @@ -88,7 +92,7 @@ bool moveItem(Paragraph & from, Paragraph & to, void breakParagraph(BufferParams const & bparams, - ParagraphList & pars, par_type par_offset, pos_type pos, int flag) + ParagraphList & pars, pit_type par_offset, pos_type pos, int flag) { // create a new paragraph, and insert into the list ParagraphList::iterator tmp = @@ -96,6 +100,9 @@ void breakParagraph(BufferParams const & bparams, Paragraph & par = pars[par_offset]; + // we will invalidate the row cache + par.rows().clear(); + // without doing that we get a crash when typing at the // end of a paragraph tmp->layout(bparams.getLyXTextClass().defaultLayout()); @@ -159,10 +166,11 @@ void breakParagraph(BufferParams const & bparams, 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) { par.layout(tmp->layout()); @@ -182,12 +190,15 @@ void breakParagraph(BufferParams const & bparams, void breakParagraphConservative(BufferParams const & bparams, - ParagraphList & pars, par_type par_offset, pos_type pos) + ParagraphList & pars, pit_type par_offset, pos_type pos) { // create a new paragraph 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()? @@ -197,18 +208,24 @@ void breakParagraphConservative(BufferParams const & bparams, // 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); + } } } void mergeParagraph(BufferParams const & bparams, - ParagraphList & pars, par_type par_offset) + ParagraphList & pars, pit_type par_offset) { Paragraph & next = pars[par_offset + 1]; Paragraph & par = pars[par_offset]; @@ -217,18 +234,20 @@ void mergeParagraph(BufferParams const & bparams, 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); } -par_type depthHook(par_type pit, +pit_type depthHook(pit_type pit, ParagraphList const & pars, Paragraph::depth_type depth) { - par_type newpit = pit; + pit_type newpit = pit; if (newpit != 0) --newpit; @@ -243,7 +262,7 @@ par_type depthHook(par_type pit, } -par_type outerHook(par_type par_offset, ParagraphList const & pars) +pit_type outerHook(pit_type par_offset, ParagraphList const & pars) { Paragraph const & par = pars[par_offset]; @@ -253,11 +272,11 @@ par_type outerHook(par_type par_offset, ParagraphList const & pars) } -bool isFirstInSequence(par_type par_offset, ParagraphList const & pars) +bool isFirstInSequence(pit_type par_offset, ParagraphList const & pars) { Paragraph const & par = pars[par_offset]; - par_type dhook_offset = depthHook(par_offset, pars, par.getDepth()); + pit_type dhook_offset = depthHook(par_offset, pars, par.getDepth()); Paragraph const & dhook = pars[dhook_offset]; @@ -267,16 +286,16 @@ bool isFirstInSequence(par_type par_offset, ParagraphList const & pars) } -int getEndLabel(par_type p, ParagraphList const & pars) +int getEndLabel(pit_type p, ParagraphList const & pars) { - par_type pit = p; + pit_type pit = p; Paragraph::depth_type par_depth = pars[p].getDepth(); - while (pit != par_type(pars.size())) { + while (pit != pit_type(pars.size())) { LyXLayout_ptr const & layout = pars[pit].layout(); int const endlabeltype = layout->endlabeltype; if (endlabeltype != END_LABEL_NO_LABEL) { - if (p + 1 == par_type(pars.size())) + if (p + 1 == pit_type(pars.size())) return endlabeltype; Paragraph::depth_type const next_depth = @@ -289,24 +308,24 @@ int getEndLabel(par_type p, ParagraphList const & pars) if (par_depth == 0) break; pit = outerHook(pit, pars); - if (pit != par_type(pars.size())) + if (pit != pit_type(pars.size())) par_depth = pars[pit].getDepth(); } return END_LABEL_NO_LABEL; } -LyXFont const outerFont(par_type par_offset, ParagraphList const & pars) +LyXFont const outerFont(pit_type par_offset, ParagraphList const & pars) { Paragraph::depth_type par_depth = pars[par_offset].getDepth(); LyXFont tmpfont(LyXFont::ALL_INHERIT); // Resolve against environment font information - while (par_offset != par_type(pars.size()) + while (par_offset != pit_type(pars.size()) && par_depth && !tmpfont.resolved()) { par_offset = outerHook(par_offset, pars); - if (par_offset != par_type(pars.size())) { + if (par_offset != pit_type(pars.size())) { tmpfont.realize(pars[par_offset].layout()->font); par_depth = pars[par_offset].getDepth(); } @@ -316,57 +335,16 @@ LyXFont const outerFont(par_type par_offset, ParagraphList const & pars) } -par_type outerPar(Buffer const & buf, InsetBase const * inset) -{ - ParIterator pit = const_cast(buf).par_iterator_begin(); - ParIterator end = const_cast(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, - par_type & beg, par_type & end) -{ - BOOST_ASSERT(!pars.empty()); - par_type const endpar = pars.size(); - par_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; } - -