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);
tmpbuf->eraseChar(i--, false);
}
- tmpbuf->setChange(Change(buffer.params().trackChanges ?
+ tmpbuf->setChange(Change(buffer.params().track_changes ?
Change::INSERTED : Change::UNCHANGED));
}
pars[last_paste].makeSameLayout(pars[last_paste + 1]);
mergeParagraph(buffer.params(), pars, last_paste);
} else {
- pars[last_paste + 1].stripLeadingSpaces(buffer.params().trackChanges);
+ pars[last_paste + 1].stripLeadingSpaces(buffer.params().track_changes);
++last_paste;
}
}
// Start and end is inside same paragraph
if (endpit == pit_type(pars.size()) || startpit == endpit) {
- endpos -= pars[startpit].eraseChars(startpos, endpos, params.trackChanges);
+ endpos -= pars[startpit].eraseChars(startpos, endpos, params.track_changes);
return PitPosPair(endpit, endpos);
}
for (pit_type pit = startpit; pit != endpit + 1;) {
pos_type const left = (pit == startpit ? startpos : 0);
pos_type right = (pit == endpit ? endpos : pars[pit].size() + 1);
- bool const merge = pars[pit].isMergedOnEndOfParDeletion(params.trackChanges);
+ bool const merge = pars[pit].isMergedOnEndOfParDeletion(params.track_changes);
// Logically erase only, including the end-of-paragraph character
- pars[pit].eraseChars(left, right, params.trackChanges);
+ pars[pit].eraseChars(left, right, params.track_changes);
// Separate handling of paragraph break:
if (merge && pit != 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 Buffer * staticbuffer = theBufferList().newInternalBuffer(
FileName::tempName("clipboard.internal").absFileName());
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);
// sometimes necessary
if (doclear
- && text->paragraphs()[begpit].stripLeadingSpaces(bp.trackChanges))
+ && text->paragraphs()[begpit].stripLeadingSpaces(bp.track_changes))
cur.fixIfBroken();
// need a valid cursor. (Lgb)
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()));
}
-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;
}
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().track_changes);
// Cut the selection
cutSelection(cur, true, false);