#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
#include "CutAndPaste.h"
#include "BufferView.h"
#include "buffer.h"
namespace {
-// FIXME: stupid name
-Paragraph * buf = 0;
+// FIXME: stupid name
+ParagraphList paragraphs;
textclass_type textclass = 0;
-// for now here this should be in another Cut&Paste Class!
-// Jürgen, I moved this out of CutAndPaste since it does not operate on any
-// member of the CutAndPaste class and in addition it was private.
-// Perhaps it even should take a parameter? (Lgb)
-void DeleteBuffer()
-{
- if (!buf)
- return;
-
- Paragraph * tmppar;
-
- while (buf) {
- tmppar = buf;
- buf = buf->next();
- delete tmppar;
- }
- buf = 0;
-}
-
} // namespace anon
bool CutAndPaste::cutSelection(Paragraph * startpar, Paragraph ** endpar,
- int start, int & end, char tc, bool doclear,
- bool realcut)
+ int start, int & end, textclass_type tc,
+ bool doclear, bool realcut)
{
if (!startpar || (start > startpar->size()))
return false;
}
return true;
}
-
+
bool actually_erased = false;
-
+
// clear end/begin fragments of the first/last par in selection
actually_erased |= (startpar)->erase(start, startpar->size());
if ((*endpar)->erase(0, end)) {
- actually_erased = true;
+ actually_erased = true;
end = 0;
}
-
+
// Loop through the deleted pars if any, erasing as needed
-
+
Paragraph * pit = startpar->next();
-
- while (1) {
+
+ while (true) {
// *endpar can be 0
if (!pit)
break;
-
+
Paragraph * next = pit->next();
-
+
// "erase" the contents of the par
if (pit != *endpar) {
actually_erased |= pit->erase(0, pit->size());
if (next) {
next->previous(pit->previous());
}
-
+
delete pit;
}
}
-
+
if (pit == *endpar)
break;
-
+
pit = next;
}
-#if 0 // FIXME: why for cut but not copy ?
+#if 0 // FIXME: why for cut but not copy ?
// the cut selection should begin with standard layout
if (realcut) {
buf->params().clear();
buf->bibkey = 0;
buf->layout(textclasslist[buffer->params.textclass].defaultLayoutName());
}
-#endif
+#endif
if (!startpar->next())
return true;
-
+
Buffer * buffer = current_view->buffer();
if (doclear) {
if (!actually_erased)
return true;
-
+
// paste the paragraphs again, if possible
if (startpar->hasSameLayout(startpar->next()) ||
startpar->next()->empty()) {
- mergeParagraph(buffer->params, startpar);
+#warning This is suspect. (Lgb)
+ // When doing this merge we must know if the par really
+ // belongs to an inset, and if it does then we have to use
+ // the insets paragraphs, and not the buffers. (Lgb)
+ mergeParagraph(buffer->params, buffer->paragraphs, startpar);
// this because endpar gets deleted here!
(*endpar) = startpar;
}
return true;
}
-
+
bool CutAndPaste::copySelection(Paragraph * startpar, Paragraph * endpar,
- int start, int end, char tc)
+ int start, int end, textclass_type tc)
{
if (!startpar || (start > startpar->size()))
return false;
- DeleteBuffer();
+ paragraphs.clear();
textclass = tc;
if (!endpar || startpar == endpar) {
// only within one paragraph
- buf = new Paragraph;
+ ParagraphList::iterator buf =
+ paragraphs.insert(paragraphs.begin(), new Paragraph);
+
buf->layout(startpar->layout());
pos_type i = start;
if (end > startpar->size())
// copy more than one paragraph
// clone the paragraphs within the selection
Paragraph * tmppar = startpar;
- buf = new Paragraph(*tmppar, false);
- Paragraph * tmppar2 = buf;
- tmppar2->cleanChanges();
- while (tmppar != endpar
- && tmppar->next()) {
- tmppar = tmppar->next();
- tmppar2->next(new Paragraph(*tmppar, false));
- tmppar2->next()->previous(tmppar2);
- tmppar2 = tmppar2->next();
+ while (tmppar != endpar) {
+ Paragraph * newpar = new Paragraph(*tmppar, false);
// reset change info
- tmppar2->cleanChanges();
+ newpar->cleanChanges();
+ newpar->setInsetOwner(0);
+
+ paragraphs.push_back(newpar);
+ tmppar = tmppar->next();
}
- tmppar2->next(0);
- // the buf paragraph is too big
+ // The first paragraph is too big.
+ Paragraph & front = paragraphs.front();
pos_type tmpi2 = start;
for (; tmpi2; --tmpi2)
- buf->erase(0);
+ front.erase(0);
- // now tmppar 2 is too big, delete all after end
+ // Now last paragraph is too big, delete all after end.
+ Paragraph & back = paragraphs.back();
tmpi2 = end;
- while (tmppar2->size() > tmpi2) {
- tmppar2->erase(tmppar2->size() - 1);
- }
- // this paragraph's are of noone's owner!
- tmppar = buf;
- while (tmppar) {
- tmppar->setInsetOwner(0);
- tmppar = tmppar->next();
+ while (back.size() > tmpi2) {
+ back.erase(back.size() - 1);
}
}
return true;
bool CutAndPaste::pasteSelection(Paragraph ** par, Paragraph ** endpar,
- int & pos, char tc)
+ int & pos, textclass_type tc)
{
- if (!checkPastePossible(*par))
+ if (!checkPastePossible())
return false;
if (pos > (*par)->size())
pos = (*par)->size();
-#if 0
- // Paragraph * tmpbuf;
- Paragraph * tmppar = *par;
- int tmppos = pos;
-
- // There are two cases: cutbuffer only one paragraph or many
- if (!buf->next()) {
- // only within a paragraph
- Paragraph * tmpbuf = new Paragraph(*buf, false);
-
- // Some provisions should be done here for checking
- // if we are inserting at the beginning of a
- // paragraph. If there are a space at the beginning
- // of the text to insert and we are inserting at
- // the beginning of the paragraph the space should
- // be removed.
- while (buf->size()) {
- // This is an attempt to fix the
- // "never insert a space at the
- // beginning of a paragraph" problem.
- if (!tmppos && buf->isLineSeparator(0)) {
- buf->erase(0);
- } else {
- buf->cutIntoMinibuffer(current_view->buffer()->params, 0);
- buf->erase(0);
- if (tmppar->insertFromMinibuffer(tmppos))
- ++tmppos;
- }
- }
- delete buf;
- buf = tmpbuf;
- *endpar = tmppar->next();
- pos = tmppos;
- } else
+ // many paragraphs
+
+ // make a copy of the simple cut_buffer
+#if 1
+ ParagraphList::iterator it = paragraphs.begin();
+
+ ParagraphList simple_cut_clone;
+ simple_cut_clone.insert(simple_cut_clone.begin(),
+ new Paragraph(*it, false));
+
+ ParagraphList::iterator end = paragraphs.end();
+ while (boost::next(it) != end) {
+ ++it;
+ simple_cut_clone.insert(simple_cut_clone.end(),
+ new Paragraph(*it, false));
+ }
+#else
+ // Later we want it done like this:
+ ParagraphList simple_cut_clone(paragraphs.begin(),
+ paragraphs.end());
#endif
- {
- // many paragraphs
-
- // make a copy of the simple cut_buffer
- Paragraph * tmpbuf = buf;
- Paragraph * simple_cut_clone = new Paragraph(*tmpbuf, false);
- Paragraph * tmpbuf2 = simple_cut_clone;
-
- while (tmpbuf->next()) {
- tmpbuf = tmpbuf->next();
- tmpbuf2->next(new Paragraph(*tmpbuf, false));
- tmpbuf2->next()->previous(tmpbuf2);
- tmpbuf2 = tmpbuf2->next();
- }
-
- // now remove all out of the buffer which is NOT allowed in the
- // new environment and set also another font if that is required
- tmpbuf = buf;
- int depth_delta = (*par)->params().depth() - tmpbuf->params().depth();
- // temporary set *par as previous of tmpbuf as we might have to realize
- // the font.
- tmpbuf->previous(*par);
-
- // make sure there is no class difference
- SwitchLayoutsBetweenClasses(textclass, tc, tmpbuf,
- current_view->buffer()->params);
-
- Paragraph::depth_type max_depth = (*par)->getMaxDepthAfter();
-
- while(tmpbuf) {
- // if we have a negative jump so that the depth would go below
- // 0 depth then we have to redo the delta to this new max depth
- // level so that subsequent paragraphs are aligned correctly to
- // this paragraph at level 0.
- if ((static_cast<int>(tmpbuf->params().depth()) + depth_delta) < 0)
- depth_delta = 0;
- // set the right depth so that we are not too deep or shallow.
- tmpbuf->params().depth(tmpbuf->params().depth() + depth_delta);
- 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 *par
- if (tmpbuf->previous() != (*par))
- max_depth = tmpbuf->getMaxDepthAfter();
- // set the inset owner of this paragraph
- tmpbuf->setInsetOwner((*par)->inInset());
- for(pos_type i = 0; i < tmpbuf->size(); ++i) {
- if (tmpbuf->getChar(i) == Paragraph::META_INSET) {
- if (!(*par)->insetAllowed(tmpbuf->getInset(i)->lyxCode()))
- {
- tmpbuf->erase(i--);
- }
- } else {
- LyXFont f1 = tmpbuf->getFont(current_view->buffer()->params,i);
- LyXFont f2 = f1;
- if (!(*par)->checkInsertChar(f1)) {
- tmpbuf->erase(i--);
- } else if (f1 != f2) {
- tmpbuf->setFont(i, f1);
- }
+ // now remove all out of the buffer which is NOT allowed in the
+ // new environment and set also another font if that is required
+ ParagraphList::iterator tmpbuf = paragraphs.begin();
+ int depth_delta = (*par)->params().depth() - tmpbuf->params().depth();
+ // Temporary set *par as previous of tmpbuf as we might have
+ // to realize the font.
+ tmpbuf->previous(*par);
+
+ // make sure there is no class difference
+ SwitchLayoutsBetweenClasses(textclass, tc, &*tmpbuf,
+ current_view->buffer()->params);
+
+ Paragraph::depth_type max_depth = (*par)->getMaxDepthAfter();
+
+ while (tmpbuf != paragraphs.end()) {
+ // If we have a negative jump so that the depth would
+ // go below 0 depth then we have to redo the delta to
+ // this new max depth level so that subsequent
+ // paragraphs are aligned correctly to this paragraph
+ // at level 0.
+ if ((int(tmpbuf->params().depth()) + depth_delta) < 0)
+ depth_delta = 0;
+ // set the right depth so that we are not too deep or shallow.
+ tmpbuf->params().depth(tmpbuf->params().depth() + depth_delta);
+ 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 *par
+ if (tmpbuf->previous() != (*par))
+ max_depth = tmpbuf->getMaxDepthAfter();
+ // set the inset owner of this paragraph
+ tmpbuf->setInsetOwner((*par)->inInset());
+ for (pos_type i = 0; i < tmpbuf->size(); ++i) {
+ if (tmpbuf->getChar(i) == Paragraph::META_INSET) {
+ if (!(*par)->insetAllowed(tmpbuf->getInset(i)->lyxCode())) {
+ tmpbuf->erase(i--);
+ }
+ } else {
+ LyXFont f1 = tmpbuf->getFont(current_view->buffer()->params,i);
+ LyXFont f2 = f1;
+ if (!(*par)->checkInsertChar(f1)) {
+ tmpbuf->erase(i--);
+ } else if (f1 != f2) {
+ tmpbuf->setFont(i, f1);
}
}
- tmpbuf = tmpbuf->next();
- }
- // now reset it to 0
- buf->previous(0);
-
- // make the buf exactly the same layout than
- // the cursor paragraph
- buf->makeSameLayout(*par);
-
- // find the end of the buffer
- Paragraph * lastbuffer = buf;
- while (lastbuffer->next())
- lastbuffer = lastbuffer->next();
-
- bool paste_the_end = false;
-
- // open the paragraph for inserting the buf
- // if necessary
- if (((*par)->size() > pos) || !(*par)->next()) {
- breakParagraphConservative(
- current_view->buffer()->params, *par, pos);
- paste_the_end = true;
- }
- // set the end for redoing later
- *endpar = (*par)->next()->next();
-
- // paste it!
- lastbuffer->next((*par)->next());
- (*par)->next()->previous(lastbuffer);
-
- (*par)->next(buf);
- buf->previous(*par);
-
- if ((*par)->next() == lastbuffer)
- lastbuffer = *par;
-
- mergeParagraph(current_view->buffer()->params, *par);
- // store the new cursor position
- *par = lastbuffer;
- pos = lastbuffer->size();
- // maybe some pasting
- if (lastbuffer->next() && paste_the_end) {
- if (lastbuffer->next()->hasSameLayout(lastbuffer)) {
- mergeParagraph(current_view->buffer()->params, lastbuffer);
- } else if (!lastbuffer->next()->size()) {
- lastbuffer->next()->makeSameLayout(lastbuffer);
- mergeParagraph(current_view->buffer()->params, lastbuffer);
- } else if (!lastbuffer->size()) {
- lastbuffer->makeSameLayout(lastbuffer->next());
- mergeParagraph(current_view->buffer()->params, lastbuffer);
- } else
- lastbuffer->next()->stripLeadingSpaces();
}
- // restore the simple cut buffer
- buf = simple_cut_clone;
+ tmpbuf = tmpbuf->next();
}
+ // now reset it to 0
+ paragraphs.begin()->previous(0);
+
+ // make the buf exactly the same layout than
+ // the cursor paragraph
+ paragraphs.begin()->makeSameLayout(*par);
+
+ // find the end of the buffer
+ ParagraphList::iterator lastbuffer = paragraphs.begin();
+ while (boost::next(lastbuffer) != paragraphs.end())
+ ++lastbuffer;
+
+ bool paste_the_end = false;
+
+ // open the paragraph for inserting the buf
+ // if necessary
+ if (((*par)->size() > pos) || !(*par)->next()) {
+ breakParagraphConservative(
+ current_view->buffer()->params, current_view->buffer()->paragraphs, *par, pos);
+ paste_the_end = true;
+ }
+ // set the end for redoing later
+ *endpar = (*par)->next()->next();
+
+ // paste it!
+ lastbuffer->next((*par)->next());
+ (*par)->next()->previous(&*lastbuffer);
+
+ (*par)->next(&*paragraphs.begin());
+ paragraphs.begin()->previous(*par);
+
+ if ((*par)->next() == lastbuffer)
+ lastbuffer = *par;
+
+ mergeParagraph(current_view->buffer()->params,
+ current_view->buffer()->paragraphs, *par);
+ // store the new cursor position
+ *par = &*lastbuffer;
+ pos = lastbuffer->size();
+ // maybe some pasting
+ if (lastbuffer->next() && paste_the_end) {
+ if (lastbuffer->next()->hasSameLayout(&*lastbuffer)) {
+ mergeParagraph(current_view->buffer()->params,
+ current_view->buffer()->paragraphs, lastbuffer);
+ } else if (!lastbuffer->next()->size()) {
+ lastbuffer->next()->makeSameLayout(&*lastbuffer);
+ mergeParagraph(current_view->buffer()->params, current_view->buffer()->paragraphs, lastbuffer);
+ } else if (!lastbuffer->size()) {
+ lastbuffer->makeSameLayout(lastbuffer->next());
+ mergeParagraph(current_view->buffer()->params,
+ current_view->buffer()->paragraphs, lastbuffer);
+ } else
+ lastbuffer->next()->stripLeadingSpaces();
+ }
+ // restore the simple cut buffer
+ paragraphs = simple_cut_clone;
+
return true;
}
int CutAndPaste::nrOfParagraphs()
{
- if (!buf)
- return 0;
-
- int n = 1;
- Paragraph * tmppar = buf;
- while (tmppar->next()) {
- ++n;
- tmppar = tmppar->next();
- }
- return n;
+ return paragraphs.size();
}
}
-bool CutAndPaste::checkPastePossible(Paragraph *)
+bool CutAndPaste::checkPastePossible()
{
- if (!buf) return false;
-
- return true;
+ return !paragraphs.empty();
}
projects / lyx.git / blobdiff