#include "support/lassert.h"
#include "support/limited_stack.h"
#include "support/lstrings.h"
+#include "support/TempFile.h"
#include "frontends/alert.h"
#include "frontends/Clipboard.h"
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();
pos_type pos = cur.pos();
bool need_update = false;
+
+ if (parlist.empty())
+ return PasteReturnValue(pit, pos, need_update);
+
InsetText * target_inset = cur.inset().asInsetText();
if (!target_inset) {
InsetTabular * it = cur.inset().asInsetTabular();
target_inset = it? it->cell(cur.idx())->asInsetText() : 0;
}
LASSERT(target_inset, return PasteReturnValue(pit, pos, need_update));
- ParagraphList & pars = target_inset->paragraphs();
-
- if (parlist.empty())
- return PasteReturnValue(pit, pos, need_update);
- BOOST_ASSERT (pos <= pars[pit].size());
+ ParagraphList & pars = target_inset->paragraphs();
+ LASSERT(pos <= pars[pit].size(),
+ return PasteReturnValue(pit, pos, need_update));
// Make a copy of the CaP paragraphs.
ParagraphList insertion = parlist;
- DocumentClassConstPtr newDocClass = buffer.params().documentClassPtr();
// Now remove all out of the pars which is NOT allowed in the
// new environment and set also another font if that is required.
}
// set the paragraphs to plain layout if necessary
+ DocumentClassConstPtr newDocClass = buffer.params().documentClassPtr();
if (cur.inset().usePlainLayout()) {
bool forcePlainLayout = cur.inset().forcePlainLayout();
Layout const & plainLayout = newDocClass->plainLayout();
if (forcePlainLayout || parLayout == defaultLayout)
par->setLayout(plainLayout);
}
- } else { // check if we need to reset from plain layout
+ } else { // check if we need to reset from plain layout
Layout const & defaultLayout = newDocClass->defaultLayout();
Layout const & plainLayout = newDocClass->plainLayout();
ParagraphList::iterator const end = insertion.end();
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));
}
|| (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;
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.
- Buffer * staticbuffer = theBufferList().newInternalBuffer(
- FileName::tempName("clipboard.internal").absFileName());
+ // 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);
// 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;
it->setLayout(newtc[name]);
}
- // character styles
+ // 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) {
- if (it->lyxCode() != FLEX_CODE)
+ InsetCode const code = it->lyxCode();
+ if (code == FLEX_CODE) {
// FIXME: Should we verify all InsetCollapsable?
- continue;
-
- docstring const layoutName = it->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());
- docstring s;
- if (oldname == newname)
- s = bformat(_("Flex inset %1$s is undefined after "
- "reloading `%2$s' layout."), layoutName, oldname);
- else
- s = bformat(_("Flex inset %1$s is undefined because of "
- "conversion from `%2$s' layout to `%3$s'."),
- 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));
+ docstring const layoutName = it->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());
+ docstring s;
+ if (oldname == newname)
+ s = bformat(_("Flex inset %1$s is undefined after "
+ "reloading `%2$s' layout."), layoutName, oldname);
+ else
+ s = bformat(_("Flex inset %1$s is undefined because of "
+ "conversion from `%2$s' layout to `%3$s'."),
+ 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));
+ } 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();
+ table->setLayoutForHiddenCells(newtc);
+ }
}
}
if (cur.inTexted()) {
Text * text = cur.text();
- LBUFERR(text, _("Invalid cursor!"));
+ LBUFERR(text);
saveSelection(cur);
// 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()));
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;
}
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);
//lyxerr << "cap::eraseSelection begin: " << cur << endl;
CursorSlice const & i1 = cur.selBegin();
CursorSlice const & i2 = cur.selEnd();
- if (i1.inset().asInsetMath()) {
- saveSelection(cur);
- cur.top() = i1;
- if (i1.idx() == i2.idx()) {
- i1.cell().erase(i1.pos(), i2.pos());
- // We may have deleted i1.cell(cur.pos()).
- // Make sure that pos is valid.
- if (cur.pos() > cur.lastpos())
- cur.pos() = cur.lastpos();
- } else {
- InsetMath * p = i1.asInsetMath();
- Inset::row_type r1, r2;
- Inset::col_type c1, c2;
- region(i1, i2, r1, r2, c1, c2);
- for (Inset::row_type row = r1; row <= r2; ++row)
- for (Inset::col_type col = c1; col <= c2; ++col)
- p->cell(p->index(row, col)).clear();
- // We've deleted the whole cell. Only pos 0 is valid.
- cur.pos() = 0;
- }
- // need a valid cursor. (Lgb)
- cur.clearSelection();
+ if (!i1.asInsetMath()) {
+ LYXERR0("Can't erase this selection");
+ return;
+ }
+
+ saveSelection(cur);
+ cur.top() = i1;
+ InsetMath * p = i1.asInsetMath();
+ if (i1.idx() == i2.idx()) {
+ i1.cell().erase(i1.pos(), i2.pos());
+ // We may have deleted i1.cell(cur.pos()).
+ // Make sure that pos is valid.
+ if (cur.pos() > cur.lastpos())
+ cur.pos() = cur.lastpos();
+ } else if (p->nrows() > 0 && p->ncols() > 0) {
+ // This is a grid, delete a nice square region
+ Inset::row_type r1, r2;
+ Inset::col_type c1, c2;
+ region(i1, i2, r1, r2, c1, c2);
+ for (Inset::row_type row = r1; row <= r2; ++row)
+ for (Inset::col_type col = c1; col <= c2; ++col)
+ p->cell(p->index(row, col)).clear();
+ // We've deleted the whole cell. Only pos 0 is valid.
+ cur.pos() = 0;
} else {
- lyxerr << "can't erase this selection 1" << endl;
+ Inset::idx_type idx1 = i1.idx();
+ Inset::idx_type idx2 = i2.idx();
+ if (idx1 > idx2)
+ swap(idx1, idx2);
+ for (Inset::idx_type idx = idx1 ; idx <= idx2; ++idx)
+ p->cell(idx).clear();
+ // We've deleted the whole cell. Only pos 0 is valid.
+ cur.pos() = 0;
}
+
+ // need a valid cursor. (Lgb)
+ cur.clearSelection();
//lyxerr << "cap::eraseSelection end: " << cur << endl;
}
projects / lyx.git / blobdiff