X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCutAndPaste.cpp;h=0598e87285dc7e7fff6ba279b04f36634b90103f;hb=45eb314a863a7bc76c2880f2352b7b430eeaf1c0;hp=def56831b6ac2314c5a09f6cbb5b0fc8be89bf51;hpb=c14b9e67bcf6ac16534a6d37df766c4583722045;p=lyx.git diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp index def56831b6..0598e87285 100644 --- a/src/CutAndPaste.cpp +++ b/src/CutAndPaste.cpp @@ -60,6 +60,7 @@ #include "support/lassert.h" #include "support/limited_stack.h" #include "support/lstrings.h" +#include "support/TempFile.h" #include "frontends/alert.h" #include "frontends/Clipboard.h" @@ -98,23 +99,35 @@ bool checkPastePossible(int index) } -pair -pasteSelectionHelper(Cursor const & cur, ParagraphList const & parlist, - DocumentClassConstPtr oldDocClass, ErrorList & errorlist) +struct PasteReturnValue { + PasteReturnValue(pit_type r_par, pos_type r_pos, bool r_nu) : + par(r_par), pos(r_pos), needupdate(r_nu) + {} + + pit_type par; + pos_type pos; + bool needupdate; +}; + +PasteReturnValue +pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist, + DocumentClassConstPtr oldDocClass, Buffer * tmpbuffer, + ErrorList & errorlist) { Buffer const & buffer = *cur.buffer(); pit_type pit = cur.pit(); pos_type pos = cur.pos(); + bool need_update = false; InsetText * target_inset = cur.inset().asInsetText(); if (!target_inset) { InsetTabular * it = cur.inset().asInsetTabular(); target_inset = it? it->cell(cur.idx())->asInsetText() : 0; } - LASSERT(target_inset, return make_pair(PitPosPair(pit, pos), pit)); + LASSERT(target_inset, return PasteReturnValue(pit, pos, need_update)); ParagraphList & pars = target_inset->paragraphs(); if (parlist.empty()) - return make_pair(PitPosPair(pit, pos), pit); + return PasteReturnValue(pit, pos, need_update); BOOST_ASSERT (pos <= pars[pit].size()); @@ -197,10 +210,8 @@ pasteSelectionHelper(Cursor const & cur, ParagraphList const & parlist, 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 max_depth for the next paragraph + max_depth = tmpbuf->getMaxDepthAfter(); // Set the inset owner of this paragraph. tmpbuf->setInsetOwner(target_inset); @@ -211,7 +222,7 @@ pasteSelectionHelper(Cursor const & cur, ParagraphList const & parlist, tmpbuf->eraseChar(i--, false); } - tmpbuf->setChange(Change(buffer.params().trackChanges ? + tmpbuf->setChange(Change(buffer.params().track_changes ? Change::INSERTED : Change::UNCHANGED)); } @@ -244,7 +255,7 @@ pasteSelectionHelper(Cursor const & cur, ParagraphList const & parlist, docstring const oldname = lab->getParam("name"); lab->updateLabel(oldname); // We need to update the buffer reference cache. - cur.forceBufferUpdate(); + need_update = true; docstring const newname = lab->getParam("name"); if (oldname == newname) continue; @@ -275,7 +286,7 @@ pasteSelectionHelper(Cursor const & cur, ParagraphList const & parlist, docstring const oldname = lab.getParam("name"); lab.updateLabel(oldname); // We need to update the buffer reference cache. - cur.forceBufferUpdate(); + need_update = true; docstring const newname = lab.getParam("name"); if (oldname == newname) break; @@ -302,7 +313,7 @@ pasteSelectionHelper(Cursor const & cur, ParagraphList const & parlist, InsetInclude & inc = static_cast(*it); inc.updateCommand(); // We need to update the list of included files. - cur.forceBufferUpdate(); + need_update = true; break; } @@ -312,7 +323,7 @@ pasteSelectionHelper(Cursor const & cur, ParagraphList const & parlist, docstring const oldkey = bib.getParam("key"); bib.updateCommand(oldkey, false); // We need to update the buffer reference cache. - cur.forceBufferUpdate(); + need_update = true; docstring const newkey = bib.getParam("key"); if (oldkey == newkey) break; @@ -341,17 +352,23 @@ pasteSelectionHelper(Cursor const & cur, ParagraphList const & parlist, || (is_child && (branchlist.find(name) || buffer.masterBuffer()->params().branchlist().find(name)))) break; - // FIXME: add an option to add the branch to the master's BranchList. - docstring text = bformat( + if (tmpbuffer) { + // This is for a temporary buffer, so simply create the branch. + // Must not use lyx::dispatch(), since tmpbuffer has no view. + DispatchResult dr; + tmpbuffer->dispatch(FuncRequest(LFUN_BRANCH_ADD, name), dr); + } else { + docstring text = bformat( _("The pasted branch \"%1$s\" is undefined.\n" "Do you want to add it to the document's branch list?"), name); - if (frontend::Alert::prompt(_("Unknown branch"), + if (frontend::Alert::prompt(_("Unknown branch"), text, 0, 1, _("&Add"), _("&Don't Add")) != 0) - break; - lyx::dispatch(FuncRequest(LFUN_BRANCH_ADD, name)); + break; + lyx::dispatch(FuncRequest(LFUN_BRANCH_ADD, name)); + } // We need to update the list of branches. - cur.forceBufferUpdate(); + need_update = true; break; } @@ -407,12 +424,12 @@ pasteSelectionHelper(Cursor const & cur, ParagraphList const & parlist, pars[last_paste].makeSameLayout(pars[last_paste + 1]); mergeParagraph(buffer.params(), pars, last_paste); } else { - pars[last_paste + 1].stripLeadingSpaces(buffer.params().trackChanges); + pars[last_paste + 1].stripLeadingSpaces(buffer.params().track_changes); ++last_paste; } } - return make_pair(PitPosPair(pit, pos), last_paste + 1); + return PasteReturnValue(pit, pos, need_update); } @@ -428,17 +445,17 @@ PitPosPair eraseSelectionHelper(BufferParams const & params, // Start and end is inside same paragraph if (endpit == pit_type(pars.size()) || startpit == endpit) { - endpos -= pars[startpit].eraseChars(startpos, endpos, params.trackChanges); + endpos -= pars[startpit].eraseChars(startpos, endpos, params.track_changes); return PitPosPair(endpit, endpos); } for (pit_type pit = startpit; pit != endpit + 1;) { pos_type const left = (pit == startpit ? startpos : 0); pos_type right = (pit == endpit ? endpos : pars[pit].size() + 1); - bool const merge = pars[pit].isMergedOnEndOfParDeletion(params.trackChanges); + bool const merge = pars[pit].isMergedOnEndOfParDeletion(params.track_changes); // Logically erase only, including the end-of-paragraph character - pars[pit].eraseChars(left, right, params.trackChanges); + pars[pit].eraseChars(left, right, params.track_changes); // Separate handling of paragraph break: if (merge && pit != endpit && @@ -463,28 +480,69 @@ PitPosPair eraseSelectionHelper(BufferParams const & params, void putClipboard(ParagraphList const & paragraphs, DocumentClassConstPtr docclass, docstring const & plaintext) { - // For some strange reason gcc 3.2 and 3.3 do not accept - // Buffer buffer(string(), false); // This used to need to be static to avoid a memory leak. It no longer needs // to be so, but the alternative is to construct a new one of these (with a // new temporary directory, etc) every time, and then to destroy it. So maybe // it's worth just keeping this one around. - static Buffer * buffer = theBufferList().newInternalBuffer( - FileName::tempName("clipboard.internal").absFileName()); - buffer->setUnnamed(true); - buffer->paragraphs() = paragraphs; - buffer->inset().setBuffer(*buffer); + // FIXME THREAD + static TempFile tempfile("clipboard.internal"); + tempfile.setAutoRemove(false); + static Buffer * staticbuffer = theBufferList().newInternalBuffer( + tempfile.name().absFileName()); + + // These two things only really need doing the first time. + staticbuffer->setUnnamed(true); + staticbuffer->inset().setBuffer(*staticbuffer); + + // Use a clone for the complicated stuff so that we do not need to clean + // up in order to avoid a crash. + Buffer * buffer = staticbuffer->cloneBufferOnly(); + LASSERT(buffer, return); + + // This needs doing every time. buffer->params().setDocumentClass(docclass); - string lyx; - ostringstream oslyx; - if (buffer->write(oslyx)) - lyx = oslyx.str(); - odocstringstream oshtml; - OutputParams runparams(encodings.fromLyXName("utf8")); - buffer->writeLyXHTMLSource(oshtml, runparams, Buffer::FullSource); - theClipboard().put(lyx, oshtml.str(), plaintext); + + // we will use pasteSelectionHelper to copy the paragraphs into the + // temporary Buffer, since it does a lot of things to fix them up. + DocIterator dit = doc_iterator_begin(buffer, &buffer->inset()); + ErrorList el; + pasteSelectionHelper(dit, paragraphs, docclass, buffer, el); + + // We don't want to produce images that are not used. Therefore, + // output formulas as MathML. Even if this is not understood by all + // applications, the number that can parse it should go up in the future. + buffer->params().html_math_output = BufferParams::MathML; + + // Make sure MarkAsExporting is deleted before buffer is + { + // The Buffer is being used to export. This is necessary so that the + // updateMacros call will record the needed information. + MarkAsExporting mex(buffer); + + buffer->updateBuffer(Buffer::UpdateMaster, OutputUpdate); + buffer->updateMacros(); + buffer->updateMacroInstances(OutputUpdate); + + // LyX's own format + string lyx; + ostringstream oslyx; + if (buffer->write(oslyx)) + lyx = oslyx.str(); + + // XHTML format + odocstringstream oshtml; + OutputParams runparams(encodings.fromLyXName("utf8")); + // We do not need to produce images, etc. + runparams.dryrun = true; + // We are not interested in errors (bug 8866) + runparams.silent = true; + buffer->writeLyXHTMLSource(oshtml, runparams, Buffer::FullSource); + + theClipboard().put(lyx, oshtml.str(), plaintext); + } + // Save that memory - buffer->paragraphs().clear(); + delete buffer; } @@ -509,9 +567,12 @@ void copySelectionHelper(Buffer const & buf, Text const & text, { ParagraphList const & pars = text.paragraphs(); - LASSERT(0 <= start && start <= pars[startpit].size(), /**/); - LASSERT(0 <= end && end <= pars[endpit].size(), /**/); - LASSERT(startpit != endpit || start <= end, /**/); + // In most of these cases, we can try to recover. + LASSERT(0 <= start, start = 0); + LASSERT(start <= pars[startpit].size(), start = pars[startpit].size()); + LASSERT(0 <= end, end = 0); + LASSERT(end <= pars[endpit].size(), end = pars[endpit].size()); + LASSERT(startpit != endpit || start <= end, return); // Clone the paragraphs within the selection. ParagraphList copy_pars(boost::next(pars.begin(), startpit), @@ -640,7 +701,7 @@ void switchBetweenClasses(DocumentClassConstPtr oldone, { errorlist.clear(); - LASSERT(!in.paragraphs().empty(), /**/); + LBUFERR(!in.paragraphs().empty()); if (oldone == newone) return; @@ -758,7 +819,7 @@ void cutSelection(Cursor & cur, bool doclear, bool realcut) if (cur.inTexted()) { Text * text = cur.text(); - LASSERT(text, /**/); + LBUFERR(text); saveSelection(cur); @@ -799,7 +860,7 @@ void cutSelection(Cursor & cur, bool doclear, bool realcut) // sometimes necessary if (doclear - && text->paragraphs()[begpit].stripLeadingSpaces(bp.trackChanges)) + && text->paragraphs()[begpit].stripLeadingSpaces(bp.track_changes)) cur.fixIfBroken(); // need a valid cursor. (Lgb) @@ -844,7 +905,8 @@ void copyInset(Cursor const & cur, Inset * inset, docstring const & plaintext) Paragraph par; BufferParams const & bp = cur.buffer()->params(); par.setLayout(bp.documentClass().plainLayout()); - par.insertInset(0, inset, Change(Change::UNCHANGED)); + 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())); @@ -867,7 +929,7 @@ void copySelectionToStack(Cursor const & cur, CutStack & cutstack) if (cur.inTexted()) { Text * text = cur.text(); - LASSERT(text, /**/); + LBUFERR(text); // ok we have a selection. This is always between cur.selBegin() // and sel_end cursor @@ -981,44 +1043,40 @@ void pasteParagraphList(Cursor & cur, ParagraphList const & parlist, { if (cur.inTexted()) { Text * text = cur.text(); - LASSERT(text, /**/); - - pit_type endpit; - PitPosPair ppp; + LBUFERR(text); - boost::tie(ppp, endpit) = - pasteSelectionHelper(cur, parlist, docclass, errorList); + PasteReturnValue prv = + pasteSelectionHelper(cur, parlist, docclass, 0, errorList); cur.forceBufferUpdate(); cur.clearSelection(); - text->setCursor(cur, ppp.first, ppp.second); + text->setCursor(cur, prv.par, prv.pos); } // mathed is handled in InsetMathNest/InsetMathGrid - LASSERT(!cur.inMathed(), /**/); + LATTEST(!cur.inMathed()); } -void pasteFromStack(Cursor & cur, ErrorList & errorList, size_t sel_index) +bool pasteFromStack(Cursor & cur, ErrorList & errorList, size_t sel_index) { // this does not make sense, if there is nothing to paste if (!checkPastePossible(sel_index)) - return; + return false; cur.recordUndo(); pasteParagraphList(cur, theCuts[sel_index].first, theCuts[sel_index].second, errorList); + return true; } -void pasteClipboardText(Cursor & cur, ErrorList & errorList, bool asParagraphs, +bool pasteClipboardText(Cursor & cur, ErrorList & errorList, bool asParagraphs, Clipboard::TextType type) { // Use internal clipboard if it is the most recent one // This overrides asParagraphs and type on purpose! - if (theClipboard().isInternal()) { - pasteFromStack(cur, errorList, 0); - return; - } + if (theClipboard().isInternal()) + return pasteFromStack(cur, errorList, 0); // First try LyX format if ((type == Clipboard::LyXTextType || @@ -1035,14 +1093,14 @@ void pasteClipboardText(Cursor & cur, ErrorList & errorList, bool asParagraphs, cur.recordUndo(); pasteParagraphList(cur, buffer.paragraphs(), buffer.params().documentClassPtr(), errorList); - return; + return true; } } } // Then try TeX and HTML Clipboard::TextType types[2] = {Clipboard::HtmlTextType, Clipboard::LaTeXTextType}; - string names[2] = {"html", "latex"}; + string names[2] = {"html", "latexclipboard"}; for (int i = 0; i < 2; ++i) { if (type != types[i] && type != Clipboard::AnyTextType) continue; @@ -1064,11 +1122,14 @@ void pasteClipboardText(Cursor & cur, ErrorList & errorList, bool asParagraphs, // Buffer buffer(string(), false); Buffer buffer("", false); buffer.setUnnamed(true); - if (buffer.importString(names[i], text, errorList)) { + available = buffer.importString(names[i], text, errorList); + if (available) + available = !buffer.paragraphs().empty(); + if (available && !buffer.paragraphs()[0].empty()) { cur.recordUndo(); pasteParagraphList(cur, buffer.paragraphs(), buffer.params().documentClassPtr(), errorList); - return; + return true; } } } @@ -1077,12 +1138,13 @@ void pasteClipboardText(Cursor & cur, ErrorList & errorList, bool asParagraphs, // Then try plain text docstring const text = theClipboard().getAsText(Clipboard::PlainTextType); if (text.empty()) - return; + return false; cur.recordUndo(); if (asParagraphs) cur.text()->insertStringAsParagraphs(cur, text, cur.current_font); else cur.text()->insertStringAsLines(cur, text, cur.current_font); + return true; } @@ -1122,7 +1184,7 @@ void pasteSimpleText(Cursor & cur, bool asParagraphs) void pasteClipboardGraphics(Cursor & cur, ErrorList & /* errorList */, Clipboard::GraphicsType preferedType) { - LASSERT(theClipboard().hasGraphicsContents(preferedType), /**/); + LASSERT(theClipboard().hasGraphicsContents(preferedType), return); // get picture from clipboard FileName filename = theClipboard().getAsGraphics(cur, preferedType); @@ -1164,7 +1226,7 @@ void replaceSelectionWithString(Cursor & cur, docstring const & str) 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().trackChanges); + par.insertChar(pos, *cit, font, cur.buffer()->params().track_changes); // Cut the selection cutSelection(cur, true, false);