anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-23 05:25:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add some cut and paste bugs (disguised as cleanups)

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@6373 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2003-03-06 21:01:04 +00:00
parent c803419c43
commit 9973bb7aa1
6 changed files with 148 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/ChangeLog
View File

@ -1,15 +1,37 @@
2003-03-06 Lars Gullik Bjønnes <larsbj@gullik.net>
* ParagraphList.C (front): new function
(back): implement
2003-03-06 Alfredo Braunstein <abraunst@libero.it>
* lyxtext.h (top_y): added these 2 methods, and private vars top_row_
* lyxtext.h (top_y): added these 2 methods, and private vars top_row_
and top_row_offset_. removed var first_y.
* text.C (top_y):
* text2.C (LyXText, removeRow):
* text.C (top_y):
* text2.C (LyXText, removeRow):
* text3.C:
* BufferView_pimpl.C:
* BufferView_pimpl.C:
use these methods instead of using first_y
2003-03-06 Lars Gullik Bjønnes <larsbj@gullik.net>
* text2.C (pasteSelection): adjust for checkPastePossible
* CutAndPaste.C: remove Paragraph * buf and replace with
ParagraphList paragraphs.
(DeleteBuffer): delete
(cutSelection): change the tc type to textclass_type
(copySelection): change the tc type to textclass_type
(copySelection): adjust for ParagraphList
(pasteSelection): change the tc type to textclass_type
(pasteSelection): adjust for Paragraphlist
(nrOfParagraphs): simplify for ParagraphList
(checkPastePossible): simplify for ParagraphList
(checkPastePossible): remove unused arg
* ParagraphList.C (insert): handle the case where there are no
paragraphs yet.
* CutAndPaste.h: make CutAndPaste a namespace.
* text3.C (dispatch): adjust

172
src/CutAndPaste.C
View File

