X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCutAndPaste.cpp;h=1f4633008774d4a66f043b933d9cc7fc8cb5b1c8;hb=02e59530b15d223c0978ecacfb7379f7bec986f4;hp=96986dd69ff8343f186d4f558379096c214fe0f0;hpb=0362c6aae73c293d1c20277c12d362acfe0b2ef6;p=lyx.git diff --git a/src/CutAndPaste.cpp b/src/CutAndPaste.cpp index 96986dd69f..1f46330087 100644 --- a/src/CutAndPaste.cpp +++ b/src/CutAndPaste.cpp @@ -3,8 +3,8 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author Jürgen Vigna - * \author Lars Gullik Bjønnes + * \author Jürgen Vigna + * \author Lars Gullik Bjønnes * \author Alfredo Braunstein * \author Michael Gerz * @@ -15,43 +15,53 @@ #include "CutAndPaste.h" +#include "BranchList.h" #include "Buffer.h" #include "buffer_funcs.h" +#include "BufferList.h" #include "BufferParams.h" #include "BufferView.h" #include "Changes.h" #include "Cursor.h" +#include "Encoding.h" #include "ErrorList.h" +#include "FuncCode.h" #include "FuncRequest.h" #include "InsetIterator.h" #include "InsetList.h" #include "Language.h" -#include "lfuns.h" -#include "LyXFunc.h" +#include "LyX.h" #include "LyXRC.h" #include "Text.h" -#include "TextClassList.h" #include "Paragraph.h" -#include "paragraph_funcs.h" #include "ParagraphParameters.h" #include "ParIterator.h" -#include "Undo.h" +#include "TextClass.h" +#include "insets/InsetBibitem.h" +#include "insets/InsetBranch.h" +#include "insets/InsetCommand.h" #include "insets/InsetFlex.h" #include "insets/InsetGraphics.h" #include "insets/InsetGraphicsParams.h" +#include "insets/InsetInclude.h" +#include "insets/InsetLabel.h" #include "insets/InsetTabular.h" #include "mathed/MathData.h" #include "mathed/InsetMath.h" +#include "mathed/InsetMathHull.h" +#include "mathed/InsetMathRef.h" #include "mathed/MathSupport.h" #include "support/debug.h" #include "support/docstream.h" #include "support/gettext.h" +#include "support/lassert.h" #include "support/limited_stack.h" #include "support/lstrings.h" +#include "frontends/alert.h" #include "frontends/Clipboard.h" #include "frontends/Selection.h" @@ -70,7 +80,7 @@ namespace { typedef pair PitPosPair; -typedef limited_stack > CutStack; +typedef limited_stack > CutStack; CutStack theCuts(10); // persistent selection, cleared until the next selection @@ -82,87 +92,102 @@ CutStack selectionBuffer(1); bool dirty_tabular_stack_ = false; -void region(CursorSlice const & i1, CursorSlice const & i2, - Inset::row_type & r1, Inset::row_type & r2, - Inset::col_type & c1, Inset::col_type & c2) -{ - Inset & p = i1.inset(); - c1 = p.col(i1.idx()); - c2 = p.col(i2.idx()); - if (c1 > c2) - swap(c1, c2); - r1 = p.row(i1.idx()); - r2 = p.row(i2.idx()); - if (r1 > r2) - swap(r1, r2); -} - - bool checkPastePossible(int index) { return size_t(index) < theCuts.size() && !theCuts[index].first.empty(); } -pair -pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist, - TextClassPtr textclass, 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(); + Buffer const & buffer = *cur.buffer(); pit_type pit = cur.pit(); pos_type pos = cur.pos(); - ParagraphList & pars = cur.text()->paragraphs(); + 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 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()); // Make a copy of the CaP paragraphs. ParagraphList insertion = parlist; - TextClassPtr const tc = buffer.params().textClassPtr(); + DocumentClassConstPtr newDocClass = buffer.params().documentClassPtr(); // Now remove all out of the pars which is NOT allowed in the // new environment and set also another font if that is required. - // Convert newline to paragraph break in ERT inset. - // This should not be here! - Inset * inset = pars[pit].inInset(); - if (inset && (inset->lyxCode() == ERT_CODE || - inset->lyxCode() == LISTINGS_CODE)) { + // Convert newline to paragraph break in ParbreakIsNewline + if (target_inset->getLayout().parbreakIsNewline() + || pars[pit].layout().parbreak_is_newline) { for (size_t i = 0; i != insertion.size(); ++i) { for (pos_type j = 0; j != insertion[i].size(); ++j) { if (insertion[i].isNewline(j)) { // do not track deletion of newline insertion[i].eraseChar(j, false); + insertion[i].setInsetOwner(target_inset); breakParagraphConservative( buffer.params(), insertion, i, j); + break; } } } } - // set the paragraphs to empty layout if necessary - // note that we are doing this if the empty layout is - // supposed to be the default, not just if it is forced - if (cur.inset().useEmptyLayout()) { - LayoutPtr const layout = - buffer.params().textClass().emptyLayout(); + // set the paragraphs to plain layout if necessary + if (cur.inset().usePlainLayout()) { + bool forcePlainLayout = cur.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(); + if (forcePlainLayout || parLayout == defaultLayout) + 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(); - for (ParagraphList::iterator par = insertion.begin(); - par != end; ++par) - par->setLayout(layout); + ParagraphList::iterator par = insertion.begin(); + for (; par != end; ++par) { + Layout const & parLayout = par->layout(); + if (parLayout == plainLayout) + par->setLayout(defaultLayout); + } } + InsetText in(cur.buffer()); // Make sure there is no class difference. - InsetText in; + in.paragraphs().clear(); // This works without copying any paragraph data because we have // a specialized swap method for ParagraphList. This is important // since we store pointers to insets at some places and we don't // want to invalidate them. insertion.swap(in.paragraphs()); - cap::switchBetweenClasses(textclass, tc, in, errorlist); + cap::switchBetweenClasses(oldDocClass, newDocClass, in, errorlist); insertion.swap(in.paragraphs()); ParagraphList::iterator tmpbuf = insertion.begin(); @@ -190,11 +215,11 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist, max_depth = tmpbuf->getMaxDepthAfter(); // Set the inset owner of this paragraph. - tmpbuf->setInsetOwner(pars[pit].inInset()); + tmpbuf->setInsetOwner(target_inset); for (pos_type i = 0; i < tmpbuf->size(); ++i) { // do not track deletion of invalid insets if (Inset * inset = tmpbuf->getInset(i)) - if (!pars[pit].insetAllowed(inset->lyxCode())) + if (!target_inset->insetAllowed(inset->lyxCode())) tmpbuf->eraseChar(i--, false); } @@ -210,17 +235,147 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist, } // Prepare the paragraphs and insets for insertion. - // A couple of insets store buffer references so need updating. insertion.swap(in.paragraphs()); - ParIterator fpit = par_iterator_begin(in); - ParIterator fend = par_iterator_end(in); + InsetIterator const i_end = inset_iterator_end(in); + for (InsetIterator it = inset_iterator_begin(in); it != i_end; ++it) { + // Even though this will also be done later, it has to be done here + // since some inset might going to try to access + // the buffer() member. + it->setBuffer(const_cast(buffer)); + switch (it->lyxCode()) { + + case MATH_HULL_CODE: { + // check for equation labels and resolve duplicates + InsetMathHull * ins = it->asInsetMath()->asHullInset(); + std::vector labels = ins->getLabels(); + for (size_t i = 0; i != labels.size(); ++i) { + if (!labels[i]) + continue; + InsetLabel * lab = labels[i]; + docstring const oldname = lab->getParam("name"); + lab->updateLabel(oldname); + // We need to update the buffer reference cache. + need_update = true; + docstring const newname = lab->getParam("name"); + if (oldname == newname) + continue; + // adapt the references + for (InsetIterator itt = inset_iterator_begin(in); + itt != i_end; ++itt) { + if (itt->lyxCode() == REF_CODE) { + InsetCommand * ref = itt->asInsetCommand(); + if (ref->getParam("reference") == oldname) + ref->setParam("reference", newname); + } else if (itt->lyxCode() == MATH_REF_CODE) { + InsetMathRef * mi = itt->asInsetMath()->asRefInset(); + // this is necessary to prevent an uninitialized + // buffer when the RefInset is in a MathBox. + // FIXME audit setBuffer calls + mi->setBuffer(const_cast(buffer)); + if (mi->getTarget() == oldname) + mi->changeTarget(newname); + } + } + } + break; + } + + case LABEL_CODE: { + // check for duplicates + InsetLabel & lab = static_cast(*it); + docstring const oldname = lab.getParam("name"); + lab.updateLabel(oldname); + // We need to update the buffer reference cache. + need_update = true; + docstring const newname = lab.getParam("name"); + if (oldname == newname) + break; + // adapt the references + for (InsetIterator itt = inset_iterator_begin(in); itt != i_end; ++itt) { + if (itt->lyxCode() == REF_CODE) { + InsetCommand & ref = static_cast(*itt); + if (ref.getParam("reference") == oldname) + ref.setParam("reference", newname); + } else if (itt->lyxCode() == MATH_REF_CODE) { + InsetMathRef * mi = itt->asInsetMath()->asRefInset(); + // this is necessary to prevent an uninitialized + // buffer when the RefInset is in a MathBox. + // FIXME audit setBuffer calls + mi->setBuffer(const_cast(buffer)); + if (mi->getTarget() == oldname) + mi->changeTarget(newname); + } + } + break; + } + + case INCLUDE_CODE: { + InsetInclude & inc = static_cast(*it); + inc.updateCommand(); + // We need to update the list of included files. + need_update = true; + break; + } + + case BIBITEM_CODE: { + // check for duplicates + InsetBibitem & bib = static_cast(*it); + docstring const oldkey = bib.getParam("key"); + bib.updateCommand(oldkey, false); + // We need to update the buffer reference cache. + need_update = true; + docstring const newkey = bib.getParam("key"); + if (oldkey == newkey) + break; + // adapt the references + for (InsetIterator itt = inset_iterator_begin(in); + itt != i_end; ++itt) { + if (itt->lyxCode() == CITE_CODE) { + InsetCommand * ref = itt->asInsetCommand(); + if (ref->getParam("key") == oldkey) + ref->setParam("key", newkey); + } + } + break; + } - for (; fpit != fend; ++fpit) { - InsetList::const_iterator it = fpit->insetList().begin(); - InsetList::const_iterator et = fpit->insetList().end(); - for (; it != et; ++it) - it->inset->setBuffer(const_cast(&buffer)); + case BRANCH_CODE: { + // check if branch is known to target buffer + // or its master + InsetBranch & br = static_cast(*it); + docstring const name = br.branch(); + if (name.empty()) + break; + bool const is_child = (&buffer != buffer.masterBuffer()); + BranchList branchlist = buffer.params().branchlist(); + if ((!is_child && branchlist.find(name)) + || (is_child && (branchlist.find(name) + || buffer.masterBuffer()->params().branchlist().find(name)))) + break; + 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"), + text, 0, 1, _("&Add"), _("&Don't Add")) != 0) + break; + lyx::dispatch(FuncRequest(LFUN_BRANCH_ADD, name)); + } + // We need to update the list of branches. + need_update = true; + break; + } + + default: + break; // nothing + } } insertion.swap(in.paragraphs()); @@ -246,12 +401,18 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist, mergeParagraph(buffer.params(), pars, pit); } - pit_type last_paste = pit + insertion.size() - 1; - // Store the new cursor position. + pit_type last_paste = pit + insertion.size() - 1; + pit_type startpit = pit; pit = last_paste; pos = pars[last_paste].size(); + // FIXME Should we do it here, or should we let updateBuffer() do it? + // Set paragraph buffers. It's important to do this right away + // before something calls Inset::buffer() and causes a crash. + for (pit_type p = startpit; p <= pit; ++p) + pars[p].setBuffer(const_cast(buffer)); + // 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())) { @@ -269,7 +430,7 @@ pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist, } } - return make_pair(PitPosPair(pit, pos), last_paste + 1); + return PasteReturnValue(pit, pos, need_update); } @@ -317,30 +478,97 @@ PitPosPair eraseSelectionHelper(BufferParams const & params, } -void putClipboard(ParagraphList const & paragraphs, TextClassPtr textclass, - docstring const & plaintext) +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); - Buffer buffer("", false); - buffer.setUnnamed(true); - buffer.paragraphs() = paragraphs; - buffer.params().setTextClass(textclass); - ostringstream lyx; - if (buffer.write(lyx)) - theClipboard().put(lyx.str(), plaintext); - else - theClipboard().put(string(), plaintext); + // 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 * staticbuffer = theBufferList().newInternalBuffer( + FileName::tempName("clipboard.internal").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); + + // 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; + buffer->writeLyXHTMLSource(oshtml, runparams, Buffer::FullSource); + + theClipboard().put(lyx, oshtml.str(), plaintext); + } + + // Save that memory + delete buffer; +} + + +/// return true if the whole ParagraphList is deleted +static bool isFullyDeleted(ParagraphList const & pars) +{ + pit_type const pars_size = static_cast(pars.size()); + + // check all paragraphs + for (pit_type pit = 0; pit < pars_size; ++pit) { + if (!pars[pit].empty()) // prevent assertion failure + if (!pars[pit].isDeleted(0, pars[pit].size())) + return false; + } + return true; } -void copySelectionHelper(Buffer const & buf, ParagraphList & pars, +void copySelectionHelper(Buffer const & buf, Text const & text, pit_type startpit, pit_type endpit, - int start, int end, TextClassPtr tc, CutStack & cutstack) + int start, int end, DocumentClassConstPtr dc, CutStack & cutstack) { - BOOST_ASSERT(0 <= start && start <= pars[startpit].size()); - BOOST_ASSERT(0 <= end && end <= pars[endpit].size()); - BOOST_ASSERT(startpit != endpit || start <= end); + ParagraphList const & pars = text.paragraphs(); + + // 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), @@ -359,20 +587,37 @@ void copySelectionHelper(Buffer const & buf, ParagraphList & pars, ParagraphList::iterator it = copy_pars.begin(); ParagraphList::iterator it_end = copy_pars.end(); - for (; it != it_end; it++) { - // ERT paragraphs have the Language latex_language. - // This is invalid outside of ERT, so we need to change it - // to the buffer language. - if (it->ownerCode() == ERT_CODE || it->ownerCode() == LISTINGS_CODE) { - it->changeLanguage(buf.params(), latex_language, buf.language()); - } - it->setInsetOwner(0); + for (; it != it_end; ++it) { + // 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->setBuffer(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(), + latex_language, buf.language()); } - // do not copy text (also nested in insets) which is marked as deleted - acceptChanges(copy_pars, buf.params()); + // do not copy text (also nested in insets) which is marked as + // deleted, unless the whole selection was deleted + if (!isFullyDeleted(copy_pars)) + acceptChanges(copy_pars, buf.params()); + else + rejectChanges(copy_pars, buf.params()); + + + // 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->setBuffer(*static_cast(0)); + it->setInsetOwner(0); + } - cutstack.push(make_pair(copy_pars, tc)); + cutstack.push(make_pair(copy_pars, dc)); } } // namespace anon @@ -382,6 +627,22 @@ void copySelectionHelper(Buffer const & buf, ParagraphList & pars, 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) +{ + Inset & p = i1.inset(); + c1 = p.col(i1.idx()); + c2 = p.col(i2.idx()); + if (c1 > c2) + swap(c1, c2); + r1 = p.row(i1.idx()); + r2 = p.row(i2.idx()); + if (r1 > r2) + swap(r1, r2); +} + + docstring grabAndEraseSelection(Cursor & cur) { if (!cur.selection()) @@ -392,61 +653,109 @@ docstring grabAndEraseSelection(Cursor & cur) } -void switchBetweenClasses(TextClassPtr const & oldone, - TextClassPtr const & newone, InsetText & in, ErrorList & errorlist) +bool reduceSelectionToOneCell(Cursor & cur) +{ + if (!cur.selection() || !cur.inMathed()) + return false; + + CursorSlice i1 = cur.selBegin(); + CursorSlice i2 = cur.selEnd(); + if (!i1.inset().asInsetMath()) + return false; + + // the easy case: do nothing if only one cell is selected + if (i1.idx() == i2.idx()) + return true; + + cur.top().pos() = 0; + cur.resetAnchor(); + cur.top().pos() = cur.top().lastpos(); + + return true; +} + + +bool multipleCellsSelected(Cursor const & cur) +{ + if (!cur.selection() || !cur.inMathed()) + return false; + + CursorSlice i1 = cur.selBegin(); + CursorSlice i2 = cur.selEnd(); + if (!i1.inset().asInsetMath()) + return false; + + if (i1.idx() == i2.idx()) + return false; + + return true; +} + + +void switchBetweenClasses(DocumentClassConstPtr oldone, + DocumentClassConstPtr newone, InsetText & in, ErrorList & errorlist) { errorlist.clear(); - BOOST_ASSERT(!in.paragraphs().empty()); + LBUFERR(!in.paragraphs().empty()); if (oldone == newone) return; - TextClass const & oldtc = *oldone; - TextClass const & newtc = *newone; + DocumentClass const & oldtc = *oldone; + DocumentClass const & newtc = *newone; // layouts + ParIterator it = par_iterator_begin(in); ParIterator end = par_iterator_end(in); - for (ParIterator it = par_iterator_begin(in); it != end; ++it) { - docstring const name = it->layout()->name(); - bool hasLayout = newtc.hasLayout(name); + // for remembering which layouts we've had to add + set newlayouts; + for (; it != end; ++it) { + docstring const name = it->layout().name(); + + // the pasted text will keep their own layout name. If this layout does + // not exist in the new document, it will behave like a standard layout. + bool const added_one = newtc.addLayoutIfNeeded(name); + if (added_one) + newlayouts.insert(name); + + if (added_one || newlayouts.find(name) != newlayouts.end()) { + // Warn the user. + docstring const s = bformat(_("Layout `%1$s' was not found."), name); + errorlist.push_back( + ErrorItem(_("Layout Not Found"), s, it->id(), 0, it->size())); + } - if (hasLayout) - it->setLayout(newtc[name]); + if (in.usePlainLayout()) + it->setLayout(newtc.plainLayout()); else - it->setLayout(newtc.defaultLayout()); - - if (!hasLayout && name != oldtc.defaultLayoutName()) { - docstring const s = bformat( - _("Layout had to be changed from\n%1$s to %2$s\n" - "because of class conversion from\n%3$s to %4$s"), - name, it->layout()->name(), - from_utf8(oldtc.name()), from_utf8(newtc.name())); - // To warn the user that something had to be done. - errorlist.push_back(ErrorItem(_("Changed Layout"), s, - it->id(), 0, - it->size())); - } + it->setLayout(newtc[name]); } // character styles InsetIterator const i_end = inset_iterator_end(in); for (InsetIterator it = inset_iterator_begin(in); it != i_end; ++it) { - InsetCollapsable * inset = it->asInsetCollapsable(); - if (!inset) - continue; - if (inset->lyxCode() != FLEX_CODE) + if (it->lyxCode() != FLEX_CODE) // FIXME: Should we verify all InsetCollapsable? continue; - inset->setLayout(newone); - if (!inset->undefined()) + + docstring const layoutName = it->layoutName(); + docstring const & n = newone->insetLayout(layoutName).name(); + bool const is_undefined = n.empty() || + n == DocumentClass::plainInsetLayout().name(); + if (!is_undefined) continue; + // The flex inset is undefined in newtc - docstring const s = bformat(_( - "Flex inset %1$s is " - "undefined because of class " - "conversion from\n%2$s to %3$s"), - inset->name(), from_utf8(oldtc.name()), - from_utf8(newtc.name())); + docstring const oldname = from_utf8(oldtc.name()); + docstring const newname = from_utf8(newtc.name()); + docstring s; + if (oldname == newname) + s = bformat(_("Flex inset %1$s is undefined after " + "reloading `%2$s' layout."), layoutName, oldname); + else + s = bformat(_("Flex inset %1$s is undefined because of " + "conversion from `%2$s' layout to `%3$s'."), + layoutName, oldname, newname); // To warn the user that something had to be done. errorlist.push_back(ErrorItem( _("Undefined flex inset"), @@ -455,9 +764,11 @@ void switchBetweenClasses(TextClassPtr const & oldone, } -vector const availableSelections(Buffer const & buffer) +vector availableSelections(Buffer const * buf) { vector selList; + if (!buf) + return selList; CutStack::const_iterator cit = theCuts.begin(); CutStack::const_iterator end = theCuts.end(); @@ -469,7 +780,10 @@ vector const availableSelections(Buffer const & buffer) ParagraphList::const_iterator pit = pars.begin(); ParagraphList::const_iterator pend = pars.end(); for (; pit != pend; ++pit) { - asciiSel += pit->asString(buffer, false); + Paragraph par(*pit, 0, 26); + // adapt paragraph to current buffer. + par.setBuffer(const_cast(*buf)); + asciiSel += par.asString(AS_STR_INSETS); if (asciiSel.size() > 25) { asciiSel.replace(22, docstring::npos, from_ascii("...")); @@ -501,7 +815,7 @@ void cutSelection(Cursor & cur, bool doclear, bool realcut) if (cur.inTexted()) { Text * text = cur.text(); - BOOST_ASSERT(text); + LBUFERR(text); saveSelection(cur); @@ -512,19 +826,22 @@ void cutSelection(Cursor & cur, bool doclear, bool realcut) int endpos = cur.selEnd().pos(); - BufferParams const & bp = cur.buffer().params(); + BufferParams const & bp = cur.buffer()->params(); if (realcut) { - copySelectionHelper(cur.buffer(), - text->paragraphs(), + copySelectionHelper(*cur.buffer(), + *text, begpit, endpit, cur.selBegin().pos(), endpos, - bp.textClassPtr(), theCuts); + bp.documentClassPtr(), theCuts); // Stuff what we got on the clipboard. // Even if there is no selection. putClipboard(theCuts[0].first, theCuts[0].second, cur.selectionAsString(true)); } + if (begpit != endpit) + cur.screenUpdateFlags(Update::Force | Update::FitCursor); + boost::tie(endpit, endpos) = eraseSelectionHelper(bp, text->paragraphs(), @@ -544,7 +861,12 @@ void cutSelection(Cursor & cur, bool doclear, bool realcut) // need a valid cursor. (Lgb) cur.clearSelection(); - updateLabels(cur.buffer()); + + // After a cut operation, we must make sure that the Buffer is updated + // because some further operation might need updated label information for + // example. So we cannot just use "cur.forceBufferUpdate()" here. + // This fixes #7071. + cur.buffer()->updateBuffer(); // tell tabular that a recent copy happened dirtyTabularStack(false); @@ -567,15 +889,30 @@ void cutSelection(Cursor & cur, bool doclear, bool realcut) } -void copySelection(Cursor & cur) +void copySelection(Cursor const & cur) { copySelection(cur, cur.selectionAsString(true)); } +void copyInset(Cursor const & cur, Inset * inset, docstring const & plaintext) +{ + ParagraphList pars; + Paragraph par; + BufferParams const & bp = cur.buffer()->params(); + par.setLayout(bp.documentClass().plainLayout()); + par.insertInset(0, inset, Change(Change::UNCHANGED)); + pars.push_back(par); + theCuts.push(make_pair(pars, bp.documentClassPtr())); + + // stuff the selection onto the X clipboard, from an explicit copy request + putClipboard(theCuts[0].first, theCuts[0].second, plaintext); +} + + namespace { -void copySelectionToStack(Cursor & cur, CutStack & cutstack) +void copySelectionToStack(Cursor const & cur, CutStack & cutstack) { // this doesn't make sense, if there is no selection if (!cur.selection()) @@ -587,7 +924,7 @@ void copySelectionToStack(Cursor & cur, CutStack & cutstack) if (cur.inTexted()) { Text * text = cur.text(); - BOOST_ASSERT(text); + LBUFERR(text); // ok we have a selection. This is always between cur.selBegin() // and sel_end cursor @@ -600,21 +937,26 @@ void copySelectionToStack(Cursor & cur, CutStack & cutstack) (par != cur.selEnd().pit() || pos < cur.selEnd().pos())) ++pos; - copySelectionHelper(cur.buffer(), pars, par, cur.selEnd().pit(), + copySelectionHelper(*cur.buffer(), *text, par, cur.selEnd().pit(), pos, cur.selEnd().pos(), - cur.buffer().params().textClassPtr(), cutstack); - dirtyTabularStack(false); + cur.buffer()->params().documentClassPtr(), cutstack); + + // Reset the dirty_tabular_stack_ flag only when something + // is copied to the clipboard (not to the selectionBuffer). + if (&cutstack == &theCuts) + dirtyTabularStack(false); } if (cur.inMathed()) { //lyxerr << "copySelection in mathed" << endl; ParagraphList pars; Paragraph par; - BufferParams const & bp = cur.buffer().params(); - par.setLayout(bp.textClass().defaultLayout()); + BufferParams const & bp = cur.buffer()->params(); + // FIXME This should be the plain layout...right? + par.setLayout(bp.documentClass().plainLayout()); par.insert(0, grabSelection(cur), Font(), Change(Change::UNCHANGED)); pars.push_back(par); - cutstack.push(make_pair(pars, bp.textClassPtr())); + cutstack.push(make_pair(pars, bp.documentClassPtr())); } } @@ -628,7 +970,7 @@ void copySelectionToStack() } -void copySelection(Cursor & cur, docstring const & plaintext) +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 @@ -637,11 +979,11 @@ void copySelection(Cursor & cur, docstring const & plaintext) if (cur.selBegin().idx() != cur.selEnd().idx()) { ParagraphList pars; Paragraph par; - BufferParams const & bp = cur.buffer().params(); - par.setLayout(bp.textClass().defaultLayout()); + 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.textClassPtr())); + theCuts.push(make_pair(pars, bp.documentClassPtr())); } else { copySelectionToStack(cur, theCuts); } @@ -651,7 +993,7 @@ void copySelection(Cursor & cur, docstring const & plaintext) } -void saveSelection(Cursor & cur) +void saveSelection(Cursor const & cur) { // This function is called, not when a selection is formed, but when // a selection is cleared. Therefore, multiple keyboard selection @@ -659,7 +1001,7 @@ void saveSelection(Cursor & cur) if (cur.selection() && cur.selBegin() == cur.bv().cursor().selBegin() && cur.selEnd() == cur.bv().cursor().selEnd()) { - LYXERR(Debug::ACTION, "'" << cur.selectionAsString(true) << "'"); + LYXERR(Debug::SELECTION, "saveSelection: '" << cur.selectionAsString(true) << "'"); copySelectionToStack(cur, selectionBuffer); } } @@ -683,34 +1025,30 @@ void clearCutStack() } -docstring getSelection(Buffer const & buf, size_t sel_index) +docstring selection(size_t sel_index) { return sel_index < theCuts.size() - ? theCuts[sel_index].first.back().asString(buf, false) + ? theCuts[sel_index].first.back().asString(AS_STR_INSETS | AS_STR_NEWLINES) : docstring(); } void pasteParagraphList(Cursor & cur, ParagraphList const & parlist, - TextClassPtr textclass, ErrorList & errorList) + DocumentClassConstPtr docclass, ErrorList & errorList) { if (cur.inTexted()) { Text * text = cur.text(); - BOOST_ASSERT(text); - - pit_type endpit; - PitPosPair ppp; + LBUFERR(text); - boost::tie(ppp, endpit) = - pasteSelectionHelper(cur, parlist, - textclass, errorList); - updateLabels(cur.buffer()); + 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 - BOOST_ASSERT(!cur.inMathed()); + LATTEST(!cur.inMathed()); } @@ -723,20 +1061,24 @@ void pasteFromStack(Cursor & cur, ErrorList & errorList, size_t sel_index) cur.recordUndo(); pasteParagraphList(cur, theCuts[sel_index].first, theCuts[sel_index].second, errorList); - cur.setSelection(); } -void pasteClipboardText(Cursor & cur, ErrorList & errorList, bool asParagraphs) +void 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; } // First try LyX format - if (theClipboard().hasLyXContents()) { + if ((type == Clipboard::LyXTextType || + type == Clipboard::LyXOrPlainTextType || + type == Clipboard::AnyTextType) && + theClipboard().hasTextContents(Clipboard::LyXTextType)) { string lyx = theClipboard().getAsLyX(); if (!lyx.empty()) { // For some strange reason gcc 3.2 and 3.3 do not accept @@ -746,29 +1088,95 @@ void pasteClipboardText(Cursor & cur, ErrorList & errorList, bool asParagraphs) if (buffer.readString(lyx)) { cur.recordUndo(); pasteParagraphList(cur, buffer.paragraphs(), - buffer.params().textClassPtr(), errorList); - cur.setSelection(); + buffer.params().documentClassPtr(), errorList); return; } } } + // Then try TeX and HTML + Clipboard::TextType types[2] = {Clipboard::HtmlTextType, Clipboard::LaTeXTextType}; + string names[2] = {"html", "latex"}; + for (int i = 0; i < 2; ++i) { + if (type != types[i] && type != Clipboard::AnyTextType) + continue; + bool available = theClipboard().hasTextContents(types[i]); + + // If a specific type was explicitly requested, try to + // interpret plain text: The user told us that the clipboard + // contents is in the desired format + if (!available && type == types[i]) { + types[i] = Clipboard::PlainTextType; + available = theClipboard().hasTextContents(types[i]); + } + + if (available) { + 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.setUnnamed(true); + if (buffer.importString(names[i], text, errorList)) { + cur.recordUndo(); + pasteParagraphList(cur, buffer.paragraphs(), + buffer.params().documentClassPtr(), errorList); + return; + } + } + } + } + // Then try plain text - docstring const text = theClipboard().getAsText(); + docstring const text = theClipboard().getAsText(Clipboard::PlainTextType); + if (text.empty()) + return; + cur.recordUndo(); + if (asParagraphs) + cur.text()->insertStringAsParagraphs(cur, text, cur.current_font); + else + cur.text()->insertStringAsLines(cur, text, cur.current_font); +} + + +void pasteSimpleText(Cursor & cur, bool asParagraphs) +{ + docstring text; + // Use internal clipboard if it is the most recent one + if (theClipboard().isInternal()) { + if (!checkPastePossible(0)) + return; + + ParagraphList const & pars = theCuts[0].first; + ParagraphList::const_iterator it = pars.begin(); + for (; it != pars.end(); ++it) { + if (it != pars.begin()) + text += "\n"; + text += (*it).asString(); + } + asParagraphs = false; + } else { + // Then try plain text + text = theClipboard().getAsText(Clipboard::PlainTextType); + } + if (text.empty()) return; + cur.recordUndo(); + cutSelection(cur, true, false); if (asParagraphs) - cur.text()->insertStringAsParagraphs(cur, text); + cur.text()->insertStringAsParagraphs(cur, text, cur.current_font); else - cur.text()->insertStringAsLines(cur, text); + cur.text()->insertStringAsLines(cur, text, cur.current_font); } -void pasteClipboardGraphics(Cursor & cur, ErrorList & errorList, +void pasteClipboardGraphics(Cursor & cur, ErrorList & /* errorList */, Clipboard::GraphicsType preferedType) { - BOOST_ASSERT(theClipboard().hasGraphicsContents(preferedType)); + LASSERT(theClipboard().hasGraphicsContents(preferedType), return); // get picture from clipboard FileName filename = theClipboard().getAsGraphics(cur, preferedType); @@ -776,9 +1184,9 @@ void pasteClipboardGraphics(Cursor & cur, ErrorList & errorList, return; // create inset for graphic - InsetGraphics * inset = new InsetGraphics; + InsetGraphics * inset = new InsetGraphics(cur.buffer()); InsetGraphicsParams params; - params.filename = EmbeddedFile(filename.absFilename(), cur.buffer().filePath()); + params.filename = support::DocFileName(filename.absFileName(), false); inset->setParams(params); cur.recordUndo(); cur.insert(inset); @@ -795,14 +1203,14 @@ void pasteSelection(Cursor & cur, ErrorList & errorList) } -void replaceSelectionWithString(Cursor & cur, docstring const & str, bool backwards) +void replaceSelectionWithString(Cursor & cur, docstring const & str) { cur.recordUndo(); DocIterator selbeg = cur.selectionBegin(); - // Get font setting before we cut + // Get font setting before we cut, we need a copy here, not a bare reference. Font const font = - selbeg.paragraph().getFontSettings(cur.buffer().params(), selbeg.pos()); + selbeg.paragraph().getFontSettings(cur.buffer()->params(), selbeg.pos()); // Insert the new string pos_type pos = cur.selEnd().pos(); @@ -810,17 +1218,10 @@ void replaceSelectionWithString(Cursor & cur, docstring const & str, bool backwa 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().trackChanges); // Cut the selection cutSelection(cur, true, false); - - // select the replacement - if (backwards) { - selbeg.pos() += str.length(); - cur.setSelection(selbeg, -int(str.length())); - } else - cur.setSelection(selbeg, str.length()); } @@ -879,7 +1280,7 @@ void selClearOrDel(Cursor & cur) if (lyxrc.auto_region_delete) selDel(cur); else - cur.selection() = false; + cur.setSelection(false); } @@ -888,8 +1289,10 @@ docstring grabSelection(Cursor const & cur) if (!cur.selection()) return docstring(); - // FIXME: What is wrong with the following? #if 0 + // grab selection by glueing multiple cells together. This is not what + // we want because selections spanning multiple cells will get "&" and "\\" + // seperators. ostringstream os; for (DocIterator dit = cur.selectionBegin(); dit != cur.selectionEnd(); dit.forwardPos()) @@ -903,7 +1306,8 @@ docstring grabSelection(Cursor const & cur) if (i1.idx() == i2.idx()) { if (i1.inset().asInsetMath()) { MathData::const_iterator it = i1.cell().begin(); - return asString(MathData(it + i1.pos(), it + i2.pos())); + Buffer * buf = cur.buffer(); + return asString(MathData(buf, it + i1.pos(), it + i2.pos())); } else { return from_ascii("unknown selection 1"); } @@ -945,5 +1349,4 @@ bool tabularStackDirty() } // namespace cap - } // namespace lyx