#endif
#include "CutAndPaste.h"
-//#include "debug.h"
#include "BufferView.h"
#include "buffer.h"
#include "paragraph.h"
#include "gettext.h"
#include "iterators.h"
#include "lyxtextclasslist.h"
+#include "undo_funcs.h"
+#include "paragraph_funcs.h"
+#include "debug.h"
#include "insets/inseterror.h"
+#include "BoostFormat.h"
+
+using std::endl;
using std::pair;
using lyx::pos_type;
using lyx::textclass_type;
namespace {
+// FIXME: stupid name
Paragraph * buf = 0;
textclass_type textclass = 0;
if (!startpar || (start > startpar->size()))
return false;
- if (realcut)
- DeleteBuffer();
-
- textclass = tc;
+ if (realcut) {
+ copySelection(startpar, *endpar, start, end, tc);
+ }
- if (!(*endpar) || startpar == (*endpar)) {
- // only within one paragraph
- if (realcut) {
- buf = new Paragraph;
- buf->layout(startpar->layout());
- }
- pos_type i = start;
- if (end > startpar->size())
- end = startpar->size();
- for (; i < end; ++i) {
- if (realcut)
- startpar->copyIntoMinibuffer(*current_view->buffer(),
- start);
- startpar->erase(start);
- if (realcut)
- buf->insertFromMinibuffer(buf->size());
+ if (!endpar || startpar == *endpar) {
+ if (startpar->erase(start, end)) {
+ // Some chars were erased, go to start to be safe
+ end = start;
}
- end = start - 1;
- } else {
- // more than one paragraph
- (*endpar)->breakParagraphConservative(current_view->buffer()->params,
- end);
- *endpar = (*endpar)->next();
+ 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;
end = 0;
-
- startpar->breakParagraphConservative(current_view->buffer()->params,
- start);
-
- // store the selection
- if (realcut) {
- buf = startpar->next();
- buf->previous(0);
- } else {
- startpar->next()->previous(0);
+ }
+
+ // Loop through the deleted pars if any, erasing as needed
+
+ Paragraph * pit = startpar->next();
+
+ while (1) {
+ // *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());
+
+ // remove the par if it's now empty
+ if (actually_erased) {
+ pit->previous()->next(pit->next());
+ if (next) {
+ next->previous(pit->previous());
+ }
+ lyxerr << "deleting pit " << pit << endl;
+
+ delete pit;
+ }
}
- (*endpar)->previous()->next(0);
+
+ if (pit == *endpar)
+ break;
+
+ pit = next;
+ }
- // cut the selection
- startpar->next(*endpar);
+#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
- (*endpar)->previous(startpar);
+ if (!startpar->next())
+ return true;
+
+ Buffer * buffer = current_view->buffer();
- // the cut selection should begin with standard layout
- if (realcut) {
- buf->params().clear();
- buf->bibkey = 0;
- buf->layout(textclasslist[current_view->buffer()->params.textclass].defaultLayoutName());
- }
+ if (doclear) {
+ startpar->next()->stripLeadingSpaces();
+ }
- // paste the paragraphs again, if possible
- if (doclear)
- startpar->next()->stripLeadingSpaces(textclass);
- if (startpar->hasSameLayout(startpar->next()) ||
- !startpar->next()->size()) {
- startpar->pasteParagraph(current_view->buffer()->params);
- (*endpar) = startpar; // this because endpar gets deleted here!
- }
- // this paragraph's are of noone's owner!
- Paragraph * p = buf;
- while (p) {
- p->setInsetOwner(0);
- p = p->next();
- }
+ if (!actually_erased)
+ return true;
+
+ // paste the paragraphs again, if possible
+ if (startpar->hasSameLayout(startpar->next()) ||
+ startpar->next()->empty()) {
+ mergeParagraph(buffer->params, startpar);
+ // this because endpar gets deleted here!
+ (*endpar) = startpar;
}
+
return true;
}
-
+
bool CutAndPaste::copySelection(Paragraph * startpar, Paragraph * endpar,
int start, int end, char tc)
{
Paragraph * tmppar = startpar;
buf = new Paragraph(*tmppar, false);
Paragraph * tmppar2 = buf;
+ tmppar2->cleanChanges();
while (tmppar != endpar
&& tmppar->next()) {
tmppar2->next(new Paragraph(*tmppar, false));
tmppar2->next()->previous(tmppar2);
tmppar2 = tmppar2->next();
+ // reset change info
+ tmppar2->cleanChanges();
}
tmppar2->next(0);
SwitchLayoutsBetweenClasses(textclass, tc, tmpbuf,
current_view->buffer()->params);
- Paragraph::depth_type max_depth = (*par)->getMaxDepthAfter(current_view->buffer());
+ Paragraph::depth_type max_depth = (*par)->getMaxDepthAfter();
while(tmpbuf) {
// if we have a negative jump so that the depth would go below
// only set this from the 2nd on as the 2nd depends for maxDepth
// still on *par
if (tmpbuf->previous() != (*par))
- max_depth = tmpbuf->getMaxDepthAfter(current_view->buffer());
+ max_depth = tmpbuf->getMaxDepthAfter();
// set the inset owner of this paragraph
tmpbuf->setInsetOwner((*par)->inInset());
for(pos_type i = 0; i < tmpbuf->size(); ++i) {
// open the paragraph for inserting the buf
// if necessary
if (((*par)->size() > pos) || !(*par)->next()) {
- (*par)->breakParagraphConservative(current_view->buffer()->params,
- pos);
+ breakParagraphConservative(
+ current_view->buffer()->params, *par, pos);
paste_the_end = true;
}
// set the end for redoing later
if ((*par)->next() == lastbuffer)
lastbuffer = *par;
- (*par)->pasteParagraph(current_view->buffer()->params);
+ 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)) {
- lastbuffer->pasteParagraph(current_view->buffer()->params);
+ mergeParagraph(current_view->buffer()->params, lastbuffer);
} else if (!lastbuffer->next()->size()) {
lastbuffer->next()->makeSameLayout(lastbuffer);
- lastbuffer->pasteParagraph(current_view->buffer()->params);
+ mergeParagraph(current_view->buffer()->params, lastbuffer);
} else if (!lastbuffer->size()) {
lastbuffer->makeSameLayout(lastbuffer->next());
- lastbuffer->pasteParagraph(current_view->buffer()->params);
+ mergeParagraph(current_view->buffer()->params, lastbuffer);
} else
- lastbuffer->next()->stripLeadingSpaces(tc);
+ lastbuffer->next()->stripLeadingSpaces();
}
// restore the simple cut buffer
buf = simple_cut_clone;
ParIterator end = ParIterator();
for (ParIterator it = ParIterator(par); it != end; ++it) {
par = *it;
- string const name = par->layout();
+ string const name = par->layout()->name();
bool hasLayout = tclass2.hasLayout(name);
- if (!hasLayout)
- par->layout(tclass2.defaultLayoutName());
+ if (hasLayout)
+ par->layout(tclass2[name]);
+ else
+ par->layout(tclass2.defaultLayout());
if (!hasLayout && name != tclass1.defaultLayoutName()) {
++ret;
+#if USE_BOOST_FORMAT
+ boost::format fmt(_("Layout had to be changed from\n"
+ "%1$s to %2$s\n"
+ "because of class conversion from\n"
+ "%3$s to %4$s"));
+ fmt % name
+ % par->layout()->name()
+ % tclass1.name()
+ % tclass2.name();
+
+ string const s = fmt.str();
+#else
string const s = _("Layout had to be changed from\n")
+ name + _(" to ")
- + par->layout()
+ + par->layout()->name()
+ _("\nbecause of class conversion from\n")
- + textclasslist[c1].name() + _(" to ")
- + textclasslist[c2].name();
+ + tclass1.name() + _(" to ")
+ + tclass2.name();
+#endif
+ freezeUndo();
InsetError * new_inset = new InsetError(s);
LyXText * txt = current_view->getLyXText();
LyXCursor cur = txt->cursor;
txt->insertInset(current_view, new_inset);
txt->fullRebreak(current_view);
txt->setCursorIntern(current_view, cur.par(), cur.pos());
+ unFreezeUndo();
}
}
return ret;
projects / lyx.git / blobdiff