@ -56,34 +56,15 @@ extern BufferView * current_view;
namespace {
// FIXME: stupid name
Paragraph * buf = 0;
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;
@ -179,18 +160,20 @@ bool CutAndPaste::cutSelection(Paragraph * startpar, Paragraph ** endpar,
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())
@ -203,46 +186,48 @@ bool CutAndPaste::copySelection(Paragraph * startpar, Paragraph * endpar,
// 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();
}
tmppar2->next(0);
newpar->cleanChanges();
#if 1
newpar->setInsetOwner(0);
#endif
// the buf paragraph is too big
paragraphs.push_back(newpar);
tmppar = tmppar->next();
}
// 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);
while (back.size() > tmpi2) {
back.erase(back.size() - 1);
}
#if 0
// this paragraph's are of noone's owner!
tmppar = buf;
while (tmppar) {
tmppar->setInsetOwner(0);
tmppar = tmppar->next();
}
ParagraphList::iterator it = paragraphs.begin();
ParagraphList::iterator end = paragraphs.end();
for (; it != end; ++it)
it->setInsetOwner(0);
#endif
}
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())
@ -287,37 +272,45 @@ bool CutAndPaste::pasteSelection(Paragraph ** par, Paragraph ** endpar,
// 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;
#if 1
ParagraphList::iterator it = paragraphs.begin();
while (tmpbuf->next()) {
tmpbuf = tmpbuf->next();
tmpbuf2->next(new Paragraph(*tmpbuf, false));
tmpbuf2->next()->previous(tmpbuf2);
tmpbuf2 = tmpbuf2->next();
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
// 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;
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.
// 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,
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)
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);
@ -329,7 +322,7 @@ bool CutAndPaste::pasteSelection(Paragraph ** par, Paragraph ** endpar,
max_depth = tmpbuf->getMaxDepthAfter();
// set the inset owner of this paragraph
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 (!(*par)->insetAllowed(tmpbuf->getInset(i)->lyxCode()))
{
@ -348,16 +341,16 @@ bool CutAndPaste::pasteSelection(Paragraph ** par, Paragraph ** endpar,
tmpbuf = tmpbuf->next();
}
// now reset it to 0
buf->previous(0);
paragraphs.begin()->previous(0);
// make the buf exactly the same layout than
// the cursor paragraph
buf->makeSameLayout(*par);
paragraphs.begin()->makeSameLayout(*par);
// find the end of the buffer
Paragraph * lastbuffer = buf;
while (lastbuffer->next())
lastbuffer = lastbuffer->next();
ParagraphList::iterator lastbuffer = paragraphs.begin();
while (boost::next(lastbuffer) != paragraphs.end())
++lastbuffer;
bool paste_the_end = false;
@ -373,10 +366,10 @@ bool CutAndPaste::pasteSelection(Paragraph ** par, Paragraph ** endpar,
// paste it!
lastbuffer->next((*par)->next());
(*par)->next()->previous(lastbuffer);
(*par)->next()->previous(&*lastbuffer);
(*par)->next(buf);
buf->previous(*par);
(*par)->next(&*paragraphs.begin());
paragraphs.begin()->previous(*par);
if ((*par)->next() == lastbuffer)
lastbuffer = *par;
@ -384,15 +377,15 @@ bool CutAndPaste::pasteSelection(Paragraph ** par, Paragraph ** endpar,
mergeParagraph(current_view->buffer()->params,
current_view->buffer()->paragraphs, *par);
// store the new cursor position
*par = lastbuffer;
*par = &*lastbuffer;
pos = lastbuffer->size();
// maybe some pasting
if (lastbuffer->next() && paste_the_end) {
if (lastbuffer->next()->hasSameLayout(lastbuffer)) {
if (lastbuffer->next()->hasSameLayout(&*lastbuffer)) {
mergeParagraph(current_view->buffer()->params,
current_view->buffer()->paragraphs, lastbuffer);
} else if (!lastbuffer->next()->size()) {
lastbuffer->next()->makeSameLayout(lastbuffer);
lastbuffer->next()->makeSameLayout(&*lastbuffer);
mergeParagraph(current_view->buffer()->params, current_view->buffer()->paragraphs, lastbuffer);
} else if (!lastbuffer->size()) {
lastbuffer->makeSameLayout(lastbuffer->next());
@ -402,7 +395,7 @@ bool CutAndPaste::pasteSelection(Paragraph ** par, Paragraph ** endpar,
lastbuffer->next()->stripLeadingSpaces();
}
// restore the simple cut buffer
buf = simple_cut_clone;
paragraphs = simple_cut_clone;
}
return true;
@ -411,16 +404,7 @@ bool CutAndPaste::pasteSelection(Paragraph ** par, Paragraph ** endpar,
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();
}
@ -482,9 +466,7 @@ int CutAndPaste::SwitchLayoutsBetweenClasses(textclass_type c1,
}
bool CutAndPaste::checkPastePossible(Paragraph *)
bool CutAndPaste::checkPastePossible()
{
if (!buf) return false;
return true;
return !paragraphs.empty();
}

11
src/CutAndPaste.h
View File

@ -22,14 +22,15 @@ namespace CutAndPaste {
/// realcut == false is we actually want a delete
bool cutSelection(Paragraph * startpar, Paragraph ** endpar,
int start, int & end, char tc, bool doclear = false,
bool realcut = true);
int start, int & end, lyx::textclass_type tc,
bool doclear = false, bool realcut = true);
///
bool copySelection(Paragraph * startpar, Paragraph * endpar,
int start, int end, char tc);
int start, int end, lyx::textclass_type tc);
///
bool pasteSelection(Paragraph ** par, Paragraph ** endpar,
int & pos, char tc);
int & pos, lyx::textclass_type tc);
///
int nrOfParagraphs();
@ -43,7 +44,7 @@ int SwitchLayoutsBetweenClasses(lyx::textclass_type c1,
Paragraph * par,
BufferParams const & bparams);
///
bool checkPastePossible(Paragraph *);
bool checkPastePossible();
} // end of CutAndPaste

32
src/ParagraphList.C
View File

@ -94,6 +94,8 @@ ParagraphList::insert(ParagraphList::iterator it, Paragraph * par)
par->previous(prev);
prev->next(par);
it->previous(par);
} else if (parlist == 0) {
parlist = par;
} else {
// Find last par.
Paragraph * last = parlist;
@ -154,6 +156,36 @@ ParagraphList::iterator ParagraphList::end() const
}
Paragraph const & ParagraphList::front() const
{
return *parlist;
}
Paragraph & ParagraphList::front()
{
return *parlist;
}
Paragraph const & ParagraphList::back() const
{
Paragraph * tmp = parlist;
while (tmp->next())
tmp = tmp->next();
return *tmp;
}
Paragraph & ParagraphList::back()
{
Paragraph * tmp = parlist;
while (tmp->next())
tmp = tmp->next();
return *tmp;
}
void ParagraphList::set(Paragraph * p)
{
parlist = p;

8
src/ParagraphList.h
View File

@ -64,9 +64,13 @@ public:
///
void push_back(Paragraph *);
///
Paragraph const * back() const;
Paragraph const & front() const;
///
Paragraph * back();
Paragraph & front();
///
Paragraph const & back() const;
///
Paragraph & back();
///
int size() const;
///

2
src/text2.C
View File

@ -1516,7 +1516,7 @@ void LyXText::copySelection(BufferView * bview)
void LyXText::pasteSelection(BufferView * bview)
{
// this does not make sense, if there is nothing to paste
if (!CutAndPaste::checkPastePossible(cursor.par()))
if (!CutAndPaste::checkPastePossible())
return;
setUndo(bview, Undo::INSERT,