PasteReturnValue
pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist,
- DocumentClassConstPtr oldDocClass, ErrorList & errorlist)
+ DocumentClassConstPtr oldDocClass, Buffer * tmpbuffer,
+ ErrorList & errorlist)
{
Buffer const & buffer = *cur.buffer();
pit_type pit = cur.pit();
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);
|| (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.
need_update = true;
break;
// 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.
- Buffer * staticbuffer = theBufferList().newInternalBuffer(
+ // FIXME THREAD
+ static Buffer * staticbuffer = theBufferList().newInternalBuffer(
FileName::tempName("clipboard.internal").absFileName());
// These two things only really need doing the first time.
// 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, 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;
- // 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"));
- buffer->writeLyXHTMLSource(oshtml, runparams, Buffer::FullSource);
-
- theClipboard().put(lyx, oshtml.str(), plaintext);
+ // 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
delete buffer;
{
errorlist.clear();
- LBUFERR(!in.paragraphs().empty(), _(""));
+ LBUFERR(!in.paragraphs().empty());
if (oldone == newone)
return;
if (cur.inTexted()) {
Text * text = cur.text();
- LBUFERR(text, _("Invalid cursor!"));
+ LBUFERR(text);
saveSelection(cur);
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()));
if (cur.inTexted()) {
Text * text = cur.text();
- LBUFERR(text, _("Invalid cursor!"));
+ LBUFERR(text);
// ok we have a selection. This is always between cur.selBegin()
// and sel_end cursor
{
if (cur.inTexted()) {
Text * text = cur.text();
- LBUFERR(text, _("Invalid cursor!"));
+ LBUFERR(text);
PasteReturnValue prv =
- pasteSelectionHelper(cur, parlist, docclass, errorList);
- if (prv.needupdate)
- cur.forceBufferUpdate();
+ pasteSelectionHelper(cur, parlist, docclass, 0, errorList);
+ cur.forceBufferUpdate();
cur.clearSelection();
text->setCursor(cur, prv.par, prv.pos);
}
}
-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 ||
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;
// 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;
}
}
}
// 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;
}