X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCutAndPaste.cpp;h=f79d4ace7c7dc8533df839c169e3e0ab8cc35c8b;hb=bca1b63d89e27b31b089ab48c63368640084b3a6;hp=8e0a72d6dda5068d155af22cb8081521f1b8a120;hpb=5fc2662b1301a8e04db0fa8695e06b363c1de60e;p=lyx.git diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp index 8e0a72d6dd..f79d4ace7c 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,27 +215,21 @@ 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(); - ParagraphList::iterator const end = insertion.end(); - ParagraphList::iterator par = insertion.begin(); - for (; par != end; ++par) { - Layout const & parLayout = par->layout(); + for (auto & par : insertion) { + Layout const & parLayout = par.layout(); if (forcePlainLayout || parLayout == defaultLayout) - par->setLayout(plainLayout); + par.setLayout(plainLayout); } } else { // check if we need to reset from plain layout - Layout const & defaultLayout = newDocClass->defaultLayout(); - Layout const & plainLayout = newDocClass->plainLayout(); - ParagraphList::iterator const end = insertion.end(); - ParagraphList::iterator par = insertion.begin(); - for (; par != end; ++par) { - Layout const & parLayout = par->layout(); + for (auto & par : insertion) { + Layout const & parLayout = par.layout(); if (parLayout == plainLayout) - par->setLayout(defaultLayout); + par.setLayout(defaultLayout); } } @@ -287,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)); } @@ -302,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)); @@ -325,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(); @@ -356,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) @@ -403,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(); @@ -466,17 +463,15 @@ pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist, // Paste it! if (empty) { - pars.insert(lyx::next(pars.begin(), pit), - insertion.begin(), - insertion.end()); + pars.insert(pars.iterator_at(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(lyx::next(pars.begin(), pit + 1), - insertion.begin(), - insertion.end()); + pars.insert(pars.iterator_at(pit + 1), + insertion.begin(), insertion.end()); // merge the first par of the insertion with the current par mergeParagraph(buffer.params(), pars, pit); @@ -607,10 +602,10 @@ Buffer * copyToTempBuffer(ParagraphList const & paragraphs, DocumentClassConstPt void putClipboard(ParagraphList const & paragraphs, - DocumentClassConstPtr docclass, docstring const & plaintext, - BufferParams const bp) + 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; @@ -619,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 { @@ -687,8 +680,8 @@ void copySelectionHelper(Buffer const & buf, Text const & text, LASSERT(startpit != endpit || start <= end, return); // Clone the paragraphs within the selection. - ParagraphList copy_pars(lyx::next(pars.begin(), startpit), - lyx::next(pars.begin(), endpit + 1)); + ParagraphList copy_pars(pars.iterator_at(startpit), + pars.iterator_at(endpit + 1)); // Remove the end of the last paragraph; afterwards, remove the // beginning of the first paragraph. Keep this order - there may only @@ -700,20 +693,17 @@ void copySelectionHelper(Buffer const & buf, Text const & text, Paragraph & front = copy_pars.front(); front.eraseChars(0, start, false); - ParagraphList::iterator it = copy_pars.begin(); - ParagraphList::iterator it_end = copy_pars.end(); - - for (; it != it_end; ++it) { + for (auto & par : copy_pars) { // Since we have a copy of the paragraphs, the insets // do not have a proper buffer reference. It makes // sense to add them temporarily, because the // operations below depend on that (acceptChanges included). - it->setInsetBuffers(const_cast(buf)); + par.setInsetBuffers(const_cast(buf)); // PassThru paragraphs have the Language // latex_language. This is invalid for others, so we // need to change it to the buffer language. - if (it->isPassThru()) - it->changeLanguage(buf.params(), + if (par.isPassThru()) + par.changeLanguage(buf.params(), latex_language, buf.language()); } @@ -729,13 +719,12 @@ void copySelectionHelper(Buffer const & buf, Text const & text, // do some final cleanup now, to make sure that the paragraphs // are not linked to something else. - it = copy_pars.begin(); - for (; it != it_end; ++it) { - it->resetBuffer(); - it->setInsetOwner(nullptr); + for (auto & par : copy_pars) { + par.resetBuffer(); + par.setInsetOwner(nullptr); } - cutstack.push(make_pair(copy_pars, dc)); + cutstack.push(make_pair(copy_pars, make_pair(dc, buf.params().authors()))); } } // namespace @@ -744,10 +733,10 @@ 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 & p = i1.inset(); + Inset const & p = i1.inset(); c1 = p.col(i1.idx()); c2 = p.col(i2.idx()); if (c1 > c2) @@ -808,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) { @@ -822,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 @@ -848,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? @@ -857,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 @@ -894,17 +893,11 @@ vector availableSelections(Buffer const * buf) if (!buf) return selList; - CutStack::const_iterator cit = theCuts.begin(); - CutStack::const_iterator end = theCuts.end(); - for (; cit != end; ++cit) { - // we do not use cit-> here because gcc 2.9x does not - // like it (JMarc) - ParagraphList const & pars = (*cit).first; + for (auto const & cut : theCuts) { + ParagraphList const & pars = cut.first; docstring textSel; - ParagraphList::const_iterator pit = pars.begin(); - ParagraphList::const_iterator pend = pars.end(); - for (; pit != pend; ++pit) { - Paragraph par(*pit, 0, 46); + for (auto const & para : pars) { + Paragraph par(para, 0, 46); // adapt paragraph to current buffer. par.setInsetBuffers(const_cast(*buf)); textSel += par.asString(AS_STR_INSETS); @@ -1034,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); @@ -1081,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()))); } } @@ -1095,7 +1088,7 @@ void copySelectionToStack() } -void copySelectionToTemp(Cursor & cur) +void copySelectionToTemp(Cursor const & cur) { copySelectionToStack(cur, tempCut); } @@ -1103,18 +1096,43 @@ void copySelectionToTemp(Cursor & cur) void copySelection(Cursor const & cur, docstring const & plaintext) { - // In tablemode, because copy and paste actually use special table stack - // we do not attempt to get selected paragraphs under cursor. Instead, a - // paragraph with the plain text version is generated so that table cells - // can be pasted as pure text somewhere else. + // In tablemode, because copy and paste actually use a special table stack, + // 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; - Paragraph par; BufferParams const & bp = cur.buffer()->params(); - par.setLayout(bp.documentClass().plainLayout()); - par.insert(0, plaintext, Font(), Change(Change::UNCHANGED)); - pars.push_back(par); - theCuts.push(make_pair(pars, bp.documentClassPtr())); + if (cur.inMathed()) { + Paragraph par; + par.setLayout(bp.documentClass().plainLayout()); + // Replace (column-separating) tabs by space (#4449) + docstring const clean_text = subst(plaintext, '\t', ' '); + // For pasting into text, we set the language to the paragraph language + // (rather than the default_language which is always English; see #11898) + par.insert(0, clean_text, Font(sane_font, par.getParLanguage(bp)), + Change(Change::UNCHANGED)); + pars.push_back(par); + } else { + // Get paragraphs from all cells + InsetTabular * table = cur.inset().asInsetTabular(); + LASSERT(table, return); + ParagraphList tplist = table->asParList(cur.selBegin().idx(), cur.selEnd().idx()); + for (auto & cpar : tplist) { + cpar.setLayout(bp.documentClass().plainLayout()); + pars.push_back(cpar); + // since the pars are merged later, we separate them by blank + Paragraph epar; + epar.insert(0, from_ascii(" "), Font(sane_font, epar.getParLanguage(bp)), + Change(Change::UNCHANGED)); + pars.push_back(epar); + } + // remove last empty par + pars.pop_back(); + // merge all paragraphs to one + while (pars.size() > 1) + mergeParagraph(bp, pars, 0); + } + theCuts.push(make_pair(pars, make_pair(bp.documentClassPtr(), bp.authors()))); } else { copySelectionToStack(cur, theCuts); } @@ -1158,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); @@ -1200,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; } @@ -1213,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; } @@ -1233,14 +1262,15 @@ bool pasteClipboardText(Cursor & cur, ErrorList & errorList, bool asParagraphs, theClipboard().hasTextContents(Clipboard::LyXTextType)) { string lyx = theClipboard().getAsLyX(); if (!lyx.empty()) { - // For some strange reason gcc 3.2 and 3.3 do not accept - // Buffer buffer(string(), false); - Buffer buffer("", false); + 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; } } @@ -1266,9 +1296,8 @@ bool pasteClipboardText(Cursor & cur, ErrorList & errorList, bool asParagraphs, docstring text = theClipboard().getAsText(types[i]); available = !text.empty(); if (available) { - // For some strange reason gcc 3.2 and 3.3 do not accept - // Buffer buffer(string(), false); - Buffer buffer("", false); + Buffer buffer(string(), false); + buffer.setInternal(true); buffer.setUnnamed(true); available = buffer.importString(names[i], text, errorList); if (available) @@ -1280,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; } } @@ -1360,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); } @@ -1376,10 +1409,10 @@ void replaceSelectionWithString(Cursor & cur, docstring const & str) // Insert the new string pos_type pos = cur.selEnd().pos(); Paragraph & par = cur.selEnd().paragraph(); - docstring::const_iterator cit = str.begin(); - docstring::const_iterator end = str.end(); - for (; cit != end; ++cit, ++pos) - par.insertChar(pos, *cit, font, cur.buffer()->params().track_changes); + for (auto const & c : str) { + par.insertChar(pos, c, font, cur.buffer()->params().track_changes); + ++pos; + } // Cut the selection cutSelection(cur, false); @@ -1414,20 +1447,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; @@ -1486,16 +1519,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()->