mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-22 18:08:10 +00:00
NEW_INSETS clean up
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1924 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes
parent
c9b653fc80
commit
a014900f15
@ -1,5 +1,10 @@
|
||||
2001-04-17 Lars Gullik Bjønnes <larsbj@birdstep.com>
|
||||
|
||||
* CutAndPaste.C (cutSelection): split into two versons (NEW_INSETS
|
||||
and not)
|
||||
(copySelection): ditto
|
||||
(pasteSelection): ditto
|
||||
|
||||
* BufferView.C: whitespace change
|
||||
* BufferView.h: inherit privately from noncopyable
|
||||
|
||||
|
||||
@ -75,81 +75,53 @@ void DeleteBuffer()
|
||||
|
||||
} // namespace anon
|
||||
|
||||
|
||||
#ifndef NEW_INSETS
|
||||
bool CutAndPaste::cutSelection(LyXParagraph * startpar, LyXParagraph ** endpar,
|
||||
int start, int & end, char tc, bool doclear)
|
||||
{
|
||||
#ifndef NEW_INSETS
|
||||
if (!startpar || (start > startpar->Last()))
|
||||
if (!startpar || (start > startpar->Last()))
|
||||
return false;
|
||||
#else
|
||||
if (!startpar || (start > startpar->size()))
|
||||
return false;
|
||||
#endif
|
||||
|
||||
DeleteBuffer();
|
||||
|
||||
textclass = tc;
|
||||
|
||||
if (!(*endpar) ||
|
||||
#ifndef NEW_INSETS
|
||||
(startpar->ParFromPos(start) ==
|
||||
(*endpar)->ParFromPos(end))
|
||||
#else
|
||||
(startpar == (*endpar))
|
||||
#endif
|
||||
) {
|
||||
|
||||
DeleteBuffer();
|
||||
|
||||
textclass = tc;
|
||||
|
||||
if (!(*endpar) ||
|
||||
(startpar->ParFromPos(start) ==
|
||||
(*endpar)->ParFromPos(end))) {
|
||||
// only within one paragraph
|
||||
buf = new LyXParagraph;
|
||||
LyXParagraph::size_type i = start;
|
||||
#ifndef NEW_INSETS
|
||||
if (end > startpar->Last())
|
||||
end = startpar->Last();
|
||||
#else
|
||||
if (end > startpar->size())
|
||||
end = startpar->size();
|
||||
#endif
|
||||
for (; i < end; ++i) {
|
||||
startpar->CopyIntoMinibuffer(*current_view->buffer(), start);
|
||||
startpar->Erase(start);
|
||||
|
||||
#ifndef NEW_INSETS
|
||||
|
||||
buf->InsertFromMinibuffer(buf->Last());
|
||||
#else
|
||||
buf->InsertFromMinibuffer(buf->size());
|
||||
#endif
|
||||
}
|
||||
end = start-1;
|
||||
} else {
|
||||
end = start - 1;
|
||||
} else {
|
||||
// more than one paragraph
|
||||
(*endpar)->BreakParagraphConservative(current_view->buffer()->params,
|
||||
end);
|
||||
end);
|
||||
*endpar = (*endpar)->next();
|
||||
end = 0;
|
||||
|
||||
|
||||
startpar->BreakParagraphConservative(current_view->buffer()->params,
|
||||
start);
|
||||
|
||||
start);
|
||||
|
||||
// store the selection
|
||||
#ifndef NEW_INSETS
|
||||
buf = startpar->ParFromPos(start)->next_;
|
||||
#else
|
||||
buf = startpar->next();
|
||||
#endif
|
||||
buf->previous(0);
|
||||
(*endpar)->previous()->next(0);
|
||||
|
||||
|
||||
// cut the selection
|
||||
#ifndef NEW_INSETS
|
||||
startpar->ParFromPos(start)->next(*endpar);
|
||||
|
||||
|
||||
(*endpar)->previous(startpar->ParFromPos(start));
|
||||
#else
|
||||
startpar->next(*endpar);
|
||||
|
||||
(*endpar)->previous(startpar);
|
||||
#endif
|
||||
|
||||
#ifndef NEW_INSETS
|
||||
|
||||
// care about footnotes
|
||||
if (buf->footnoteflag) {
|
||||
LyXParagraph * tmppar = buf;
|
||||
@ -158,107 +130,125 @@ bool CutAndPaste::cutSelection(LyXParagraph * startpar, LyXParagraph ** endpar,
|
||||
tmppar = tmppar->next_;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
// the cut selection should begin with standard layout
|
||||
buf->Clear();
|
||||
|
||||
|
||||
// paste the paragraphs again, if possible
|
||||
if (doclear)
|
||||
startpar->next()->StripLeadingSpaces(textclass);
|
||||
#ifndef NEW_INSETS
|
||||
if (startpar->FirstPhysicalPar()->HasSameLayout(startpar->next()) ||
|
||||
!startpar->next()->Last())
|
||||
#else
|
||||
if (startpar->HasSameLayout(startpar->next()) ||
|
||||
!startpar->next()->size())
|
||||
#endif
|
||||
{
|
||||
#ifndef NEW_INSETS
|
||||
!startpar->next()->Last()) {
|
||||
startpar->ParFromPos(start)->PasteParagraph(current_view->buffer()->params);
|
||||
#else
|
||||
startpar->PasteParagraph(current_view->buffer()->params);
|
||||
#endif
|
||||
(*endpar) = startpar; // this because endpar gets deleted here!
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
bool CutAndPaste::copySelection(LyXParagraph * startpar, LyXParagraph * endpar,
|
||||
int start, int end, char tc)
|
||||
#else
|
||||
bool CutAndPaste::cutSelection(LyXParagraph * startpar, LyXParagraph ** endpar,
|
||||
int start, int & end, char tc, bool doclear)
|
||||
{
|
||||
#ifndef NEW_INSETS
|
||||
if (!startpar || (start > startpar->Last()))
|
||||
if (!startpar || (start > startpar->size()))
|
||||
return false;
|
||||
#else
|
||||
if (!startpar || (start > startpar->size()))
|
||||
return false;
|
||||
#endif
|
||||
|
||||
DeleteBuffer();
|
||||
|
||||
textclass = tc;
|
||||
|
||||
if (!(endpar) ||
|
||||
#ifndef NEW_INSETS
|
||||
(startpar->ParFromPos(start) ==
|
||||
(endpar)->ParFromPos(end))
|
||||
#else
|
||||
(startpar == endpar)
|
||||
#endif
|
||||
) {
|
||||
|
||||
DeleteBuffer();
|
||||
|
||||
textclass = tc;
|
||||
|
||||
if (!(*endpar) ||
|
||||
startpar == (*endpar)) {
|
||||
// only within one paragraph
|
||||
buf = new LyXParagraph;
|
||||
LyXParagraph::size_type i = start;
|
||||
#ifndef NEW_INSETS
|
||||
if (end > startpar->Last())
|
||||
end = startpar->Last();
|
||||
#else
|
||||
if (end > startpar->size())
|
||||
end = startpar->size();
|
||||
#endif
|
||||
for (; i < end; ++i) {
|
||||
startpar->CopyIntoMinibuffer(*current_view->buffer(), i);
|
||||
#ifndef NEW_INSETS
|
||||
buf->InsertFromMinibuffer(buf->Last());
|
||||
#else
|
||||
startpar->CopyIntoMinibuffer(*current_view->buffer(),
|
||||
start);
|
||||
startpar->Erase(start);
|
||||
|
||||
buf->InsertFromMinibuffer(buf->size());
|
||||
#endif
|
||||
}
|
||||
} else {
|
||||
end = start - 1;
|
||||
} else {
|
||||
// more than one paragraph
|
||||
(*endpar)->BreakParagraphConservative(current_view->buffer()->params,
|
||||
end);
|
||||
*endpar = (*endpar)->next();
|
||||
end = 0;
|
||||
|
||||
startpar->BreakParagraphConservative(current_view->buffer()->params,
|
||||
start);
|
||||
|
||||
// store the selection
|
||||
buf = startpar->next();
|
||||
|
||||
buf->previous(0);
|
||||
(*endpar)->previous()->next(0);
|
||||
|
||||
// cut the selection
|
||||
startpar->next(*endpar);
|
||||
|
||||
(*endpar)->previous(startpar);
|
||||
|
||||
// the cut selection should begin with standard layout
|
||||
buf->Clear();
|
||||
|
||||
// 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!
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
#ifndef NEW_INSETS
|
||||
bool CutAndPaste::copySelection(LyXParagraph * startpar, LyXParagraph * endpar,
|
||||
int start, int end, char tc)
|
||||
{
|
||||
if (!startpar || (start > startpar->Last()))
|
||||
return false;
|
||||
|
||||
DeleteBuffer();
|
||||
|
||||
textclass = tc;
|
||||
|
||||
if (!(endpar) ||
|
||||
(startpar->ParFromPos(start) ==
|
||||
(endpar)->ParFromPos(end))) {
|
||||
// only within one paragraph
|
||||
buf = new LyXParagraph;
|
||||
LyXParagraph::size_type i = start;
|
||||
if (end > startpar->Last())
|
||||
end = startpar->Last();
|
||||
for (; i < end; ++i) {
|
||||
startpar->CopyIntoMinibuffer(*current_view->buffer(),
|
||||
i);
|
||||
buf->InsertFromMinibuffer(buf->Last());
|
||||
}
|
||||
} else {
|
||||
// copy more than one paragraph
|
||||
// clone the paragraphs within the selection
|
||||
#ifndef NEW_INSETS
|
||||
LyXParagraph * tmppar = startpar->ParFromPos(start);
|
||||
#else
|
||||
LyXParagraph * tmppar = startpar;
|
||||
#endif
|
||||
buf = tmppar->Clone();
|
||||
LyXParagraph * tmppar2 = buf;
|
||||
|
||||
#ifndef NEW_INSETS
|
||||
|
||||
while (tmppar != endpar->ParFromPos(end)
|
||||
&& tmppar->next_) {
|
||||
&& tmppar->next_) {
|
||||
tmppar = tmppar->next_;
|
||||
tmppar2->next(tmppar->Clone());
|
||||
tmppar2->next_->previous(tmppar2);
|
||||
tmppar2 = tmppar2->next_;
|
||||
}
|
||||
tmppar2->next(0);
|
||||
#else
|
||||
while (tmppar != endpar
|
||||
&& tmppar->next()) {
|
||||
tmppar = tmppar->next();
|
||||
tmppar2->next(tmppar->Clone());
|
||||
tmppar2->next()->previous(tmppar2);
|
||||
tmppar2 = tmppar2->next();
|
||||
}
|
||||
tmppar2->next(0);
|
||||
#endif
|
||||
|
||||
#ifndef NEW_INSETS
|
||||
|
||||
// care about footnotes
|
||||
if (buf->footnoteflag) {
|
||||
tmppar = buf;
|
||||
@ -267,189 +257,284 @@ bool CutAndPaste::copySelection(LyXParagraph * startpar, LyXParagraph * endpar,
|
||||
tmppar = tmppar->next_;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
// the buf paragraph is too big
|
||||
#ifndef NEW_INSETS
|
||||
LyXParagraph::size_type tmpi2 = startpar->PositionInParFromPos(start);
|
||||
#else
|
||||
LyXParagraph::size_type tmpi2 = start;
|
||||
#endif
|
||||
for (; tmpi2; --tmpi2)
|
||||
buf->Erase(0);
|
||||
|
||||
|
||||
// now tmppar 2 is too big, delete all after end
|
||||
#ifndef NEW_INSETS
|
||||
tmpi2 = endpar->PositionInParFromPos(end);
|
||||
#else
|
||||
tmpi2 = end;
|
||||
#endif
|
||||
while (tmppar2->size() > tmpi2) {
|
||||
tmppar2->Erase(tmppar2->size() - 1);
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
#else
|
||||
bool CutAndPaste::copySelection(LyXParagraph * startpar, LyXParagraph * endpar,
|
||||
int start, int end, char tc)
|
||||
{
|
||||
if (!startpar || (start > startpar->size()))
|
||||
return false;
|
||||
|
||||
DeleteBuffer();
|
||||
|
||||
textclass = tc;
|
||||
|
||||
if (!endpar ||
|
||||
startpar == endpar) {
|
||||
// only within one paragraph
|
||||
buf = new LyXParagraph;
|
||||
LyXParagraph::size_type i = start;
|
||||
if (end > startpar->size())
|
||||
end = startpar->size();
|
||||
for (; i < end; ++i) {
|
||||
startpar->CopyIntoMinibuffer(*current_view->buffer(), i);
|
||||
buf->InsertFromMinibuffer(buf->size());
|
||||
}
|
||||
} else {
|
||||
// copy more than one paragraph
|
||||
// clone the paragraphs within the selection
|
||||
LyXParagraph * tmppar = startpar;
|
||||
buf = tmppar->Clone();
|
||||
LyXParagraph * tmppar2 = buf;
|
||||
|
||||
while (tmppar != endpar
|
||||
&& tmppar->next()) {
|
||||
tmppar = tmppar->next();
|
||||
tmppar2->next(tmppar->Clone());
|
||||
tmppar2->next()->previous(tmppar2);
|
||||
tmppar2 = tmppar2->next();
|
||||
}
|
||||
tmppar2->next(0);
|
||||
|
||||
// the buf paragraph is too big
|
||||
LyXParagraph::size_type tmpi2 = start;
|
||||
for (; tmpi2; --tmpi2)
|
||||
buf->Erase(0);
|
||||
|
||||
// now tmppar 2 is too big, delete all after end
|
||||
tmpi2 = end;
|
||||
while (tmppar2->size() > tmpi2) {
|
||||
tmppar2->Erase(tmppar2->size() - 1);
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
#ifndef NEW_INSETS
|
||||
bool CutAndPaste::pasteSelection(LyXParagraph ** par, LyXParagraph ** endpar,
|
||||
int & pos, char tc)
|
||||
{
|
||||
if (!checkPastePossible(*par))
|
||||
if (!checkPastePossible(*par))
|
||||
return false;
|
||||
|
||||
#ifndef NEW_INSETS
|
||||
if (pos > (*par)->Last())
|
||||
|
||||
if (pos > (*par)->Last())
|
||||
pos = (*par)->Last();
|
||||
#else
|
||||
if (pos > (*par)->size())
|
||||
pos = (*par)->size();
|
||||
#endif
|
||||
|
||||
LyXParagraph * tmpbuf;
|
||||
LyXParagraph * tmppar = *par;
|
||||
int tmppos = pos;
|
||||
|
||||
// There are two cases: cutbuffer only one paragraph or many
|
||||
#ifndef NEW_INSETS
|
||||
if (!buf->next_) {
|
||||
#else
|
||||
if (!buf->next()) {
|
||||
#endif
|
||||
// only within a paragraph
|
||||
tmpbuf = buf->Clone();
|
||||
// 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;
|
||||
}
|
||||
|
||||
LyXParagraph * tmpbuf;
|
||||
LyXParagraph * tmppar = *par;
|
||||
int tmppos = pos;
|
||||
|
||||
// There are two cases: cutbuffer only one paragraph or many
|
||||
if (!buf->next_) {
|
||||
// only within a paragraph
|
||||
tmpbuf = buf->Clone();
|
||||
// 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
|
||||
tmpbuf = buf;
|
||||
LyXParagraph * simple_cut_clone = tmpbuf->Clone();
|
||||
LyXParagraph * tmpbuf2 = simple_cut_clone;
|
||||
#ifndef NEW_INSETS
|
||||
if ((*par)->footnoteflag) {
|
||||
}
|
||||
delete buf;
|
||||
buf = tmpbuf;
|
||||
*endpar = tmppar->next();
|
||||
pos = tmppos;
|
||||
} else {
|
||||
// many paragraphs
|
||||
|
||||
// make a copy of the simple cut_buffer
|
||||
tmpbuf = buf;
|
||||
LyXParagraph * simple_cut_clone = tmpbuf->Clone();
|
||||
LyXParagraph * tmpbuf2 = simple_cut_clone;
|
||||
if ((*par)->footnoteflag) {
|
||||
tmpbuf->footnoteflag = (*par)->footnoteflag;
|
||||
tmpbuf->footnotekind = (*par)->footnotekind;
|
||||
}
|
||||
while (tmpbuf->next_) {
|
||||
tmpbuf = tmpbuf->next_;
|
||||
tmpbuf2->next(tmpbuf->Clone());
|
||||
tmpbuf2->next_->previous(tmpbuf2);
|
||||
tmpbuf2 = tmpbuf2->next_;
|
||||
if ((*par)->footnoteflag){
|
||||
tmpbuf->footnoteflag = (*par)->footnoteflag;
|
||||
tmpbuf->footnotekind = (*par)->footnotekind;
|
||||
}
|
||||
while (tmpbuf->next_) {
|
||||
tmpbuf = tmpbuf->next_;
|
||||
tmpbuf2->next(tmpbuf->Clone());
|
||||
tmpbuf2->next_->previous(tmpbuf2);
|
||||
tmpbuf2 = tmpbuf2->next_;
|
||||
if ((*par)->footnoteflag){
|
||||
tmpbuf->footnoteflag = (*par)->footnoteflag;
|
||||
tmpbuf->footnotekind = (*par)->footnotekind;
|
||||
}
|
||||
}
|
||||
#else
|
||||
while (tmpbuf->next()) {
|
||||
tmpbuf = tmpbuf->next();
|
||||
tmpbuf2->next(tmpbuf->Clone());
|
||||
tmpbuf2->next()->previous(tmpbuf2);
|
||||
tmpbuf2 = tmpbuf2->next();
|
||||
}
|
||||
#endif
|
||||
|
||||
// make sure there is no class difference
|
||||
SwitchLayoutsBetweenClasses(textclass, tc, buf);
|
||||
|
||||
// make the buf exactly the same layout than
|
||||
// the cursor paragraph
|
||||
buf->MakeSameLayout(*par);
|
||||
|
||||
// find the end of the buffer
|
||||
LyXParagraph * lastbuffer = buf;
|
||||
while (lastbuffer->next())
|
||||
lastbuffer = lastbuffer->next();
|
||||
|
||||
bool paste_the_end = false;
|
||||
|
||||
#ifndef NEW_INSETS
|
||||
// open the paragraph for inserting the buf
|
||||
// if necessary
|
||||
if (((*par)->Last() > pos) || !(*par)->next()) {
|
||||
(*par)->BreakParagraphConservative(current_view->buffer()->params,
|
||||
pos);
|
||||
paste_the_end = true;
|
||||
}
|
||||
// set the end for redoing later
|
||||
*endpar = (*par)->ParFromPos(pos)->next_->next();
|
||||
|
||||
// paste it!
|
||||
lastbuffer->ParFromPos(lastbuffer->Last())->next(
|
||||
(*par)->ParFromPos(pos)->next_);
|
||||
(*par)->ParFromPos(pos)->next()->previous(
|
||||
lastbuffer->ParFromPos(lastbuffer->Last()));
|
||||
|
||||
(*par)->ParFromPos(pos)->next(buf);
|
||||
buf->previous((*par)->ParFromPos(pos));
|
||||
|
||||
if ((*par)->ParFromPos(pos)->next() == lastbuffer)
|
||||
lastbuffer = *par;
|
||||
|
||||
(*par)->ParFromPos(pos)->PasteParagraph(current_view->buffer()->params);
|
||||
// store the new cursor position
|
||||
*par = lastbuffer;
|
||||
pos = lastbuffer->Last();
|
||||
// maybe some pasting
|
||||
if (lastbuffer->next() && paste_the_end) {
|
||||
if (lastbuffer->next()->HasSameLayout(lastbuffer)) {
|
||||
lastbuffer->ParFromPos(lastbuffer->Last())->PasteParagraph(current_view->buffer()->params);
|
||||
} else if (!lastbuffer->next()->Last()) {
|
||||
lastbuffer->next()->MakeSameLayout(lastbuffer);
|
||||
lastbuffer->ParFromPos(lastbuffer->Last())->PasteParagraph(current_view->buffer()->params);
|
||||
} else if (!lastbuffer->Last()) {
|
||||
lastbuffer->MakeSameLayout(lastbuffer->next_);
|
||||
lastbuffer->ParFromPos(lastbuffer->Last())->PasteParagraph(current_view->buffer()->params);
|
||||
} else
|
||||
lastbuffer->next()->StripLeadingSpaces(tc);
|
||||
}
|
||||
// restore the simple cut buffer
|
||||
buf = simple_cut_clone;
|
||||
}
|
||||
|
||||
// make sure there is no class difference
|
||||
SwitchLayoutsBetweenClasses(textclass, tc, buf);
|
||||
|
||||
// make the buf exactly the same layout than
|
||||
// the cursor paragraph
|
||||
buf->MakeSameLayout(*par);
|
||||
|
||||
// find the end of the buffer
|
||||
LyXParagraph * lastbuffer = buf;
|
||||
while (lastbuffer->next())
|
||||
lastbuffer = lastbuffer->next();
|
||||
|
||||
bool paste_the_end = false;
|
||||
|
||||
// open the paragraph for inserting the buf
|
||||
// if necessary
|
||||
if (((*par)->Last() > pos) || !(*par)->next()) {
|
||||
(*par)->BreakParagraphConservative(current_view->buffer()->params,
|
||||
pos);
|
||||
paste_the_end = true;
|
||||
}
|
||||
// set the end for redoing later
|
||||
*endpar = (*par)->ParFromPos(pos)->next_->next();
|
||||
|
||||
// paste it!
|
||||
lastbuffer->ParFromPos(lastbuffer->Last())->next(
|
||||
(*par)->ParFromPos(pos)->next_);
|
||||
(*par)->ParFromPos(pos)->next()->previous(
|
||||
lastbuffer->ParFromPos(lastbuffer->Last()));
|
||||
|
||||
(*par)->ParFromPos(pos)->next(buf);
|
||||
buf->previous((*par)->ParFromPos(pos));
|
||||
|
||||
if ((*par)->ParFromPos(pos)->next() == lastbuffer)
|
||||
lastbuffer = *par;
|
||||
|
||||
(*par)->ParFromPos(pos)->PasteParagraph(current_view->buffer()->params);
|
||||
// store the new cursor position
|
||||
*par = lastbuffer;
|
||||
pos = lastbuffer->Last();
|
||||
// maybe some pasting
|
||||
if (lastbuffer->next() && paste_the_end) {
|
||||
if (lastbuffer->next()->HasSameLayout(lastbuffer)) {
|
||||
lastbuffer->ParFromPos(lastbuffer->Last())->PasteParagraph(current_view->buffer()->params);
|
||||
} else if (!lastbuffer->next()->Last()) {
|
||||
lastbuffer->next()->MakeSameLayout(lastbuffer);
|
||||
lastbuffer->ParFromPos(lastbuffer->Last())->PasteParagraph(current_view->buffer()->params);
|
||||
} else if (!lastbuffer->Last()) {
|
||||
lastbuffer->MakeSameLayout(lastbuffer->next_);
|
||||
lastbuffer->ParFromPos(lastbuffer->Last())->PasteParagraph(current_view->buffer()->params);
|
||||
} else
|
||||
lastbuffer->next()->StripLeadingSpaces(tc);
|
||||
}
|
||||
// restore the simple cut buffer
|
||||
buf = simple_cut_clone;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
#else
|
||||
bool CutAndPaste::pasteSelection(LyXParagraph ** par, LyXParagraph ** endpar,
|
||||
int & pos, char tc)
|
||||
{
|
||||
if (!checkPastePossible(*par))
|
||||
return false;
|
||||
|
||||
if (pos > (*par)->size())
|
||||
pos = (*par)->size();
|
||||
|
||||
LyXParagraph * tmpbuf;
|
||||
LyXParagraph * tmppar = *par;
|
||||
int tmppos = pos;
|
||||
|
||||
// There are two cases: cutbuffer only one paragraph or many
|
||||
if (!buf->next()) {
|
||||
// only within a paragraph
|
||||
tmpbuf = buf->Clone();
|
||||
// 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
|
||||
tmpbuf = buf;
|
||||
LyXParagraph * simple_cut_clone = tmpbuf->Clone();
|
||||
LyXParagraph * tmpbuf2 = simple_cut_clone;
|
||||
while (tmpbuf->next()) {
|
||||
tmpbuf = tmpbuf->next();
|
||||
tmpbuf2->next(tmpbuf->Clone());
|
||||
tmpbuf2->next()->previous(tmpbuf2);
|
||||
tmpbuf2 = tmpbuf2->next();
|
||||
}
|
||||
|
||||
// make sure there is no class difference
|
||||
SwitchLayoutsBetweenClasses(textclass, tc, buf);
|
||||
|
||||
// make the buf exactly the same layout than
|
||||
// the cursor paragraph
|
||||
buf->MakeSameLayout(*par);
|
||||
|
||||
// find the end of the buffer
|
||||
LyXParagraph * 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()) {
|
||||
(*par)->BreakParagraphConservative(current_view->buffer()->params,
|
||||
pos);
|
||||
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;
|
||||
|
||||
|
||||
(*par)->PasteParagraph(current_view->buffer()->params);
|
||||
// store the new cursor position
|
||||
*par = lastbuffer;
|
||||
@ -469,11 +554,11 @@ bool CutAndPaste::pasteSelection(LyXParagraph ** par, LyXParagraph ** endpar,
|
||||
}
|
||||
// restore the simple cut buffer
|
||||
buf = simple_cut_clone;
|
||||
}
|
||||
#endif
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
int CutAndPaste::nrOfParagraphs()
|
||||
|
||||
Loading…
Reference in New Issue
Block a user