if (parlist.empty())
return PasteReturnValue(pit, pos, need_update);
+ // Check whether we paste into an inset that does not
+ // produce output (needed for label duplicate check)
+ bool in_active_inset = cur.paragraph().inInset().producesOutput();
+ if (in_active_inset) {
+ for (size_type sl = 0 ; sl < cur.depth() ; ++sl) {
+ Paragraph const & outer_par = cur[sl].paragraph();
+ if (!outer_par.inInset().producesOutput()) {
+ in_active_inset = false;
+ break;
+ }
+ }
+ }
+
InsetText * target_inset = cur.inset().asInsetText();
if (!target_inset) {
InsetTabular * it = cur.inset().asInsetTabular();
- target_inset = it ? it->cell(cur.idx())->asInsetText() : 0;
+ target_inset = it ? it->cell(cur.idx())->asInsetText() : nullptr;
}
LASSERT(target_inset, return PasteReturnValue(pit, pos, need_update));
// Now remove all out of the pars which is NOT allowed in the
// new environment and set also another font if that is required.
+ // Merge paragraphs that are to be pasted into a text inset
+ // that does not allow multiple pars.
+ InsetText * inset_text = target_inset->asInsetText();
+ if (inset_text && !inset_text->allowMultiPar()) {
+ while (insertion.size() > 1)
+ mergeParagraph(buffer.params(), insertion, 0);
+ }
+
// 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) {
pos_type end = insertion[i].size();
for (pos_type j = 0; j != end; ++j) {
+ // skip insets
+ if (insertion[i].isInset(j))
+ continue;
char_type const c = insertion[i].getChar(j);
if (!e->encodable(c)) {
// do not track deletion
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.
+ // since some inset might try to access the buffer() member.
it->setBuffer(const_cast<Buffer &>(buffer));
switch (it->lyxCode()) {
continue;
InsetLabel * lab = labels[i];
docstring const oldname = lab->getParam("name");
- lab->updateLabel(oldname);
+ lab->updateLabel(oldname, in_active_inset);
// We need to update the buffer reference cache.
need_update = true;
docstring const newname = lab->getParam("name");
// check for duplicates
InsetLabel & lab = static_cast<InsetLabel &>(*it);
docstring const oldname = lab.getParam("name");
- lab.updateLabel(oldname);
+ lab.updateLabel(oldname, in_active_inset);
// We need to update the buffer reference cache.
need_update = true;
docstring const newname = lab.getParam("name");
// 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 0);
+ LASSERT(buffer, return nullptr);
// This needs doing every time.
// Since setDocumentClass() causes deletion of the old document class
it = copy_pars.begin();
for (; it != it_end; ++it) {
it->resetBuffer();
- it->setInsetOwner(0);
+ it->setInsetOwner(nullptr);
}
cutstack.push(make_pair(copy_pars, dc));
// character styles and hidden table cells
InsetIterator const i_end = inset_iterator_end(in);
- for (InsetIterator it = inset_iterator_begin(in); it != i_end; ++it) {
- InsetCode const code = it->lyxCode();
+ for (InsetIterator iit = inset_iterator_begin(in); iit != i_end; ++iit) {
+ InsetCode const code = iit->lyxCode();
if (code == FLEX_CODE) {
// FIXME: Should we verify all InsetCollapsible?
- docstring const layoutName = it->layoutName();
+ docstring const layoutName = iit->layoutName();
docstring const & n = newone->insetLayout(layoutName).name();
bool const is_undefined = n.empty() ||
n == DocumentClass::plainInsetLayout().name();
// To warn the user that something had to be done.
errorlist.push_back(ErrorItem(
_("Undefined flex inset"), s,
- {it.paragraph().id(), it.pos()},
- {it.paragraph().id(), it.pos()+1}));
+ {iit.paragraph().id(), iit.pos()},
+ {iit.paragraph().id(), iit.pos() + 1}));
} else if (code == TABULAR_CODE) {
// The recursion above does not catch paragraphs in "hidden" cells,
// i.e., ones that are part of a multirow or multicolum. So we need
// to handle those separately.
// This is the cause of bug #9049.
- InsetTabular * table = it->asInsetTabular();
+ InsetTabular * table = iit->asInsetTabular();
table->setLayoutForHiddenCells(newtc);
}
}
namespace {
-void cutSelectionHelper(Cursor & cur, CutStack & cuts, bool doclear, bool realcut, bool putclip)
+void cutSelectionHelper(Cursor & cur, CutStack & cuts, bool realcut, bool putclip)
{
// This doesn't make sense, if there is no selection
if (!cur.selection())
cur.pos() = endpos;
cur.pit() = endpit;
- // sometimes necessary
- if (doclear
- && text->paragraphs()[begpit].stripLeadingSpaces(bp.track_changes))
- cur.fixIfBroken();
-
// need a valid cursor. (Lgb)
cur.clearSelection();
} // namespace
-void cutSelection(Cursor & cur, bool doclear, bool realcut)
+void cutSelection(Cursor & cur, bool realcut)
{
- cutSelectionHelper(cur, theCuts, doclear, realcut, true);
+ cutSelectionHelper(cur, theCuts, realcut, true);
}
-void cutSelectionToTemp(Cursor & cur, bool doclear, bool realcut)
+void cutSelectionToTemp(Cursor & cur, bool realcut)
{
- cutSelectionHelper(cur, tempCut, doclear, realcut, false);
+ cutSelectionHelper(cur, tempCut, realcut, false);
}
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));
+ // For pasting into text, we set the language to the paragraph language
+ // (rather than the default_language which is always English; see #2596)
+ 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()));
}
}
+void copySelectionToTemp(Cursor & cur)
+{
+ copySelectionToStack(cur, tempCut);
+}
+
+
void copySelection(Cursor const & cur, docstring const & plaintext)
{
// In tablemode, because copy and paste actually use special table stack
Buffer buffer("", false);
buffer.setUnnamed(true);
available = buffer.importString(names[i], text, errorList);
- // TeX2lyx (also used in the HTML chain) assumes English as document language
- // if no language is explicitly set (as is the case here).
- // We thus reset the temp buffer's language to the context language
- buffer.changeLanguage(buffer.language(), cur.getFont().language());
if (available)
available = !buffer.paragraphs().empty();
if (available && !buffer.paragraphs()[0].empty()) {
+ // TeX2lyx (also used in the HTML chain) assumes English as document language
+ // if no language is explicitly set (as is the case here).
+ // We thus reset the temp buffer's language to the context language
+ buffer.changeLanguage(buffer.language(), cur.getFont().language());
cur.recordUndo();
pasteParagraphList(cur, buffer.paragraphs(),
buffer.params().documentClassPtr(), errorList);
return;
cur.recordUndo();
- cutSelection(cur, true, false);
+ cutSelection(cur, false);
if (asParagraphs)
cur.text()->insertStringAsParagraphs(cur, text, cur.current_font);
else
par.insertChar(pos, *cit, font, cur.buffer()->params().track_changes);
// Cut the selection
- cutSelection(cur, true, false);
+ cutSelection(cur, false);
}
void replaceSelection(Cursor & cur)
{
if (cur.selection())
- cutSelection(cur, true, false);
+ cutSelection(cur, false);
}