X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCutAndPaste.cpp;h=f79d4ace7c7dc8533df839c169e3e0ab8cc35c8b;hb=e4b80698be91708ce1b9fd86d6032245ef4f3dc7;hp=fc555c1375bf157f91ea57d7a39544fa1feaf50f;hpb=22193601bffd0dac4441e427780532c4ed27870f;p=lyx.git diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp index fc555c1375..f79d4ace7c 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 @@ -601,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; @@ -613,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 { @@ -725,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 @@ -798,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) { @@ -847,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 @@ -1018,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); @@ -1065,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()))); } } @@ -1123,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); } @@ -1167,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); @@ -1209,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; } @@ -1222,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; } @@ -1243,11 +1263,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,6 +1297,7 @@ bool pasteClipboardText(Cursor & cur, ErrorList & errorList, bool asParagraphs, available = !text.empty(); if (available) { Buffer buffer(string(), false); + buffer.setInternal(true); buffer.setUnnamed(true); available = buffer.importString(names[i], text, errorList); if (available) @@ -1285,7 +1309,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 +1391,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); }