#include "insets/InsetBibitem.h"
#include "insets/InsetBranch.h"
+#include "insets/InsetCitation.h"
#include "insets/InsetCommand.h"
#include "insets/InsetFlex.h"
#include "insets/InsetGraphics.h"
CutStack theCuts(10);
// persistent selection, cleared until the next selection
CutStack selectionBuffer(1);
+// temporary scratch area
+CutStack tempCut(1);
// store whether the tabular stack is newer than the normal copy stack
// FIXME: this is a workaround for bug 1919. Should be removed for 1.5,
PasteReturnValue
pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist,
- DocumentClassConstPtr oldDocClass, Buffer * tmpbuffer,
+ DocumentClassConstPtr oldDocClass, cap::BranchAction branchAction,
ErrorList & errorlist)
{
Buffer const & buffer = *cur.buffer();
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();
// 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) {
}
}
+ // Prevent to paste uncodable characters in verbatim and ERT.
+ // The encoding is inherited from the context here.
+ docstring uncodable_content;
+ if (target_inset->getLayout().isPassThru() && cur.getEncoding()) {
+ odocstringstream res;
+ Encoding const * e = cur.getEncoding();
+ 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
+ res.put(c);
+ insertion[i].eraseChar(j, false);
+ --end;
+ --j;
+ }
+ }
+ }
+ docstring const uncodable = res.str();
+ if (!uncodable.empty()) {
+ if (uncodable.size() == 1)
+ uncodable_content = bformat(_("The character \"%1$s\" is uncodable in this verbatim context "
+ "and thus has not been pasted."),
+ uncodable);
+ else
+ uncodable_content = bformat(_("The characters \"%1$s\" are uncodable in this verbatim context "
+ "and thus have not been pasted."),
+ uncodable);
+ }
+ }
+
// set the paragraphs to plain layout if necessary
DocumentClassConstPtr newDocClass = buffer.params().documentClassPtr();
if (cur.inset().usePlainLayout()) {
- bool forcePlainLayout = cur.inset().forcePlainLayout();
+ bool forcePlainLayout = target_inset->forcePlainLayout();
Layout const & plainLayout = newDocClass->plainLayout();
Layout const & defaultLayout = newDocClass->defaultLayout();
ParagraphList::iterator const end = insertion.end();
// want to invalidate them.
insertion.swap(in.paragraphs());
cap::switchBetweenClasses(oldDocClass, newDocClass, in, errorlist);
+ // Do this here since switchBetweenClasses clears the errorlist
+ if (!uncodable_content.empty())
+ errorlist.push_back(ErrorItem(_("Uncodable content"), uncodable_content));
insertion.swap(in.paragraphs());
ParagraphList::iterator tmpbuf = insertion.begin();
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
+ // 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 &>(buffer));
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");
break;
}
+ case CITE_CODE: {
+ InsetCitation & cit = static_cast<InsetCitation &>(*it);
+ // This actually only needs to be done if the cite engine
+ // differs, but we do it in general.
+ cit.redoLabel();
+ // We need to update the list of citations.
+ need_update = true;
+ break;
+ }
+
case BIBITEM_CODE: {
// check for duplicates
InsetBibitem & bib = static_cast<InsetBibitem &>(*it);
|| (is_child && (branchlist.find(name)
|| buffer.masterBuffer()->params().branchlist().find(name))))
break;
- if (tmpbuffer) {
+ switch(branchAction) {
+ case cap::BRANCH_ADD: {
// 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 {
+ const_cast<Buffer&>(buffer).dispatch(FuncRequest(LFUN_BRANCH_ADD, name), dr);
+ break;
+ }
+ case cap::BRANCH_ASK: {
docstring text = bformat(
_("The pasted branch \"%1$s\" is undefined.\n"
"Do you want to add it to the document's branch list?"),
text, 0, 1, _("&Add"), _("&Don't Add")) != 0)
break;
lyx::dispatch(FuncRequest(LFUN_BRANCH_ADD, name));
+ break;
+ }
+ case cap::BRANCH_IGNORE:
+ break;
}
// We need to update the list of branches.
need_update = true;
// 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));
+ pars[p].setInsetBuffers(const_cast<Buffer &>(buffer));
// Join (conditionally) last pasted paragraph with next one, i.e.,
// the tail of the spliced document paragraph
// Separate handling of paragraph break:
if (merge && pit != endpit &&
- (pit + 1 != endpit
+ (pit + 1 != endpit
|| pars[pit].hasSameLayout(pars[endpit])
|| pars[endpit].size() == endpos)) {
if (pit + 1 == endpit)
// 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.
- // 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);
-
+ // The initialization of staticbuffer is thread-safe. Using a lambda
+ // guarantees that the properties are set only once.
+ static Buffer * staticbuffer = [&](){
+ Buffer * b =
+ theBufferList().newInternalBuffer(tempfile.name().absFileName());
+ b->setUnnamed(true);
+ b->inset().setBuffer(*b);
+ //initialize staticbuffer with b
+ return b;
+ }();
// 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();
// 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);
+ pasteSelectionHelper(dit, paragraphs, docclass, cap::BRANCH_ADD, el);
return buffer;
}
-void putClipboard(ParagraphList const & paragraphs,
+void putClipboard(ParagraphList const & paragraphs,
DocumentClassConstPtr docclass, docstring const & plaintext)
{
Buffer * buffer = copyToTempBuffer(paragraphs, docclass);
// 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));
+ it->setInsetBuffers(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 (it->isPassThru())
- it->changeLanguage(buf.params(),
+ it->changeLanguage(buf.params(),
latex_language, buf.language());
}
// are not linked to something else.
it = copy_pars.begin();
for (; it != it_end; ++it) {
- it->setBuffer(*static_cast<Buffer *>(0));
+ it->resetBuffer();
it->setInsetOwner(0);
}
cutstack.push(make_pair(copy_pars, dc));
}
-} // namespace anon
-
-
+} // namespace
namespace cap {
}
-bool reduceSelectionToOneCell(Cursor & cur)
+bool reduceSelectionToOneCell(CursorData & cur)
{
if (!cur.selection() || !cur.inMathed())
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)
+bool multipleCellsSelected(CursorData 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;
}
LBUFERR(!in.paragraphs().empty());
if (oldone == newone)
return;
-
+
DocumentClass const & oldtc = *oldone;
DocumentClass const & newtc = *newone;
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()));
+ errorlist.push_back(ErrorItem(_("Layout Not Found"), s,
+ {it->id(), 0}, {it->id(), -1}));
}
if (in.usePlainLayout())
// 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 InsetCollapsable?
- docstring const layoutName = it->layoutName();
+ // FIXME: Should we verify all InsetCollapsible?
+ docstring const layoutName = iit->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 oldname = from_utf8(oldtc.name());
docstring const newname = from_utf8(newtc.name());
layoutName, oldname, newname);
// To warn the user that something had to be done.
errorlist.push_back(ErrorItem(
- _("Undefined flex inset"),
- s, it.paragraph().id(), it.pos(), it.pos() + 1));
+ _("Undefined flex inset"), s,
+ {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);
}
}
for (; pit != pend; ++pit) {
Paragraph par(*pit, 0, 46);
// adapt paragraph to current buffer.
- par.setBuffer(const_cast<Buffer &>(*buf));
+ par.setInsetBuffers(const_cast<Buffer &>(*buf));
textSel += par.asString(AS_STR_INSETS);
if (textSel.size() > 45) {
support::truncateWithEllipsis(textSel,45);
return theCuts.size();
}
+namespace {
-void cutSelection(Cursor & cur, bool doclear, bool realcut)
+void cutSelectionHelper(Cursor & cur, CutStack & cuts, bool realcut, bool putclip)
{
// This doesn't make sense, if there is no selection
if (!cur.selection())
*text,
begpit, endpit,
cur.selBegin().pos(), endpos,
- bp.documentClassPtr(), theCuts);
+ bp.documentClassPtr(), cuts);
// Stuff what we got on the clipboard.
// Even if there is no selection.
- putClipboard(theCuts[0].first, theCuts[0].second,
- cur.selectionAsString(true));
+ if (putclip)
+ putClipboard(cuts[0].first, cuts[0].second,
+ cur.selectionAsString(true));
}
if (begpit != endpit)
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 realcut)
+{
+ cutSelectionHelper(cur, theCuts, realcut, true);
+}
+
+
+void cutSelectionToTemp(Cursor & cur, bool realcut)
+{
+ cutSelectionHelper(cur, tempCut, realcut, false);
+}
+
void copySelection(Cursor const & cur)
{
namespace {
-void copySelectionToStack(Cursor const & cur, CutStack & cutstack)
+void copySelectionToStack(CursorData const & cur, CutStack & cutstack)
{
// this doesn't make sense, if there is no selection
if (!cur.selection())
// and sel_end cursor
copySelectionHelper(*cur.buffer(), *text,
cur.selBegin().pit(), cur.selEnd().pit(),
- cur.selBegin().pos(), cur.selEnd().pos(),
+ cur.selBegin().pos(), cur.selEnd().pos(),
cur.buffer()->params().documentClassPtr(),
cutstack);
// Reset the dirty_tabular_stack_ flag only when something
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()));
}
}
-}
+} // namespace
void copySelectionToStack()
}
+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
// This function is called, not when a selection is formed, but when
// a selection is cleared. Therefore, multiple keyboard selection
// will not repeatively trigger this function (bug 3877).
- if (cur.selection()
+ if (cur.selection()
&& cur.selBegin() == cur.bv().cursor().selBegin()
&& cur.selEnd() == cur.bv().cursor().selEnd()) {
LYXERR(Debug::SELECTION, "saveSelection: '" << cur.selectionAsString(true) << "'");
void clearCutStack()
{
theCuts.clear();
+ tempCut.clear();
}
void pasteParagraphList(Cursor & cur, ParagraphList const & parlist,
- DocumentClassConstPtr docclass, ErrorList & errorList)
+ DocumentClassConstPtr docclass, ErrorList & errorList,
+ cap::BranchAction branchAction)
{
if (cur.inTexted()) {
Text * text = cur.text();
LBUFERR(text);
PasteReturnValue prv =
- pasteSelectionHelper(cur, parlist, docclass, 0, errorList);
+ pasteSelectionHelper(cur, parlist, docclass, branchAction, errorList);
cur.forceBufferUpdate();
cur.clearSelection();
text->setCursor(cur, prv.pit, prv.pos);
cur.recordUndo();
pasteParagraphList(cur, theCuts[sel_index].first,
- theCuts[sel_index].second, errorList);
+ theCuts[sel_index].second, errorList, BRANCH_ASK);
+ return true;
+}
+
+
+bool pasteFromTemp(Cursor & cur, ErrorList & errorList)
+{
+ // this does not make sense, if there is nothing to paste
+ if (tempCut.empty() || tempCut[0].first.empty())
+ return false;
+
+ cur.recordUndo();
+ pasteParagraphList(cur, tempCut[0].first,
+ tempCut[0].second, errorList, BRANCH_IGNORE);
return true;
}
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);
cur.text()->insertStringAsParagraphs(cur, text, cur.current_font);
else
cur.text()->insertStringAsLines(cur, text, cur.current_font);
+ cur.forceBufferUpdate();
return true;
}
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);
}
}
-docstring grabSelection(Cursor const & cur)
+docstring grabSelection(CursorData const & cur)
{
if (!cur.selection())
return docstring();
projects / lyx.git / blobdiff