#include "BufferView.h"
#include "Changes.h"
#include "Cursor.h"
+#include "Encoding.h"
#include "ErrorList.h"
#include "FuncCode.h"
#include "FuncRequest.h"
#include "Paragraph.h"
#include "ParagraphParameters.h"
#include "ParIterator.h"
-#include "Undo.h"
+#include "TextClass.h"
+#include "insets/InsetBibitem.h"
#include "insets/InsetBranch.h"
#include "insets/InsetCommand.h"
#include "insets/InsetFlex.h"
#include "support/debug.h"
#include "support/docstream.h"
#include "support/gettext.h"
+#include "support/lassert.h"
#include "support/limited_stack.h"
#include "support/lstrings.h"
+#include "support/lyxalgo.h"
+#include "support/TempFile.h"
+#include "support/unique_ptr.h"
#include "frontends/alert.h"
#include "frontends/Clipboard.h"
#include "frontends/Selection.h"
-#include <boost/tuple/tuple.hpp>
-#include <boost/next_prior.hpp>
-
#include <string>
+#include <tuple>
using namespace std;
using namespace lyx::support;
typedef pair<pit_type, int> PitPosPair;
-typedef limited_stack<pair<ParagraphList, DocumentClass const *> > CutStack;
+typedef limited_stack<pair<ParagraphList, DocumentClassConstPtr> > CutStack;
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,
}
-pair<PitPosPair, pit_type>
-pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist,
- DocumentClass const * const oldDocClass, ErrorList & errorlist)
+struct PasteReturnValue {
+ PasteReturnValue(pit_type r_pit, pos_type r_pos, bool r_nu) :
+ pit(r_pit), pos(r_pos), needupdate(r_nu)
+ {}
+
+ pit_type pit;
+ pos_type pos;
+ bool needupdate;
+};
+
+PasteReturnValue
+pasteSelectionHelper(DocIterator const & cur, ParagraphList const & parlist,
+ DocumentClassConstPtr oldDocClass, cap::BranchAction branchAction,
+ 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;
+ target_inset = it ? it->cell(cur.idx())->asInsetText() : 0;
}
- LASSERT(target_inset, return make_pair(PitPosPair(pit, pos), pit));
- ParagraphList & pars = target_inset->paragraphs();
-
- if (parlist.empty())
- return make_pair(PitPosPair(pit, pos), pit);
+ LASSERT(target_inset, 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;
- DocumentClass const * const 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.
- // Convert newline to paragraph break in ERT inset.
- // This should not be here!
- InsetCode const code = target_inset->lyxCode();
- if (code == ERT_CODE || code == LISTINGS_CODE) {
+ // 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) {
for (pos_type j = 0; j != insertion[i].size(); ++j) {
if (insertion[i].isNewline(j)) {
}
}
+ // 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();
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();
// 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();
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));
}
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, e.g., InsetLabel::updateCommand() is going to try to access
+ // 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));
switch (it->lyxCode()) {
case MATH_HULL_CODE: {
// check for equation labels and resolve duplicates
- InsetMathHull & ins = static_cast<InsetMathHull &>(*it);
- std::vector<InsetLabel *> labels = ins.getLabels();
+ InsetMathHull * ins = it->asInsetMath()->asHullInset();
+ std::vector<InsetLabel *> labels = ins->getLabels();
for (size_t i = 0; i != labels.size(); ++i) {
if (!labels[i])
continue;
InsetLabel * lab = labels[i];
docstring const oldname = lab->getParam("name");
- lab->updateCommand(oldname, false);
+ lab->updateLabel(oldname);
+ // We need to update the buffer reference cache.
+ need_update = true;
docstring const newname = lab->getParam("name");
if (oldname == newname)
continue;
for (InsetIterator itt = inset_iterator_begin(in);
itt != i_end; ++itt) {
if (itt->lyxCode() == REF_CODE) {
- InsetCommand & ref =
- static_cast<InsetCommand &>(*itt);
- if (ref.getParam("reference") == oldname)
- ref.setParam("reference", newname);
+ InsetCommand * ref = itt->asInsetCommand();
+ if (ref->getParam("reference") == oldname)
+ ref->setParam("reference", newname);
} else if (itt->lyxCode() == MATH_REF_CODE) {
- InsetMathHull & mi =
- static_cast<InsetMathHull &>(*itt);
+ InsetMathRef * mi = itt->asInsetMath()->asRefInset();
// this is necessary to prevent an uninitialized
// buffer when the RefInset is in a MathBox.
- // FIXME audit setBuffer/updateBuffer calls
- mi.setBuffer(const_cast<Buffer &>(buffer));
- if (mi.asRefInset()->getTarget() == oldname)
- mi.asRefInset()->changeTarget(newname);
+ // FIXME audit setBuffer calls
+ mi->setBuffer(const_cast<Buffer &>(buffer));
+ if (mi->getTarget() == oldname)
+ mi->changeTarget(newname);
}
}
}
case LABEL_CODE: {
// check for duplicates
- InsetCommand & lab = static_cast<InsetCommand &>(*it);
+ InsetLabel & lab = static_cast<InsetLabel &>(*it);
docstring const oldname = lab.getParam("name");
- lab.updateCommand(oldname, false);
+ lab.updateLabel(oldname);
+ // We need to update the buffer reference cache.
+ need_update = true;
docstring const newname = lab.getParam("name");
if (oldname == newname)
break;
if (ref.getParam("reference") == oldname)
ref.setParam("reference", newname);
} else if (itt->lyxCode() == MATH_REF_CODE) {
- InsetMathHull & mi =
- static_cast<InsetMathHull &>(*itt);
+ InsetMathRef * mi = itt->asInsetMath()->asRefInset();
// this is necessary to prevent an uninitialized
// buffer when the RefInset is in a MathBox.
- // FIXME audit setBuffer/updateBuffer calls
- mi.setBuffer(const_cast<Buffer &>(buffer));
- if (mi.asRefInset()->getTarget() == oldname)
- mi.asRefInset()->changeTarget(newname);
+ // FIXME audit setBuffer calls
+ mi->setBuffer(const_cast<Buffer &>(buffer));
+ if (mi->getTarget() == oldname)
+ mi->changeTarget(newname);
}
}
break;
case INCLUDE_CODE: {
InsetInclude & inc = static_cast<InsetInclude &>(*it);
inc.updateCommand();
+ // We need to update the list of included files.
+ need_update = true;
break;
}
case BIBITEM_CODE: {
// check for duplicates
- InsetCommand & bib = static_cast<InsetCommand &>(*it);
+ InsetBibitem & bib = static_cast<InsetBibitem &>(*it);
docstring const oldkey = bib.getParam("key");
bib.updateCommand(oldkey, false);
+ // We need to update the buffer reference cache.
+ need_update = true;
docstring const newkey = bib.getParam("key");
if (oldkey == newkey)
break;
for (InsetIterator itt = inset_iterator_begin(in);
itt != i_end; ++itt) {
if (itt->lyxCode() == CITE_CODE) {
- InsetCommand & ref =
- static_cast<InsetCommand &>(*itt);
- if (ref.getParam("key") == oldkey)
- ref.setParam("key", newkey);
+ InsetCommand * ref = itt->asInsetCommand();
+ if (ref->getParam("key") == oldkey)
+ ref->setParam("key", newkey);
}
}
break;
|| (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(
+ 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;
+ 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?"),
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;
+ }
+ case cap::BRANCH_IGNORE:
break;
- lyx::dispatch(FuncRequest(LFUN_BRANCH_ADD, name));
+ }
+ // We need to update the list of branches.
+ need_update = true;
break;
}
// Paste it!
if (empty) {
- pars.insert(boost::next(pars.begin(), pit),
+ pars.insert(lyx::next(pars.begin(), pit),
insertion.begin(),
insertion.end());
mergeParagraph(buffer.params(), pars,
pit + insertion.size() - 1);
} else {
- pars.insert(boost::next(pars.begin(), pit + 1),
+ pars.insert(lyx::next(pars.begin(), pit + 1),
insertion.begin(),
insertion.end());
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;
}
}
- return make_pair(PitPosPair(pit, pos), last_paste + 1);
+ return PasteReturnValue(pit, pos, need_update);
}
// 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 &&
- (pit + 1 != endpit
+ (pit + 1 != endpit
|| pars[pit].hasSameLayout(pars[endpit])
|| pars[endpit].size() == endpos)) {
if (pit + 1 == endpit)
}
-void putClipboard(ParagraphList const & paragraphs,
- DocumentClass const * const docclass, docstring const & plaintext)
+Buffer * copyToTempBuffer(ParagraphList const & paragraphs, DocumentClassConstPtr docclass)
{
- // For some strange reason gcc 3.2 and 3.3 do not accept
- // Buffer buffer(string(), false);
- // This needs to be static to avoid a memory leak. When a Buffer is
- // constructed, it constructs a BufferParams, which in turn constructs
- // a DocumentClass, via new, that is never deleted. If we were to go to
- // some kind of garbage collection there, or a shared_ptr, then this
- // would not be needed.
- static Buffer * buffer = theBufferList().newBuffer(
- FileName::tempName().absFileName() + "_clipboard.internal");
- buffer->setUnnamed(true);
- buffer->paragraphs() = paragraphs;
- buffer->inset().setBuffer(*buffer);
+ // This used to need to be static to avoid a memory leak. It no longer needs
+ // 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.
+ static TempFile tempfile("clipboard.internal");
+ tempfile.setAutoRemove(false);
+ // 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();
+ LASSERT(buffer, return 0);
+
+ // This needs doing every time.
+ // Since setDocumentClass() causes deletion of the old document class
+ // we need to reset all layout pointers in paragraphs (otherwise they
+ // would be dangling).
+ ParIterator const end = buffer->par_iterator_end();
+ for (ParIterator it = buffer->par_iterator_begin(); it != end; ++it) {
+ docstring const name = it->layout().name();
+ if (docclass->hasLayout(name))
+ it->setLayout((*docclass)[name]);
+ else
+ it->setPlainOrDefaultLayout(*docclass);
+ }
buffer->params().setDocumentClass(docclass);
- ostringstream lyx;
- if (buffer->write(lyx))
- theClipboard().put(lyx.str(), plaintext);
- else
- theClipboard().put(string(), plaintext);
+
+ // we will use pasteSelectionHelper to copy the paragraphs into the
+ // 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, cap::BRANCH_ADD, el);
+
+ return buffer;
+}
+
+
+void putClipboard(ParagraphList const & paragraphs,
+ DocumentClassConstPtr docclass, docstring const & plaintext)
+{
+ Buffer * buffer = copyToTempBuffer(paragraphs, docclass);
+ if (!buffer) // already asserted in copyToTempBuffer()
+ return;
+
+ // 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;
+
+ // 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
- buffer->paragraphs().clear();
+ delete buffer;
}
void copySelectionHelper(Buffer const & buf, Text const & text,
pit_type startpit, pit_type endpit,
- int start, int end, DocumentClass const * const dc, CutStack & cutstack)
+ int start, int end, DocumentClassConstPtr dc, CutStack & cutstack)
{
ParagraphList const & pars = text.paragraphs();
- LASSERT(0 <= start && start <= pars[startpit].size(), /**/);
- LASSERT(0 <= end && end <= pars[endpit].size(), /**/);
- LASSERT(startpit != endpit || start <= end, /**/);
+ // In most of these cases, we can try to recover.
+ LASSERT(0 <= start, start = 0);
+ LASSERT(start <= pars[startpit].size(), start = pars[startpit].size());
+ LASSERT(0 <= end, end = 0);
+ LASSERT(end <= pars[endpit].size(), end = pars[endpit].size());
+ LASSERT(startpit != endpit || start <= end, return);
// Clone the paragraphs within the selection.
- ParagraphList copy_pars(boost::next(pars.begin(), startpit),
- boost::next(pars.begin(), endpit + 1));
+ ParagraphList copy_pars(lyx::next(pars.begin(), startpit),
+ lyx::next(pars.begin(), endpit + 1));
// Remove the end of the last paragraph; afterwards, remove the
// beginning of the first paragraph. Keep this order - there may only
ParagraphList::iterator it = copy_pars.begin();
ParagraphList::iterator it_end = copy_pars.end();
- for (; it != it_end; it++) {
+ for (; it != it_end; ++it) {
// Since we have a copy of the paragraphs, the insets
// do not have a proper buffer reference. It makes
// sense to add them temporarily, because the
// PassThru paragraphs have the Language
// latex_language. This is invalid for others, so we
// need to change it to the buffer language.
- if (text.inset().getLayout().isPassThru())
- it->changeLanguage(buf.params(),
+ if (it->isPassThru())
+ it->changeLanguage(buf.params(),
latex_language, buf.language());
}
// do some final cleanup now, to make sure that the paragraphs
// are not linked to something else.
it = copy_pars.begin();
- for (; it != it_end; it++) {
- it->setBuffer(*static_cast<Buffer *>(0));
+ for (; it != it_end; ++it) {
+ it->resetBuffer();
it->setInsetOwner(0);
}
- DocumentClass * d = const_cast<DocumentClass *>(dc);
- cutstack.push(make_pair(copy_pars, d));
+ cutstack.push(make_pair(copy_pars, dc));
}
-} // namespace anon
-
-
+} // namespace
namespace cap {
// 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;
}
{
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;
}
-void switchBetweenClasses(DocumentClass const * const oldone,
- DocumentClass const * const newone, InsetText & in, ErrorList & errorlist)
+void switchBetweenClasses(DocumentClassConstPtr oldone,
+ DocumentClassConstPtr newone, InsetText & in, ErrorList & errorlist)
{
errorlist.clear();
- LASSERT(!in.paragraphs().empty(), /**/);
+ LBUFERR(!in.paragraphs().empty());
if (oldone == newone)
return;
-
+
DocumentClass const & oldtc = *oldone;
DocumentClass const & newtc = *newone;
// layouts
+ ParIterator it = par_iterator_begin(in);
ParIterator end = par_iterator_end(in);
- for (ParIterator it = par_iterator_begin(in); it != end; ++it) {
+ // for remembering which layouts we've had to add
+ set<docstring> newlayouts;
+ for (; it != end; ++it) {
docstring const name = it->layout().name();
// the pasted text will keep their own layout name. If this layout does
// not exist in the new document, it will behave like a standard layout.
- newtc.addLayoutIfNeeded(name);
+ bool const added_one = newtc.addLayoutIfNeeded(name);
+ if (added_one)
+ newlayouts.insert(name);
+
+ 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->id(), -1}));
+ }
if (in.usePlainLayout())
it->setLayout(newtc.plainLayout());
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)
- // FIXME: Should we verify all InsetCollapsable?
- continue;
- docstring const & n = newone->insetLayout(it->name()).name();
- bool const is_undefined = n.empty() ||
- n == DocumentClass::plainInsetLayout().name();
- if (!is_undefined)
- continue;
- // The flex inset is undefined in newtc
- docstring const s = bformat(_(
- "Flex inset %1$s is "
- "undefined because of class "
- "conversion from\n%2$s to %3$s"),
- it->name(), from_utf8(oldtc.name()),
- from_utf8(newtc.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.pos() + 1));
+ InsetCode const code = it->lyxCode();
+ if (code == FLEX_CODE) {
+ // FIXME: Should we verify all InsetCollapsible?
+ 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.paragraph().id(), 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);
+ }
}
}
// we do not use cit-> here because gcc 2.9x does not
// like it (JMarc)
ParagraphList const & pars = (*cit).first;
- docstring asciiSel;
+ docstring textSel;
ParagraphList::const_iterator pit = pars.begin();
ParagraphList::const_iterator pend = pars.end();
for (; pit != pend; ++pit) {
- Paragraph par(*pit, 0, 26);
+ Paragraph par(*pit, 0, 46);
// adapt paragraph to current buffer.
par.setBuffer(const_cast<Buffer &>(*buf));
- asciiSel += par.asString(AS_STR_INSETS);
- if (asciiSel.size() > 25) {
- asciiSel.replace(22, docstring::npos,
- from_ascii("..."));
+ textSel += par.asString(AS_STR_INSETS);
+ if (textSel.size() > 45) {
+ support::truncateWithEllipsis(textSel,45);
break;
}
}
-
- selList.push_back(asciiSel);
+ selList.push_back(textSel);
}
return selList;
return theCuts.size();
}
+namespace {
-void cutSelection(Cursor & cur, bool doclear, bool realcut)
+void cutSelectionHelper(Cursor & cur, CutStack & cuts, bool doclear, bool realcut, bool putclip)
{
// This doesn't make sense, if there is no selection
if (!cur.selection())
if (cur.inTexted()) {
Text * text = cur.text();
- LASSERT(text, /**/);
+ LBUFERR(text);
saveSelection(cur);
*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.updateFlags(Update::Force | Update::FitCursor);
+ cur.screenUpdateFlags(Update::Force | Update::FitCursor);
- boost::tie(endpit, endpos) =
- eraseSelectionHelper(bp,
- text->paragraphs(),
- begpit, endpit,
- cur.selBegin().pos(), endpos);
+ tie(endpit, endpos) =
+ eraseSelectionHelper(bp, text->paragraphs(), begpit, endpit,
+ cur.selBegin().pos(), endpos);
// cutSelection can invalidate the cursor so we need to set
// it anew. (Lgb)
// sometimes necessary
if (doclear
- && text->paragraphs()[begpit].stripLeadingSpaces(bp.trackChanges))
+ && text->paragraphs()[begpit].stripLeadingSpaces(bp.track_changes))
cur.fixIfBroken();
// need a valid cursor. (Lgb)
cur.clearSelection();
+
+ // After a cut operation, we must make sure that the Buffer is updated
+ // because some further operation might need updated label information for
+ // example. So we cannot just use "cur.forceBufferUpdate()" here.
+ // This fixes #7071.
cur.buffer()->updateBuffer();
// tell tabular that a recent copy happened
}
}
+} // namespace
+
+void cutSelection(Cursor & cur, bool doclear, bool realcut)
+{
+ cutSelectionHelper(cur, theCuts, doclear, realcut, true);
+}
+
+
+void cutSelectionToTemp(Cursor & cur, bool doclear, bool realcut)
+{
+ cutSelectionHelper(cur, tempCut, doclear, realcut, false);
+}
+
void copySelection(Cursor const & 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()));
putClipboard(theCuts[0].first, theCuts[0].second, plaintext);
}
+
namespace {
void copySelectionToStack(Cursor const & cur, CutStack & cutstack)
if (cur.inTexted()) {
Text * text = cur.text();
- LASSERT(text, /**/);
+ LBUFERR(text);
// ok we have a selection. This is always between cur.selBegin()
// and sel_end cursor
-
- // copy behind a space if there is one
- ParagraphList & pars = text->paragraphs();
- pos_type pos = cur.selBegin().pos();
- pit_type par = cur.selBegin().pit();
- while (pos < pars[par].size() &&
- pars[par].isLineSeparator(pos) &&
- (par != cur.selEnd().pit() || pos < cur.selEnd().pos()))
- ++pos;
-
- copySelectionHelper(*cur.buffer(), *text, par, cur.selEnd().pit(),
- pos, cur.selEnd().pos(),
- cur.buffer()->params().documentClassPtr(), cutstack);
-
+ copySelectionHelper(*cur.buffer(), *text,
+ cur.selBegin().pit(), cur.selEnd().pit(),
+ cur.selBegin().pos(), cur.selEnd().pos(),
+ cur.buffer()->params().documentClassPtr(),
+ cutstack);
// Reset the dirty_tabular_stack_ flag only when something
// is copied to the clipboard (not to the selectionBuffer).
if (&cutstack == &theCuts)
}
}
-}
+} // namespace
void copySelectionToStack()
// 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();
}
-docstring selection(size_t sel_index)
+docstring selection(size_t sel_index, DocumentClassConstPtr docclass)
{
- return sel_index < theCuts.size()
- ? theCuts[sel_index].first.back().asString(AS_STR_INSETS | AS_STR_NEWLINES)
- : docstring();
+ if (sel_index >= theCuts.size())
+ return docstring();
+
+ unique_ptr<Buffer> buffer(copyToTempBuffer(theCuts[sel_index].first,
+ docclass));
+ if (!buffer)
+ return docstring();
+
+ return buffer->paragraphs().back().asString(AS_STR_INSETS | AS_STR_NEWLINES);
}
void pasteParagraphList(Cursor & cur, ParagraphList const & parlist,
- DocumentClass const * const docclass, ErrorList & errorList)
+ DocumentClassConstPtr docclass, ErrorList & errorList,
+ cap::BranchAction branchAction)
{
if (cur.inTexted()) {
Text * text = cur.text();
- LASSERT(text, /**/);
+ LBUFERR(text);
- pit_type endpit;
- PitPosPair ppp;
-
- boost::tie(ppp, endpit) =
- pasteSelectionHelper(cur, parlist, docclass, errorList);
- cur.buffer()->updateBuffer();
+ PasteReturnValue prv =
+ pasteSelectionHelper(cur, parlist, docclass, branchAction, errorList);
+ cur.forceBufferUpdate();
cur.clearSelection();
- text->setCursor(cur, ppp.first, ppp.second);
+ text->setCursor(cur, prv.pit, prv.pos);
}
// mathed is handled in InsetMathNest/InsetMathGrid
- LASSERT(!cur.inMathed(), /**/);
+ LATTEST(!cur.inMathed());
}
-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);
- cur.setSelection();
+ theCuts[sel_index].second, errorList, BRANCH_ASK);
+ return true;
}
-void pasteClipboardText(Cursor & cur, ErrorList & errorList, bool asParagraphs)
+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;
+}
+
+
+bool pasteClipboardText(Cursor & cur, ErrorList & errorList, bool asParagraphs,
+ Clipboard::TextType type)
{
// Use internal clipboard if it is the most recent one
- if (theClipboard().isInternal()) {
- pasteFromStack(cur, errorList, 0);
- return;
- }
+ // This overrides asParagraphs and type on purpose!
+ if (theClipboard().isInternal())
+ return pasteFromStack(cur, errorList, 0);
// First try LyX format
- if (theClipboard().hasLyXContents()) {
+ if ((type == Clipboard::LyXTextType ||
+ type == Clipboard::LyXOrPlainTextType ||
+ type == Clipboard::AnyTextType) &&
+ theClipboard().hasTextContents(Clipboard::LyXTextType)) {
string lyx = theClipboard().getAsLyX();
if (!lyx.empty()) {
// For some strange reason gcc 3.2 and 3.3 do not accept
cur.recordUndo();
pasteParagraphList(cur, buffer.paragraphs(),
buffer.params().documentClassPtr(), errorList);
- cur.setSelection();
- return;
+ return true;
+ }
+ }
+ }
+
+ // Then try TeX and HTML
+ Clipboard::TextType types[2] = {Clipboard::HtmlTextType, Clipboard::LaTeXTextType};
+ string names[2] = {"html", "latexclipboard"};
+ for (int i = 0; i < 2; ++i) {
+ if (type != types[i] && type != Clipboard::AnyTextType)
+ continue;
+ bool available = theClipboard().hasTextContents(types[i]);
+
+ // If a specific type was explicitly requested, try to
+ // interpret plain text: The user told us that the clipboard
+ // contents is in the desired format
+ if (!available && type == types[i]) {
+ types[i] = Clipboard::PlainTextType;
+ available = theClipboard().hasTextContents(types[i]);
+ }
+
+ if (available) {
+ docstring text = theClipboard().getAsText(types[i]);
+ available = !text.empty();
+ if (available) {
+ // For some strange reason gcc 3.2 and 3.3 do not accept
+ // Buffer buffer(string(), false);
+ Buffer buffer("", false);
+ buffer.setUnnamed(true);
+ 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 true;
+ }
}
}
}
// Then try plain text
- docstring const text = theClipboard().getAsText();
+ docstring const text = theClipboard().getAsText(Clipboard::PlainTextType);
+ if (text.empty())
+ return false;
+ cur.recordUndo();
+ if (asParagraphs)
+ cur.text()->insertStringAsParagraphs(cur, text, cur.current_font);
+ else
+ cur.text()->insertStringAsLines(cur, text, cur.current_font);
+ cur.forceBufferUpdate();
+ return true;
+}
+
+
+void pasteSimpleText(Cursor & cur, bool asParagraphs)
+{
+ docstring text;
+ // Use internal clipboard if it is the most recent one
+ if (theClipboard().isInternal()) {
+ if (!checkPastePossible(0))
+ return;
+
+ ParagraphList const & pars = theCuts[0].first;
+ ParagraphList::const_iterator it = pars.begin();
+ for (; it != pars.end(); ++it) {
+ if (it != pars.begin())
+ text += "\n";
+ text += (*it).asString();
+ }
+ asParagraphs = false;
+ } else {
+ // Then try plain text
+ text = theClipboard().getAsText(Clipboard::PlainTextType);
+ }
+
if (text.empty())
return;
+
cur.recordUndo();
+ cutSelection(cur, true, false);
if (asParagraphs)
cur.text()->insertStringAsParagraphs(cur, text, cur.current_font);
else
void pasteClipboardGraphics(Cursor & cur, ErrorList & /* errorList */,
Clipboard::GraphicsType preferedType)
{
- LASSERT(theClipboard().hasGraphicsContents(preferedType), /**/);
+ LASSERT(theClipboard().hasGraphicsContents(preferedType), return);
// get picture from clipboard
FileName filename = theClipboard().getAsGraphics(cur, preferedType);
// create inset for graphic
InsetGraphics * inset = new InsetGraphics(cur.buffer());
InsetGraphicsParams params;
- params.filename = support::DocFileName(filename.absFileName());
+ params.filename = support::DocFileName(filename.absFileName(), false);
inset->setParams(params);
cur.recordUndo();
cur.insert(inset);
}
-void replaceSelectionWithString(Cursor & cur, docstring const & str, bool backwards)
+void replaceSelectionWithString(Cursor & cur, docstring const & str)
{
cur.recordUndo();
DocIterator selbeg = cur.selectionBegin();
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);
-
- // select the replacement
- if (backwards) {
- selbeg.pos() += str.length();
- cur.setSelection(selbeg, -int(str.length()));
- } else
- cur.setSelection(selbeg, str.length());
}
//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;
}
if (lyxrc.auto_region_delete)
selDel(cur);
else
- cur.setSelection(false);
+ cur.selection(false);
}
projects / lyx.git / blobdiff