CutStack theCuts(10);
+// store whether the tabular stack is newer than the normal copy stack
+// FIXME: this is a workaround for bug 1919. Should be removed for 1.5,
+// when we (hopefully) have a one-for-all paste mechanism.
+bool dirty_tabular_stack_;
+
class resetOwnerAndChanges : public std::unary_function<Paragraph, void> {
public:
void operator()(Paragraph & p) const {
}
-void pasteSelectionHelper(LCursor & cur, size_t cut_index)
+pair<PitPosPair, pit_type>
+pasteSelectionHelper(Buffer const & buffer, ParagraphList & pars,
+ pit_type pit, int pos,
+ textclass_type tc, size_t cut_index, ErrorList & errorlist)
{
- recordUndo(cur);
- Buffer const & buffer = cur.buffer();
- InsetText & inset = static_cast<InsetText &>(cur.inset());
- pit_type pit = cur.pit();
- pos_type pos = cur.pos();
- pit_type endpit = pit;
- textclass_type const & tc = buffer.params().textclass;
- ErrorList errorlist;
-
- if (checkPastePossible(cut_index)) {
- ParagraphList & pars = inset.paragraphs();
- BOOST_ASSERT (pos <= pars[pit].size());
-
- // Make a copy of the CaP paragraphs.
- ParagraphList insertion = theCuts[cut_index].first;
- textclass_type const textclass = theCuts[cut_index].second;
-
- // Now remove all out of the pars which is NOT allowed in the
- // new environment and set also another font if that is required.
-
- // Convert newline to paragraph break in ERT inset.
- // This should not be here!
- if (pars[pit].inInset() &&
- pars[pit].inInset()->lyxCode() == InsetBase::ERT_CODE) {
- for (ParagraphList::size_type i = 0; i < insertion.size(); ++i) {
- for (pos_type j = 0; j < insertion[i].size(); ++j) {
- if (insertion[i].isNewline(j)) {
- insertion[i].erase(j);
- breakParagraphConservative(
- buffer.params(),
- insertion, i, j);
- }
+ if (!checkPastePossible(cut_index))
+ return make_pair(PitPosPair(pit, pos), pit);
+
+ BOOST_ASSERT (pos <= pars[pit].size());
+
+ // Make a copy of the CaP paragraphs.
+ ParagraphList insertion = theCuts[cut_index].first;
+ textclass_type const textclass = theCuts[cut_index].second;
+
+ // Now remove all out of the pars which is NOT allowed in the
+ // new environment and set also another font if that is required.
+
+ // Convert newline to paragraph break in ERT inset.
+ // This should not be here!
+ if (pars[pit].inInset() &&
+ pars[pit].inInset()->lyxCode() == InsetBase::ERT_CODE) {
+ for (ParagraphList::size_type i = 0; i < insertion.size(); ++i) {
+ for (pos_type j = 0; j < insertion[i].size(); ++j) {
+ if (insertion[i].isNewline(j)) {
+ insertion[i].erase(j);
+ breakParagraphConservative(
+ buffer.params(),
+ insertion, i, j);
}
}
}
+ }
- // Make sure there is no class difference.
- lyx::cap::SwitchBetweenClasses(textclass, tc, insertion, errorlist);
-
- ParagraphList::iterator tmpbuf = insertion.begin();
- int depth_delta = pars[pit].params().depth() - tmpbuf->params().depth();
-
- Paragraph::depth_type max_depth = pars[pit].getMaxDepthAfter();
-
- for (; tmpbuf != insertion.end(); ++tmpbuf) {
- // If we have a negative jump so that the depth would
- // go below 0 depth then we have to redo the delta to
- // this new max depth level so that subsequent
- // paragraphs are aligned correctly to this paragraph
- // at level 0.
- if (int(tmpbuf->params().depth()) + depth_delta < 0)
- depth_delta = 0;
-
- // Set the right depth so that we are not too deep or shallow.
- tmpbuf->params().depth(tmpbuf->params().depth() + depth_delta);
- if (tmpbuf->params().depth() > max_depth)
- tmpbuf->params().depth(max_depth);
-
- // Only set this from the 2nd on as the 2nd depends
- // for maxDepth still on pit.
- if (tmpbuf != insertion.begin())
- max_depth = tmpbuf->getMaxDepthAfter();
-
- // Set the inset owner of this paragraph.
- tmpbuf->setInsetOwner(pars[pit].inInset());
- for (pos_type i = 0; i < tmpbuf->size(); ++i) {
- if (tmpbuf->getChar(i) == Paragraph::META_INSET &&
- !inset.insetAllowed(tmpbuf->getInset(i)->lyxCode()))
- tmpbuf->erase(i--);
- }
+ // Make sure there is no class difference.
+ lyx::cap::SwitchBetweenClasses(textclass, tc, insertion, errorlist);
+
+ ParagraphList::iterator tmpbuf = insertion.begin();
+ int depth_delta = pars[pit].params().depth() - tmpbuf->params().depth();
+
+ Paragraph::depth_type max_depth = pars[pit].getMaxDepthAfter();
+
+ for (; tmpbuf != insertion.end(); ++tmpbuf) {
+ // If we have a negative jump so that the depth would
+ // go below 0 depth then we have to redo the delta to
+ // this new max depth level so that subsequent
+ // paragraphs are aligned correctly to this paragraph
+ // at level 0.
+ if (int(tmpbuf->params().depth()) + depth_delta < 0)
+ depth_delta = 0;
+
+ // Set the right depth so that we are not too deep or shallow.
+ tmpbuf->params().depth(tmpbuf->params().depth() + depth_delta);
+ if (tmpbuf->params().depth() > max_depth)
+ tmpbuf->params().depth(max_depth);
+
+ // Only set this from the 2nd on as the 2nd depends
+ // for maxDepth still on pit.
+ if (tmpbuf != insertion.begin())
+ max_depth = tmpbuf->getMaxDepthAfter();
+
+ // Set the inset owner of this paragraph.
+ tmpbuf->setInsetOwner(pars[pit].inInset());
+ for (pos_type i = 0; i < tmpbuf->size(); ++i) {
+ if (tmpbuf->getChar(i) == Paragraph::META_INSET &&
+ !pars[pit].insetAllowed(tmpbuf->getInset(i)->lyxCode()))
+ tmpbuf->erase(i--);
}
+ }
- bool const empty = pars[pit].empty();
- if (!empty) {
- // Make the buf exactly the same layout as the cursor
- // paragraph.
- insertion.begin()->makeSameLayout(pars[pit]);
- }
+ bool const empty = pars[pit].empty();
+ if (!empty) {
+ // Make the buf exactly the same layout as the cursor
+ // paragraph.
+ insertion.begin()->makeSameLayout(pars[pit]);
+ }
- // Prepare the paragraphs and insets for insertion.
- // A couple of insets store buffer references so need updating.
- InsetText in;
- std::swap(in.paragraphs(), insertion);
+ // Prepare the paragraphs and insets for insertion.
+ // A couple of insets store buffer references so need updating.
+ InsetText in;
+ std::swap(in.paragraphs(), insertion);
- ParIterator fpit = par_iterator_begin(in);
- ParIterator fend = par_iterator_end(in);
+ ParIterator fpit = par_iterator_begin(in);
+ ParIterator fend = par_iterator_end(in);
- for (; fpit != fend; ++fpit) {
- InsetList::iterator lit = fpit->insetlist.begin();
- InsetList::iterator eit = fpit->insetlist.end();
+ for (; fpit != fend; ++fpit) {
+ InsetList::iterator lit = fpit->insetlist.begin();
+ InsetList::iterator eit = fpit->insetlist.end();
- for (; lit != eit; ++lit) {
- switch (lit->inset->lyxCode()) {
- case InsetBase::TABULAR_CODE: {
- InsetTabular * it = static_cast<InsetTabular*>(lit->inset);
- it->buffer(&buffer);
- break;
- }
+ for (; lit != eit; ++lit) {
+ switch (lit->inset->lyxCode()) {
+ case InsetBase::TABULAR_CODE: {
+ InsetTabular * it = static_cast<InsetTabular*>(lit->inset);
+ it->buffer(&buffer);
+ break;
+ }
- default:
- break; // nothing
- }
+ default:
+ break; // nothing
}
}
- std::swap(in.paragraphs(), insertion);
+ }
+ std::swap(in.paragraphs(), insertion);
- // Split the paragraph for inserting the buf if necessary.
- if (!empty)
- breakParagraphConservative(buffer.params(), pars, pit, pos);
+ // Split the paragraph for inserting the buf if necessary.
+ if (!empty)
+ breakParagraphConservative(buffer.params(), pars, pit, pos);
- // Paste it!
- if (empty) {
- pars.insert(pars.begin() + pit, insertion.begin(),
- insertion.end());
+ // Paste it!
+ if (empty) {
+ pars.insert(pars.begin() + pit, insertion.begin(),
+ insertion.end());
- // merge the empty par with the last par of the insertion
- mergeParagraph(buffer.params(), pars,
- pit + insertion.size() - 1);
- } else {
- pars.insert(pars.begin() + pit + 1, insertion.begin(),
- insertion.end());
+ // merge the empty par with the last par of the insertion
+ mergeParagraph(buffer.params(), pars,
+ pit + insertion.size() - 1);
+ } else {
+ pars.insert(pars.begin() + pit + 1, insertion.begin(),
+ insertion.end());
- // merge the first par of the insertion with the current par
- mergeParagraph(buffer.params(), pars, pit);
- }
+ // merge the first par of the insertion with the current par
+ mergeParagraph(buffer.params(), pars, pit);
+ }
- pit_type last_paste = pit + insertion.size() - 1;
-
- // Store the new cursor position.
- pit = last_paste;
- pos = pars[last_paste].size();
-
- // Maybe some pasting.
- if (!empty && last_paste + 1 != pit_type(pars.size())) {
- if (pars[last_paste + 1].hasSameLayout(pars[last_paste])) {
- mergeParagraph(buffer.params(), pars, last_paste);
- } else if (pars[last_paste + 1].empty()) {
- pars[last_paste + 1].makeSameLayout(pars[last_paste]);
- mergeParagraph(buffer.params(), pars, last_paste);
- } else if (pars[last_paste].empty()) {
- pars[last_paste].makeSameLayout(pars[last_paste + 1]);
- mergeParagraph(buffer.params(), pars, last_paste);
- } else {
- pars[last_paste + 1].stripLeadingSpaces();
- ++last_paste;
- }
+ pit_type last_paste = pit + insertion.size() - 1;
+
+ // Store the new cursor position.
+ pit = last_paste;
+ pos = pars[last_paste].size();
+
+ // Maybe some pasting.
+ if (!empty && last_paste + 1 != pit_type(pars.size())) {
+ if (pars[last_paste + 1].hasSameLayout(pars[last_paste])) {
+ mergeParagraph(buffer.params(), pars, last_paste);
+ } else if (pars[last_paste + 1].empty()) {
+ pars[last_paste + 1].makeSameLayout(pars[last_paste]);
+ mergeParagraph(buffer.params(), pars, last_paste);
+ } else if (pars[last_paste].empty()) {
+ pars[last_paste].makeSameLayout(pars[last_paste + 1]);
+ mergeParagraph(buffer.params(), pars, last_paste);
+ } else {
+ pars[last_paste + 1].stripLeadingSpaces();
+ ++last_paste;
}
-
- endpit = last_paste + 1;
}
- bufferErrors(cur.buffer(), errorlist);
- cur.bv().showErrorList(_("Paste"));
- cur.clearSelection();
- cur.resetAnchor();
- BOOST_ASSERT(cur.text());
- cur.text()->setCursor(cur, pit, pos);
- cur.setSelection();
- updateCounters(cur.buffer());
+ return make_pair(PitPosPair(pit, pos), last_paste + 1);
}
pit_type startpit, pit_type endpit,
int startpos, int endpos, bool doclear)
{
+ // Start of selection is really invalid.
if (startpit == pit_type(pars.size()) ||
(startpos > pars[startpit].size()))
return PitPosPair(endpit, endpos);
+ // Start and end is inside same paragraph
if (endpit == pit_type(pars.size()) ||
startpit == endpit) {
endpos -= pars[startpit].erase(startpos, endpos);
return PitPosPair(endpit, endpos);
}
- // clear end/begin fragments of the first/last par in selection
bool all_erased = true;
+ // Clear fragments of the first par in selection
pars[startpit].erase(startpos, pars[startpit].size());
if (pars[startpit].size() != startpos)
all_erased = false;
+ // Clear fragments of the last par in selection
endpos -= pars[endpit].erase(0, endpos);
if (endpos != 0)
all_erased = false;
- // Loop through the deleted pars if any, erasing as needed
- for (pit_type pit = startpit + 1; pit != endpit;) {
- // "erase" the contents of the par
- pars[pit].erase(0, pars[pit].size());
- if (!pars[pit].size()) {
- // remove the par if it's now empty
- pars.erase(pars.begin() + pit);
- --endpit;
- } else {
- ++pit;
- all_erased = false;
+ // Erase all the "middle" paragraphs.
+ if (params.tracking_changes) {
+ // Look through the deleted pars if any, erasing as needed
+ for (pit_type pit = startpit + 1; pit != endpit;) {
+ // "erase" the contents of the par
+ pars[pit].erase(0, pars[pit].size());
+ if (pars[pit].empty()) {
+ // remove the par if it's now empty
+ pars.erase(pars.begin() + pit);
+ --endpit;
+ } else {
+ ++pit;
+ all_erased = false;
+ }
}
+ } else {
+ pars.erase(pars.begin() + startpit + 1, pars.begin() + endpit);
+ endpit = startpit + 1;
}
-
+
#if 0 // FIXME: why for cut but not copy ?
// the cut selection should begin with standard layout
if (realcut) {
pars[startpit + 1].stripLeadingSpaces();
}
- // paste the paragraphs again, if possible
+ // Merge first and last paragraph, if possible
if (all_erased &&
(pars[startpit].hasSameLayout(pars[startpit + 1]) ||
pars[startpit + 1].empty())) {
mergeParagraph(params, pars, startpit);
- // this because endpar gets deleted here!
+ // This because endpar gets deleted here!
endpit = startpit;
endpos = startpos;
}
return PitPosPair(endpit, endpos);
-
}
// Clone the paragraphs within the selection.
ParagraphList paragraphs(pars.begin() + startpit, pars.begin() + endpit + 1);
+
for_each(paragraphs.begin(), paragraphs.end(), resetOwnerAndChanges());
// Cut out the end of the last paragraph.
} // namespace anon
+
+
namespace lyx {
namespace cap {
return string();
string res = grabSelection(cur);
eraseSelection(cur);
- cur.selection() = false;
return res;
}
}
-int nrOfParagraphs()
+void cutSelection(LCursor & cur, bool doclear, bool realcut)
{
- return theCuts.empty() ? 0 : theCuts[0].first.size();
-}
+ // This doesn't make sense, if there is no selection
+ if (!cur.selection())
+ return;
+ // OK, we have a selection. This is always between cur.selBegin()
+ // and cur.selEnd()
-void cutSelection(LCursor & cur, bool doclear, bool realcut)
-{
if (cur.inTexted()) {
LyXText * text = cur.text();
BOOST_ASSERT(text);
// finished. The solution used currently just works, to make it
// faster we need to be more clever and probably also have more
// calls to stuffClipboard. (Lgb)
- cur.bv().stuffClipboard(cur.selectionAsString(true));
-
- // This doesn't make sense, if there is no selection
- if (!cur.selection())
- return;
-
- // OK, we have a selection. This is always between cur.selBegin()
- // and cur.selEnd()
+// cur.bv().stuffClipboard(cur.selectionAsString(true));
// make sure that the depth behind the selection are restored, too
recordUndoSelection(cur);
// need a valid cursor. (Lgb)
cur.clearSelection();
updateCounters(cur.buffer());
+
+ // tell tabular that a recent copy happened
+ dirtyTabularStack(false);
}
if (cur.inMathed()) {
- lyxerr << "cutSelection in mathed" << endl;
- LCursor tmp = cur;
- copySelection(cur);
- cur.selection() = false;
- eraseSelection(tmp);
+ if (cur.selBegin().idx() != cur.selEnd().idx()) {
+ // The current selection spans more than one cell.
+ // Record all cells
+ recordUndoInset(cur);
+ } else {
+ // Record only the current cell to avoid a jumping
+ // cursor after undo
+ recordUndo(cur);
+ }
+ if (realcut)
+ copySelection(cur);
+ eraseSelection(cur);
}
}
}
if (cur.inMathed()) {
- //lyxerr << "copySelection in mathed" << endl;
+ lyxerr << "copySelection in mathed" << endl;
ParagraphList pars;
pars.push_back(Paragraph());
BufferParams const & bp = cur.buffer().params();
pars.back().insert(0, grabSelection(cur), LyXFont());
theCuts.push(make_pair(pars, bp.textclass));
}
+ // tell tabular that a recent copy happened
+ dirtyTabularStack(false);
}
void pasteSelection(LCursor & cur, size_t sel_index)
{
// this does not make sense, if there is nothing to paste
+ lyxerr << "#### pasteSelection " << sel_index << endl;
if (!checkPastePossible(sel_index))
return;
- if (cur.inTexted())
- pasteSelectionHelper(cur, sel_index);
- if (cur.inMathed())
- lyxerr << "### should be handled in MathNest/GridInset" << endl;
+
+ if (cur.inTexted()) {
+ LyXText * text = cur.text();
+ BOOST_ASSERT(text);
+
+ recordUndo(cur);
+
+ pit_type endpit;
+ PitPosPair ppp;
+
+ ErrorList el;
+
+ boost::tie(ppp, endpit) =
+ pasteSelectionHelper(cur.buffer(),
+ text->paragraphs(),
+ cur.pit(), cur.pos(),
+ cur.buffer().params().textclass,
+ sel_index, el);
+ bufferErrors(cur.buffer(), el);
+ cur.bv().showErrorList(_("Paste"));
+
+ cur.clearSelection();
+ text->setCursor(cur, ppp.first, ppp.second);
+ cur.setSelection();
+ updateCounters(cur.buffer());
+ }
+
+ // mathed is handled in MathNestInset/MathGridInset
+ BOOST_ASSERT(!cur.inMathed());
}
cur.top() = i1;
if (i1.idx() == i2.idx()) {
i1.cell().erase(i1.pos(), i2.pos());
+ // We may have deleted i1.cell(cur.pos()).
+ // Make sure that pos is valid.
+ if (cur.pos() > cur.lastpos())
+ cur.pos() = cur.lastpos();
} else {
MathInset * p = i1.asMathInset();
InsetBase::row_type r1, r2;
// We've deleted the whole cell. Only pos 0 is valid.
cur.pos() = 0;
}
- cur.resetAnchor();
+ // need a valid cursor. (Lgb)
+ cur.clearSelection();
} else {
lyxerr << "can't erase this selection 1" << endl;
}
void selDel(LCursor & cur)
{
//lyxerr << "LCursor::selDel" << endl;
- if (cur.selection()) {
+ if (cur.selection())
eraseSelection(cur);
- cur.selection() = false;
- }
}
}
-string grabSelection(LCursor & cur)
+string grabSelection(LCursor const & cur)
{
if (!cur.selection())
return string();
+ // FIXME: What is wrong with the following?
+#if 0
+ std::ostringstream os;
+ for (DocIterator dit = cur.selectionBegin();
+ dit != cur.selectionEnd(); dit.forwardPos())
+ os << asString(dit.cell());
+ return os.str();
+#endif
+
CursorSlice i1 = cur.selBegin();
CursorSlice i2 = cur.selEnd();
}
+void dirtyTabularStack(bool b)
+{
+ dirty_tabular_stack_ = b;
+}
+
+
+bool tabularStackDirty()
+{
+ return dirty_tabular_stack_;
+}
+
+
} // namespace cap
} // namespace lyx
projects / lyx.git / blobdiff