#include "CutAndPaste.h"
+#include "BranchList.h"
#include "Buffer.h"
#include "buffer_funcs.h"
#include "BufferList.h"
#include "LyXRC.h"
#include "Text.h"
#include "Paragraph.h"
-#include "paragraph_funcs.h"
#include "ParagraphParameters.h"
#include "ParIterator.h"
#include "Undo.h"
-#include "insets/InsetFlex.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/InsetTabular.h"
#include "mathed/MathData.h"
#include "support/limited_stack.h"
#include "support/lstrings.h"
+#include "frontends/alert.h"
#include "frontends/Clipboard.h"
#include "frontends/Selection.h"
}
}
- InsetText in(buffer);
+ InsetText in(cur.buffer());
// Make sure there is no class difference.
in.paragraphs().clear();
// This works without copying any paragraph data because we have
}
// Prepare the paragraphs and insets for insertion.
- // A couple of insets store buffer references so need updating.
insertion.swap(in.paragraphs());
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, e.g., InsetLabel::updateCommand() is going to try to access
+ // the buffer() member.
it->setBuffer(const_cast<Buffer &>(buffer));
-
switch (it->lyxCode()) {
-
+
case LABEL_CODE: {
// check for duplicates
InsetCommand & lab = static_cast<InsetCommand &>(*it);
break;
}
+ case INCLUDE_CODE: {
+ InsetInclude & inc = static_cast<InsetInclude &>(*it);
+ inc.updateCommand();
+ break;
+ }
+
case BIBITEM_CODE: {
// check for duplicates
InsetCommand & bib = static_cast<InsetCommand &>(*it);
break;
}
+ case BRANCH_CODE: {
+ // check if branch is known to target buffer
+ // or its master
+ InsetBranch & br = static_cast<InsetBranch &>(*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;
+ // FIXME: add an option to add the branch to the master's BranchList.
+ 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));
+ break;
+ }
+
default:
break; // nothing
}
// merge the first par of the insertion with the current par
mergeParagraph(buffer.params(), pars, pit);
}
- //FIXME: We should call setBuffer() on each inserted paragraph.
- // instead, we call setBuffer() for the main inset at the beginning
- // of updateLabels()
-
- 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 updateLabels() 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 &>(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())) {
}
-void copySelectionHelper(Buffer const & buf, ParagraphList const & pars,
+/// return true if the whole ParagraphList is deleted
+static bool isFullyDeleted(ParagraphList const & pars)
+{
+ pit_type const pars_size = static_cast<pit_type>(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, Text const & text,
pit_type startpit, pit_type endpit,
int start, int end, DocumentClass const * const dc, CutStack & cutstack)
{
+ ParagraphList const & pars = text.paragraphs();
+
LASSERT(0 <= start && start <= pars[startpit].size(), /**/);
LASSERT(0 <= end && end <= pars[endpit].size(), /**/);
LASSERT(startpit != endpit || start <= end, /**/);
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);
+ // 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<Buffer &>(buf));
+ // PassThru paragraphs have the Language
+ // latex_language. This is invalid for others, so we
+ // need to change it to the buffer language.
+ if (text.inset().getLayout().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());
+
+
+ // 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<Buffer *>(0));
+ it->setInsetOwner(0);
+ }
DocumentClass * d = const_cast<DocumentClass *>(dc);
cutstack.push(make_pair(copy_pars, d));
// 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 & n = newone->insetLayout(it->name()).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()),
+ it->name(), from_utf8(oldtc.name()),
from_utf8(newtc.name()));
// To warn the user that something had to be done.
errorlist.push_back(ErrorItem(
BufferParams const & bp = cur.buffer()->params();
if (realcut) {
copySelectionHelper(*cur.buffer(),
- text->paragraphs(),
+ *text,
begpit, endpit,
cur.selBegin().pos(), endpos,
bp.documentClassPtr(), theCuts);
(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().documentClassPtr(), cutstack);
- dirtyTabularStack(false);
+
+ // 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()) {
return;
cur.recordUndo();
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);
}
return;
// create inset for graphic
- InsetGraphics * inset = new InsetGraphics(*cur.buffer());
+ InsetGraphics * inset = new InsetGraphics(cur.buffer());
InsetGraphicsParams params;
params.filename = support::DocFileName(filename.absFilename());
inset->setParams(params);
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");
}