anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-27 06:19:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove commented code and reindent

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6393 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2003-03-08 15:58:28 +00:00
parent 16b018a136
commit 65f548906a
2 changed files with 123 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ChangeLog
View File

@ -1,3 +1,7 @@
2003-03-08 Lars Gullik Bjønnes <larsbj@gullik.net>
* CutAndPaste.C: remove commented code and reindent.
2003-03-08 John Levon <levon@movementarian.org> 2003-03-08 John Levon <levon@movementarian.org>
* lyxfunc.h: * lyxfunc.h:
@ -27,7 +31,7 @@
remove LFUN_INSET_GRAPHICS. remove LFUN_INSET_GRAPHICS.
* factory.C (createInset): add "graphics" to LFUN_INSET_APPLY. * factory.C (createInset): add "graphics" to LFUN_INSET_APPLY.
2003-03-07 Angus Leeming <leeming@lyx.org> 2003-03-07 Angus Leeming <leeming@lyx.org>
* commandtags.h: * commandtags.h:

283
src/CutAndPaste.C
View File

@ -191,9 +191,7 @@ bool CutAndPaste::copySelection(Paragraph * startpar, Paragraph * endpar,
Paragraph * newpar = new Paragraph(*tmppar, false); Paragraph * newpar = new Paragraph(*tmppar, false);
// reset change info // reset change info
newpar->cleanChanges(); newpar->cleanChanges();
#if 1
newpar->setInsetOwner(0); newpar->setInsetOwner(0);
#endif
paragraphs.push_back(newpar); paragraphs.push_back(newpar);
tmppar = tmppar->next(); tmppar = tmppar->next();
@ -211,14 +209,6 @@ bool CutAndPaste::copySelection(Paragraph * startpar, Paragraph * endpar,
while (back.size() > tmpi2) { while (back.size() > tmpi2) {
back.erase(back.size() - 1); back.erase(back.size() - 1);
} }
#if 0
// this paragraph's are of noone's owner!
ParagraphList::iterator it = paragraphs.begin();
ParagraphList::iterator end = paragraphs.end();
for (; it != end; ++it)
it->setInsetOwner(0);
#endif
} }
return true; return true;
} }
@ -233,171 +223,134 @@ bool CutAndPaste::pasteSelection(Paragraph ** par, Paragraph ** endpar,
if (pos > (*par)->size()) if (pos > (*par)->size())
pos = (*par)->size(); pos = (*par)->size();
#if 0 // many paragraphs
// Paragraph * tmpbuf;
Paragraph * tmppar = *par; // make a copy of the simple cut_buffer
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
#endif
{
// many paragraphs
// make a copy of the simple cut_buffer
#if 1 #if 1
ParagraphList::iterator it = paragraphs.begin(); ParagraphList::iterator it = paragraphs.begin();
ParagraphList simple_cut_clone;
simple_cut_clone.insert(simple_cut_clone.begin(),
new Paragraph(*it, false));
ParagraphList simple_cut_clone; ParagraphList::iterator end = paragraphs.end();
simple_cut_clone.insert(simple_cut_clone.begin(), while (boost::next(it) != end) {
++it;
simple_cut_clone.insert(simple_cut_clone.end(),
new Paragraph(*it, false)); 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 #else
// Later we want it done like this: // Later we want it done like this:
ParagraphList simple_cut_clone(paragraphs.begin(), ParagraphList simple_cut_clone(paragraphs.begin(),
paragraphs.end()); paragraphs.end());
#endif #endif
// now remove all out of the buffer which is NOT allowed in the // now remove all out of the buffer which is NOT allowed in the
// new environment and set also another font if that is required // new environment and set also another font if that is required
ParagraphList::iterator tmpbuf = paragraphs.begin(); ParagraphList::iterator tmpbuf = paragraphs.begin();
int depth_delta = (*par)->params().depth() - tmpbuf->params().depth(); int depth_delta = (*par)->params().depth() - tmpbuf->params().depth();
// Temporary set *par as previous of tmpbuf as we might have // Temporary set *par as previous of tmpbuf as we might have
// to realize the font. // to realize the font.
tmpbuf->previous(*par); tmpbuf->previous(*par);
// make sure there is no class difference // make sure there is no class difference
SwitchLayoutsBetweenClasses(textclass, tc, &*tmpbuf, SwitchLayoutsBetweenClasses(textclass, tc, &*tmpbuf,
current_view->buffer()->params); current_view->buffer()->params);
Paragraph::depth_type max_depth = (*par)->getMaxDepthAfter(); Paragraph::depth_type max_depth = (*par)->getMaxDepthAfter();
while (tmpbuf != paragraphs.end()) { while (tmpbuf != paragraphs.end()) {
// If we have a negative jump so that the depth would // If we have a negative jump so that the depth would
// go below 0 depth then we have to redo the delta to // go below 0 depth then we have to redo the delta to
// this new max depth level so that subsequent // this new max depth level so that subsequent
// paragraphs are aligned correctly to this paragraph // paragraphs are aligned correctly to this paragraph
// at level 0. // at level 0.
if ((int(tmpbuf->params().depth()) + depth_delta) < 0) if ((int(tmpbuf->params().depth()) + depth_delta) < 0)
depth_delta = 0; depth_delta = 0;
// set the right depth so that we are not too deep or shallow. // set the right depth so that we are not too deep or shallow.
tmpbuf->params().depth(tmpbuf->params().depth() + depth_delta); tmpbuf->params().depth(tmpbuf->params().depth() + depth_delta);
if (tmpbuf->params().depth() > max_depth) if (tmpbuf->params().depth() > max_depth)
tmpbuf->params().depth(max_depth); tmpbuf->params().depth(max_depth);
// only set this from the 2nd on as the 2nd depends for maxDepth // only set this from the 2nd on as the 2nd depends for maxDepth
// still on *par // still on *par
if (tmpbuf->previous() != (*par)) if (tmpbuf->previous() != (*par))
max_depth = tmpbuf->getMaxDepthAfter(); max_depth = tmpbuf->getMaxDepthAfter();
// set the inset owner of this paragraph // set the inset owner of this paragraph
tmpbuf->setInsetOwner((*par)->inInset()); tmpbuf->setInsetOwner((*par)->inInset());
for (pos_type i = 0; i < tmpbuf->size(); ++i) { for (pos_type i = 0; i < tmpbuf->size(); ++i) {
if (tmpbuf->getChar(i) == Paragraph::META_INSET) { if (tmpbuf->getChar(i) == Paragraph::META_INSET) {
if (!(*par)->insetAllowed(tmpbuf->getInset(i)->lyxCode())) if (!(*par)->insetAllowed(tmpbuf->getInset(i)->lyxCode())) {
{ tmpbuf->erase(i--);
tmpbuf->erase(i--); }
} } else {
} else { LyXFont f1 = tmpbuf->getFont(current_view->buffer()->params,i);
LyXFont f1 = tmpbuf->getFont(current_view->buffer()->params,i); LyXFont f2 = f1;
LyXFont f2 = f1; if (!(*par)->checkInsertChar(f1)) {
if (!(*par)->checkInsertChar(f1)) { tmpbuf->erase(i--);
tmpbuf->erase(i--); } else if (f1 != f2) {
} else if (f1 != f2) { tmpbuf->setFont(i, f1);
tmpbuf->setFont(i, f1);
}
} }
} }
tmpbuf = tmpbuf->next();
} }
// now reset it to 0 tmpbuf = tmpbuf->next();
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;
} }
// 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; return true;
} }