#include "Buffer.h"
#include "buffer_funcs.h"
+#include "BufferList.h"
#include "BufferParams.h"
#include "BufferView.h"
#include "Changes.h"
pair<PitPosPair, pit_type>
pasteSelectionHelper(Cursor & cur, ParagraphList const & parlist,
- DocumentClass const * const docclass, ErrorList & errorlist)
+ DocumentClass const * const oldDocClass, ErrorList & errorlist)
{
Buffer const & buffer = cur.buffer();
pit_type pit = cur.pit();
pos_type pos = cur.pos();
- ParagraphList & pars = cur.text()->paragraphs();
+ 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 make_pair(PitPosPair(pit, pos), pit));
+ ParagraphList & pars = target_inset->paragraphs();
if (parlist.empty())
return make_pair(PitPosPair(pit, pos), pit);
// Make a copy of the CaP paragraphs.
ParagraphList insertion = parlist;
- DocumentClass const * const tc = buffer.params().documentClassPtr();
+ 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!
- Inset * inset = pars[pit].inInset();
- if (inset && (inset->lyxCode() == ERT_CODE ||
- inset->lyxCode() == LISTINGS_CODE)) {
+ InsetCode const code = target_inset->lyxCode();
+ if (code == ERT_CODE || code == LISTINGS_CODE) {
for (size_t i = 0; i != insertion.size(); ++i) {
for (pos_type j = 0; j != insertion[i].size(); ++j) {
if (insertion[i].isNewline(j)) {
// do not track deletion of newline
insertion[i].eraseChar(j, false);
+ insertion[i].setInsetOwner(target_inset);
breakParagraphConservative(
buffer.params(),
insertion, i, j);
+ break;
}
}
}
}
- // set the paragraphs to empty layout if necessary
- // note that we are doing this if the empty layout is
- // supposed to be the default, not just if it is forced
- if (cur.inset().useEmptyLayout()) {
- Layout const & layout =
- buffer.params().documentClass().emptyLayout();
+ // set the paragraphs to plain layout if necessary
+ if (cur.inset().usePlainLayout()) {
+ bool forcePlainLayout = cur.inset().forcePlainLayout();
+ Layout const & plainLayout = newDocClass->plainLayout();
+ Layout const & defaultLayout = newDocClass->defaultLayout();
+ ParagraphList::iterator const end = insertion.end();
+ ParagraphList::iterator par = insertion.begin();
+ for (; par != end; ++par) {
+ Layout const & parLayout = par->layout();
+ if (forcePlainLayout || parLayout == defaultLayout)
+ par->setLayout(plainLayout);
+ }
+ } 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();
- for (ParagraphList::iterator par = insertion.begin();
- par != end; ++par)
- par->setLayout(layout);
+ ParagraphList::iterator par = insertion.begin();
+ for (; par != end; ++par) {
+ Layout const & parLayout = par->layout();
+ if (parLayout == plainLayout)
+ par->setLayout(defaultLayout);
+ }
}
+ InsetText in(buffer);
// Make sure there is no class difference.
- InsetText in;
+ in.paragraphs().clear();
// This works without copying any paragraph data because we have
// a specialized swap method for ParagraphList. This is important
// since we store pointers to insets at some places and we don't
// want to invalidate them.
insertion.swap(in.paragraphs());
- cap::switchBetweenClasses(docclass, tc, in, errorlist);
+ cap::switchBetweenClasses(oldDocClass, newDocClass, in, errorlist);
insertion.swap(in.paragraphs());
ParagraphList::iterator tmpbuf = insertion.begin();
max_depth = tmpbuf->getMaxDepthAfter();
// Set the inset owner of this paragraph.
- tmpbuf->setInsetOwner(pars[pit].inInset());
+ tmpbuf->setInsetOwner(target_inset);
for (pos_type i = 0; i < tmpbuf->size(); ++i) {
// do not track deletion of invalid insets
if (Inset * inset = tmpbuf->getInset(i))
- if (!pars[pit].insetAllowed(inset->lyxCode()))
+ if (!target_inset->insetAllowed(inset->lyxCode()))
tmpbuf->eraseChar(i--, false);
}
// merge the first par of the insertion with the current par
mergeParagraph(buffer.params(), pars, pit);
}
+ //FIXME: We should call setBuffer() on each inserted paragraph.
+ // instead, we call setBuffer() for the main inset at the beginning
+ // of updateLabels()
pit_type last_paste = pit + insertion.size() - 1;
{
// For some strange reason gcc 3.2 and 3.3 do not accept
// Buffer buffer(string(), false);
- Buffer buffer("", false);
- buffer.setUnnamed(true);
- buffer.paragraphs() = paragraphs;
- buffer.params().setDocumentClass(docclass);
+ // 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);
+ buffer->params().setDocumentClass(docclass);
ostringstream lyx;
- if (buffer.write(lyx))
+ if (buffer->write(lyx))
theClipboard().put(lyx.str(), plaintext);
else
theClipboard().put(string(), plaintext);
+ // Save that memory
+ buffer->paragraphs().clear();
}
-void copySelectionHelper(Buffer const & buf, ParagraphList & pars,
+void copySelectionHelper(Buffer const & buf, ParagraphList const & pars,
pit_type startpit, pit_type endpit,
int start, int end, DocumentClass const * const dc, CutStack & cutstack)
{
ParIterator end = par_iterator_end(in);
for (ParIterator it = par_iterator_begin(in); it != end; ++it) {
docstring const name = it->layout().name();
- bool hasLayout = newtc.hasLayout(name);
- if (in.useEmptyLayout())
- it->setLayout(newtc.emptyLayout());
- else if (hasLayout)
- it->setLayout(newtc[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);
+
+ if (in.usePlainLayout())
+ it->setLayout(newtc.plainLayout());
else
- it->setLayout(newtc.defaultLayout());
-
- if (!hasLayout && name != oldtc.defaultLayoutName()) {
- docstring const s = bformat(
- _("Layout had to be changed from\n%1$s to %2$s\n"
- "because of class conversion from\n%3$s to %4$s"),
- name, it->layout().name(),
- from_utf8(oldtc.name()), from_utf8(newtc.name()));
- // To warn the user that something had to be done.
- errorlist.push_back(ErrorItem(_("Changed Layout"), s,
- it->id(), 0,
- it->size()));
- }
+ it->setLayout(newtc[name]);
}
// character styles
}
-vector<docstring> availableSelections()
+vector<docstring> availableSelections(Buffer const * buf)
{
vector<docstring> selList;
+ if (!buf)
+ return selList;
CutStack::const_iterator cit = theCuts.begin();
CutStack::const_iterator end = theCuts.end();
ParagraphList::const_iterator pit = pars.begin();
ParagraphList::const_iterator pend = pars.end();
for (; pit != pend; ++pit) {
- asciiSel += pit->asString(false);
+ Paragraph par(*pit, 0, 26);
+ // 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("..."));
cur.selectionAsString(true));
}
+ if (begpit != endpit)
+ cur.updateFlags(Update::Force | Update::FitCursor);
+
boost::tie(endpit, endpos) =
eraseSelectionHelper(bp,
text->paragraphs(),
}
-void copySelection(Cursor & cur)
+void copySelection(Cursor const & cur)
{
copySelection(cur, cur.selectionAsString(true));
}
namespace {
-void copySelectionToStack(Cursor & cur, CutStack & cutstack)
+void copySelectionToStack(Cursor const & cur, CutStack & cutstack)
{
// this doesn't make sense, if there is no selection
if (!cur.selection())
ParagraphList pars;
Paragraph par;
BufferParams const & bp = cur.buffer().params();
- // FIXME This should be the empty layout...right?
- par.setLayout(bp.documentClass().emptyLayout());
+ // FIXME This should be the plain layout...right?
+ par.setLayout(bp.documentClass().plainLayout());
par.insert(0, grabSelection(cur), Font(), Change(Change::UNCHANGED));
pars.push_back(par);
cutstack.push(make_pair(pars, bp.documentClassPtr()));
}
-void copySelection(Cursor & cur, docstring const & plaintext)
+void copySelection(Cursor const & cur, docstring const & plaintext)
{
// In tablemode, because copy and paste actually use special table stack
// we do not attempt to get selected paragraphs under cursor. Instead, a
ParagraphList pars;
Paragraph par;
BufferParams const & bp = cur.buffer().params();
- par.setLayout(bp.documentClass().emptyLayout());
+ par.setLayout(bp.documentClass().plainLayout());
par.insert(0, plaintext, Font(), Change(Change::UNCHANGED));
pars.push_back(par);
theCuts.push(make_pair(pars, bp.documentClassPtr()));
}
-void saveSelection(Cursor & cur)
+void saveSelection(Cursor const & cur)
{
// This function is called, not when a selection is formed, but when
// a selection is cleared. Therefore, multiple keyboard selection
if (cur.selection()
&& cur.selBegin() == cur.bv().cursor().selBegin()
&& cur.selEnd() == cur.bv().cursor().selEnd()) {
- LYXERR(Debug::ACTION, "'" << cur.selectionAsString(true) << "'");
+ LYXERR(Debug::SELECTION, "saveSelection: '" << cur.selectionAsString(true) << "'");
copySelectionToStack(cur, selectionBuffer);
}
}
docstring selection(size_t sel_index)
{
return sel_index < theCuts.size()
- ? theCuts[sel_index].first.back().asString(false)
+ ? theCuts[sel_index].first.back().asString(AS_STR_INSETS)
: docstring();
}
// create inset for graphic
InsetGraphics * inset = new InsetGraphics(cur.buffer());
InsetGraphicsParams params;
- params.filename = EmbeddedFile(filename.absFilename(), cur.buffer().filePath());
+ params.filename = support::DocFileName(filename.absFilename());
inset->setParams(params);
cur.recordUndo();
cur.insert(inset);
DocIterator selbeg = cur.selectionBegin();
// Get font setting before we cut
- Font const font =
+ Font const & font =
selbeg.paragraph().getFontSettings(cur.buffer().params(), selbeg.pos());
// Insert the new string
if (lyxrc.auto_region_delete)
selDel(cur);
else
- cur.selection() = false;
+ cur.setSelection(false);
}
projects / lyx.git / blobdiff