X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCutAndPaste.cpp;h=4a93966b1dab340b742a70067741a877c903dd10;hb=447a1056b4f97b102db9666a131ce85001c0676c;hp=a1c4de5b359d778ca014f485ff1e2c1e86406709;hpb=6a21ec854b356fbbc89aaf99b2a23e4c3de4aca6;p=lyx.git diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp index a1c4de5b35..4a93966b1d 100644 --- a/src/CutAndPaste.cpp +++ b/src/CutAndPaste.cpp @@ -77,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 @@ -277,7 +278,13 @@ 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)); } @@ -292,8 +299,8 @@ pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist, // 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)); @@ -315,7 +322,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(); @@ -346,7 +353,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) @@ -393,7 +400,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(); @@ -595,10 +602,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; @@ -607,11 +614,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 { @@ -719,7 +724,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 @@ -792,6 +797,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) { @@ -806,10 +818,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 @@ -832,8 +844,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? @@ -841,7 +853,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 @@ -1012,7 +1027,7 @@ 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())); + theCuts.push(make_pair(pars, make_pair(bp.documentClassPtr(), bp.authors()))); // stuff the selection onto the X clipboard, from an explicit copy request putClipboard(theCuts[0].first, theCuts[0].second, plaintext, bp); @@ -1059,7 +1074,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()))); } } @@ -1117,7 +1132,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); } @@ -1161,24 +1176,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); @@ -1203,7 +1227,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; } @@ -1216,7 +1241,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; } @@ -1241,7 +1267,9 @@ bool pasteClipboardText(Cursor & cur, ErrorList & errorList, bool asParagraphs, if (buffer.readString(lyx)) { cur.recordUndo(); pasteParagraphList(cur, buffer.paragraphs(), - buffer.params().documentClassPtr(), errorList); + buffer.params().documentClassPtr(), + buffer.params().authors(), + errorList); return true; } } @@ -1279,7 +1307,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; } } @@ -1359,7 +1389,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); }