X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCutAndPaste.cpp;h=b5147ae6e011334f661acdb618788594750a3a7a;hb=5cb80b867f4a59c3253487652ba74a29ad5b3f0f;hp=0d91b98bca90ada8395e96b6721c523f20affd8b;hpb=715b8cda54a2aded29260b57ff201b16fd906f21;p=lyx.git diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp index 0d91b98bca..b5147ae6e0 100644 --- a/src/CutAndPaste.cpp +++ b/src/CutAndPaste.cpp @@ -15,9 +15,9 @@ #include "CutAndPaste.h" +#include "Author.h" #include "BranchList.h" #include "Buffer.h" -#include "buffer_funcs.h" #include "BufferList.h" #include "BufferParams.h" #include "BufferView.h" @@ -28,7 +28,6 @@ #include "FuncCode.h" #include "FuncRequest.h" #include "InsetIterator.h" -#include "InsetList.h" #include "Language.h" #include "LyX.h" #include "LyXRC.h" @@ -42,7 +41,6 @@ #include "insets/InsetBranch.h" #include "insets/InsetCitation.h" #include "insets/InsetCommand.h" -#include "insets/InsetFlex.h" #include "insets/InsetGraphics.h" #include "insets/InsetGraphicsParams.h" #include "insets/InsetInclude.h" @@ -61,13 +59,11 @@ #include "support/lassert.h" #include "support/limited_stack.h" #include "support/lstrings.h" -#include "support/lyxalgo.h" #include "support/TempFile.h" #include "support/unique_ptr.h" #include "frontends/alert.h" #include "frontends/Clipboard.h" -#include "frontends/Selection.h" #include #include @@ -81,8 +77,9 @@ namespace lyx { namespace { typedef pair PitPosPair; +typedef pair DocInfoPair; -typedef limited_stack > CutStack; +typedef limited_stack > CutStack; CutStack theCuts(10); // persistent selection, cleared until the next selection @@ -218,10 +215,10 @@ pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist, // set the paragraphs to plain layout if necessary DocumentClassConstPtr newDocClass = buffer.params().documentClassPtr(); + Layout const & plainLayout = newDocClass->plainLayout(); + Layout const & defaultLayout = newDocClass->defaultLayout(); if (cur.inset().usePlainLayout()) { bool forcePlainLayout = target_inset->forcePlainLayout(); - Layout const & plainLayout = newDocClass->plainLayout(); - Layout const & defaultLayout = newDocClass->defaultLayout(); for (auto & par : insertion) { Layout const & parLayout = par.layout(); if (forcePlainLayout || parLayout == defaultLayout) @@ -229,8 +226,6 @@ pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist, } } else { // check if we need to reset from plain layout - Layout const & defaultLayout = newDocClass->defaultLayout(); - Layout const & plainLayout = newDocClass->plainLayout(); for (auto & par : insertion) { Layout const & parLayout = par.layout(); if (parLayout == plainLayout) @@ -283,23 +278,42 @@ pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist, tmpbuf->eraseChar(i--, false); } - if (lyxrc.ct_markup_copied) + if (lyxrc.ct_markup_copied) { + // Only change to inserted if ct is active, + // otherwise leave markup as is + if (buffer.params().track_changes) + tmpbuf->setChange(Change(Change::INSERTED)); + } else + // Resolve all markup to inserted or unchanged tmpbuf->setChange(Change(buffer.params().track_changes ? Change::INSERTED : Change::UNCHANGED)); } - bool const empty = pars[pit].empty(); - if (!empty) { - // Make the buf exactly the same layout as the cursor - // paragraph. + bool const target_empty = pars[pit].empty(); + // Use the paste content's layout, if... + bool const paste_layout = + // if target paragraph is empty + (target_empty + // ... and its layout is default + && (pars[pit].layout() == defaultLayout + // ... or plain + || pars[pit].layout() == plainLayout + // ... or the paste content spans several paragraphs + || insertion.size() > 1)) + // or if pasting is done at the beginning of paragraph + || (pos == 0 + // and the paste content spans several paragraphs + && insertion.size() > 1); + if (!paste_layout) + // Give the first paragraph to insert the same layout as the + // target paragraph. insertion.begin()->makeSameLayout(pars[pit]); - } // Prepare the paragraphs and insets for insertion. insertion.swap(in.paragraphs()); - InsetIterator const i_end = inset_iterator_end(in); - for (InsetIterator it = inset_iterator_begin(in); it != i_end; ++it) { + InsetIterator const i_end = end(in); + for (InsetIterator it = begin(in); it != i_end; ++it) { // Even though this will also be done later, it has to be done here // since some inset might try to access the buffer() member. it->setBuffer(const_cast(buffer)); @@ -321,7 +335,7 @@ pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist, if (oldname == newname) continue; // adapt the references - for (InsetIterator itt = inset_iterator_begin(in); + for (InsetIterator itt = begin(in); itt != i_end; ++itt) { if (itt->lyxCode() == REF_CODE) { InsetCommand * ref = itt->asInsetCommand(); @@ -352,7 +366,7 @@ pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist, if (oldname == newname) break; // adapt the references - for (InsetIterator itt = inset_iterator_begin(in); itt != i_end; ++itt) { + for (InsetIterator itt = begin(in); itt != i_end; ++itt) { if (itt->lyxCode() == REF_CODE) { InsetCommand & ref = static_cast(*itt); if (ref.getParam("reference") == oldname) @@ -399,7 +413,7 @@ pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist, if (oldkey == newkey) break; // adapt the references - for (InsetIterator itt = inset_iterator_begin(in); + for (InsetIterator itt = begin(in); itt != i_end; ++itt) { if (itt->lyxCode() == CITE_CODE) { InsetCommand * ref = itt->asInsetCommand(); @@ -457,11 +471,17 @@ pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist, insertion.swap(in.paragraphs()); // Split the paragraph for inserting the buf if necessary. - if (!empty) + if (!target_empty) breakParagraphConservative(buffer.params(), pars, pit, pos); + // If multiple paragraphs are inserted before the target paragraph, + // the cursor is now in a new paragraph before it, + // so use layout from paste content in that case. + if (pos == 0 && insertion.size() > 1) + pars[pit].makeSameLayout(* insertion.begin()); + // Paste it! - if (empty) { + if (target_empty) { pars.insert(pars.iterator_at(pit), insertion.begin(), insertion.end()); @@ -490,7 +510,7 @@ pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist, // Join (conditionally) last pasted paragraph with next one, i.e., // the tail of the spliced document paragraph - if (!empty && last_paste + 1 != pit_type(pars.size())) { + if (!target_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()) { @@ -534,10 +554,7 @@ PitPosPair eraseSelectionHelper(BufferParams const & params, pars[pit].eraseChars(left, right, params.track_changes); // Separate handling of paragraph break: - if (merge && pit != endpit && - (pit + 1 != endpit - || pars[pit].hasSameLayout(pars[endpit]) - || pars[endpit].size() == endpos)) { + if (merge && pit != endpit) { if (pit + 1 == endpit) endpos += pars[pit].size(); mergeParagraph(params, pars, pit); @@ -601,10 +618,10 @@ Buffer * copyToTempBuffer(ParagraphList const & paragraphs, DocumentClassConstPt void putClipboard(ParagraphList const & paragraphs, - DocumentClassConstPtr docclass, docstring const & plaintext, + DocInfoPair docinfo, docstring const & plaintext, BufferParams const & bp) { - Buffer * buffer = copyToTempBuffer(paragraphs, docclass); + Buffer * buffer = copyToTempBuffer(paragraphs, docinfo.first); if (!buffer) // already asserted in copyToTempBuffer() return; @@ -613,11 +630,9 @@ void putClipboard(ParagraphList const & paragraphs, // applications, the number that can parse it should go up in the future. buffer->params().html_math_output = BufferParams::MathML; - if (lyxrc.ct_markup_copied) { - // Copy authors to the params. We need those pointers. - for (Author const & a : bp.authors()) - buffer->params().authors().record(a); - } + // Copy authors to the params. We need those pointers. + for (Author const & a : bp.authors()) + buffer->params().authors().record(a); // Make sure MarkAsExporting is deleted before buffer is { @@ -725,7 +740,7 @@ void copySelectionHelper(Buffer const & buf, Text const & text, par.setInsetOwner(nullptr); } - cutstack.push(make_pair(copy_pars, dc)); + cutstack.push(make_pair(copy_pars, make_pair(dc, buf.params().authors()))); } } // namespace @@ -734,8 +749,8 @@ void copySelectionHelper(Buffer const & buf, Text const & text, namespace cap { void region(CursorSlice const & i1, CursorSlice const & i2, - Inset::row_type & r1, Inset::row_type & r2, - Inset::col_type & c1, Inset::col_type & c2) + row_type & r1, row_type & r2, + col_type & c1, col_type & c2) { Inset const & p = i1.inset(); c1 = p.col(i1.idx()); @@ -798,6 +813,13 @@ bool multipleCellsSelected(CursorData const & cur) } +void switchBetweenClasses(DocumentClassConstPtr oldone, + DocumentClassConstPtr newone, InsetText & in) { + ErrorList el = {}; + switchBetweenClasses(oldone, newone, in, el); +} + + void switchBetweenClasses(DocumentClassConstPtr oldone, DocumentClassConstPtr newone, InsetText & in, ErrorList & errorlist) { @@ -812,10 +834,10 @@ void switchBetweenClasses(DocumentClassConstPtr oldone, // layouts ParIterator it = par_iterator_begin(in); - ParIterator end = par_iterator_end(in); + ParIterator pend = par_iterator_end(in); // for remembering which layouts we've had to add set newlayouts; - for (; it != end; ++it) { + for (; it != pend; ++it) { docstring const name = it->layout().name(); // the pasted text will keep their own layout name. If this layout does @@ -838,8 +860,8 @@ void switchBetweenClasses(DocumentClassConstPtr oldone, } // character styles and hidden table cells - InsetIterator const i_end = inset_iterator_end(in); - for (InsetIterator iit = inset_iterator_begin(in); iit != i_end; ++iit) { + InsetIterator const i_end = end(in); + for (InsetIterator iit = begin(in); iit != i_end; ++iit) { InsetCode const code = iit->lyxCode(); if (code == FLEX_CODE) { // FIXME: Should we verify all InsetCollapsible? @@ -847,7 +869,10 @@ void switchBetweenClasses(DocumentClassConstPtr oldone, docstring const & n = newone->insetLayout(layoutName).name(); bool const is_undefined = n.empty() || n == DocumentClass::plainInsetLayout().name(); - if (!is_undefined) + docstring const & oldn = oldone->insetLayout(layoutName).name(); + bool const was_undefined = oldn.empty() || + oldn == DocumentClass::plainInsetLayout().name(); + if (!is_undefined || was_undefined) continue; // The flex inset is undefined in newtc @@ -1009,7 +1034,9 @@ void copySelection(Cursor const & cur) } -void copyInset(Cursor const & cur, Inset * inset, docstring const & plaintext) +namespace { + +void copyInsetToStack(Cursor const & cur, CutStack & cutstack, Inset * inset) { ParagraphList pars; Paragraph par; @@ -1018,13 +1045,28 @@ void copyInset(Cursor const & cur, Inset * inset, docstring const & plaintext) Font font(inherit_font, bp.language); par.insertInset(0, inset, font, Change(Change::UNCHANGED)); pars.push_back(par); - theCuts.push(make_pair(pars, bp.documentClassPtr())); + cutstack.push(make_pair(pars, make_pair(bp.documentClassPtr(), bp.authors()))); +} + +} + + +void copyInset(Cursor const & cur, Inset * inset, docstring const & plaintext) +{ + copyInsetToStack(cur, theCuts, inset); // stuff the selection onto the X clipboard, from an explicit copy request + BufferParams const & bp = cur.buffer()->params(); putClipboard(theCuts[0].first, theCuts[0].second, plaintext, bp); } +void copyInsetToTemp(Cursor const & cur, Inset * inset) +{ + copyInsetToStack(cur, tempCut, inset); +} + + namespace { void copySelectionToStack(CursorData const & cur, CutStack & cutstack) @@ -1065,7 +1107,7 @@ void copySelectionToStack(CursorData const & cur, CutStack & cutstack) par.insert(0, grabSelection(cur), Font(sane_font, par.getParLanguage(bp)), Change(Change::UNCHANGED)); pars.push_back(par); - cutstack.push(make_pair(pars, bp.documentClassPtr())); + cutstack.push(make_pair(pars, make_pair(bp.documentClassPtr(), bp.authors()))); } } @@ -1088,7 +1130,7 @@ void copySelectionToTemp(Cursor const & cur) void copySelection(Cursor const & cur, docstring const & plaintext) { // In tablemode, because copy and paste actually use a special table stack, - // we need to go through the cells and collect the paragraphs. + // we need to go through the cells and collect the paragraphs. // In math matrices, we generate a plain text version. if (cur.selBegin().idx() != cur.selEnd().idx()) { ParagraphList pars; @@ -1123,7 +1165,7 @@ void copySelection(Cursor const & cur, docstring const & plaintext) while (pars.size() > 1) mergeParagraph(bp, pars, 0); } - theCuts.push(make_pair(pars, bp.documentClassPtr())); + theCuts.push(make_pair(pars, make_pair(bp.documentClassPtr(), bp.authors()))); } else { copySelectionToStack(cur, theCuts); } @@ -1167,24 +1209,33 @@ void clearCutStack() } -docstring selection(size_t sel_index, DocumentClassConstPtr docclass) +docstring selection(size_t sel_index, DocInfoPair docinfo, bool for_math) { if (sel_index >= theCuts.size()) return docstring(); unique_ptr buffer(copyToTempBuffer(theCuts[sel_index].first, - docclass)); + docinfo.first)); if (!buffer) return docstring(); - return buffer->paragraphs().back().asString(AS_STR_INSETS | AS_STR_NEWLINES); + int options = AS_STR_INSETS | AS_STR_NEWLINES; + if (for_math) + options |= AS_STR_MATHED; + + return buffer->paragraphs().back().asString(options); } void pasteParagraphList(Cursor & cur, ParagraphList const & parlist, - DocumentClassConstPtr docclass, ErrorList & errorList, + DocumentClassConstPtr docclass, AuthorList const & authors, + ErrorList & errorList, cap::BranchAction branchAction) { + // Copy authors to the params. We need those pointers. + for (Author const & a : authors) + cur.buffer()->params().authors().record(a); + if (cur.inTexted()) { Text * text = cur.text(); LBUFERR(text); @@ -1209,7 +1260,8 @@ bool pasteFromStack(Cursor & cur, ErrorList & errorList, size_t sel_index) cur.recordUndo(); pasteParagraphList(cur, theCuts[sel_index].first, - theCuts[sel_index].second, errorList, BRANCH_ASK); + theCuts[sel_index].second.first, theCuts[sel_index].second.second, + errorList, BRANCH_ASK); return true; } @@ -1222,7 +1274,8 @@ bool pasteFromTemp(Cursor & cur, ErrorList & errorList) cur.recordUndo(); pasteParagraphList(cur, tempCut[0].first, - tempCut[0].second, errorList, BRANCH_IGNORE); + tempCut[0].second.first, tempCut[0].second.second, + errorList, BRANCH_IGNORE); return true; } @@ -1243,11 +1296,14 @@ bool pasteClipboardText(Cursor & cur, ErrorList & errorList, bool asParagraphs, string lyx = theClipboard().getAsLyX(); if (!lyx.empty()) { Buffer buffer(string(), false); + buffer.setInternal(true); buffer.setUnnamed(true); if (buffer.readString(lyx)) { cur.recordUndo(); pasteParagraphList(cur, buffer.paragraphs(), - buffer.params().documentClassPtr(), errorList); + buffer.params().documentClassPtr(), + buffer.params().authors(), + errorList); return true; } } @@ -1274,7 +1330,9 @@ bool pasteClipboardText(Cursor & cur, ErrorList & errorList, bool asParagraphs, available = !text.empty(); if (available) { Buffer buffer(string(), false); + buffer.setInternal(true); buffer.setUnnamed(true); + buffer.params() = cur.buffer()->params(); available = buffer.importString(names[i], text, errorList); if (available) available = !buffer.paragraphs().empty(); @@ -1285,7 +1343,9 @@ bool pasteClipboardText(Cursor & cur, ErrorList & errorList, bool asParagraphs, buffer.changeLanguage(buffer.language(), cur.getFont().language()); cur.recordUndo(); pasteParagraphList(cur, buffer.paragraphs(), - buffer.params().documentClassPtr(), errorList); + buffer.params().documentClassPtr(), + buffer.params().authors(), + errorList); return true; } } @@ -1365,7 +1425,9 @@ void pasteSelection(Cursor & cur, ErrorList & errorList) return; cur.recordUndo(); pasteParagraphList(cur, selectionBuffer[0].first, - selectionBuffer[0].second, errorList); + selectionBuffer[0].second.first, + selectionBuffer[0].second.second, + errorList); } @@ -1419,20 +1481,20 @@ void eraseSelection(Cursor & cur) cur.pos() = cur.lastpos(); } else if (p->nrows() > 0 && p->ncols() > 0) { // This is a grid, delete a nice square region - Inset::row_type r1, r2; - Inset::col_type c1, c2; + row_type r1, r2; + col_type c1, c2; region(i1, i2, r1, r2, c1, c2); - for (Inset::row_type row = r1; row <= r2; ++row) - for (Inset::col_type col = c1; col <= c2; ++col) + for (row_type row = r1; row <= r2; ++row) + for (col_type col = c1; col <= c2; ++col) p->cell(p->index(row, col)).clear(); // We've deleted the whole cell. Only pos 0 is valid. cur.pos() = 0; } else { - Inset::idx_type idx1 = i1.idx(); - Inset::idx_type idx2 = i2.idx(); + idx_type idx1 = i1.idx(); + idx_type idx2 = i2.idx(); if (idx1 > idx2) swap(idx1, idx2); - for (Inset::idx_type idx = idx1 ; idx <= idx2; ++idx) + for (idx_type idx = idx1 ; idx <= idx2; ++idx) p->cell(idx).clear(); // We've deleted the whole cell. Only pos 0 is valid. cur.pos() = 0; @@ -1491,16 +1553,16 @@ docstring grabSelection(CursorData const & cur) } } - Inset::row_type r1, r2; - Inset::col_type c1, c2; + row_type r1, r2; + col_type c1, c2; region(i1, i2, r1, r2, c1, c2); docstring data; if (i1.inset().asInsetMath()) { - for (Inset::row_type row = r1; row <= r2; ++row) { + for (row_type row = r1; row <= r2; ++row) { if (row > r1) data += "\\\\"; - for (Inset::col_type col = c1; col <= c2; ++col) { + for (col_type col = c1; col <= c2; ++col) { if (col > c1) data += '&'; data += asString(i1.asInsetMath()->