X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftext2.C;h=4ddfcffa2c8338d78cc66421514e8675b604b019;hb=574031d6891305725b4d4a1834e7111fc2f51014;hp=d7047c5c301184334bbe1f1fa57080e9e6e29dfb;hpb=8fd0a9f2d7ec245952903a359b1b2910e7d6ebd1;p=lyx.git diff --git a/src/text2.C b/src/text2.C index d7047c5c30..4ddfcffa2c 100644 --- a/src/text2.C +++ b/src/text2.C @@ -4,156 +4,101 @@ * LyX, The Document Processor * * Copyright 1995 Matthias Ettrich - * Copyright 1995-2000 The LyX Team. + * Copyright 1995-2001 The LyX Team. * * ====================================================== */ #include -#include FORMS_H_LOCATION - - #ifdef __GNUG__ #pragma implementation "lyxtext.h" #endif +#include "lyxtext.h" #include "LString.h" -#include "lyxparagraph.h" -#include "insets/inseterror.h" -#include "insets/insetbib.h" -#include "insets/insetspecialchar.h" -#include "insets/insettext.h" -#include "insets/insetfloat.h" +#include "paragraph.h" #include "layout.h" #include "LyXView.h" -#include "support/textutils.h" -#include "undo.h" -#include "minibuffer.h" +#include "undo_funcs.h" #include "buffer.h" #include "bufferparams.h" #include "lyx_gui_misc.h" -#include "lyxtext.h" #include "gettext.h" #include "BufferView.h" #include "LyXView.h" -#include "lyxrow.h" #include "CutAndPaste.h" #include "Painter.h" #include "font.h" #include "debug.h" #include "lyxrc.h" +#include "lyxrow.h" #include "FloatList.h" +#include "language.h" +#include "ParagraphParameters.h" + +#include "insets/inseterror.h" +#include "insets/insetbib.h" +#include "insets/insetspecialchar.h" +#include "insets/insettext.h" +#include "insets/insetfloat.h" + +#include "support/LAssert.h" +#include "support/textutils.h" +#include "support/lstrings.h" using std::copy; +using std::find; using std::endl; +using std::find; using std::pair; +using lyx::pos_type; LyXText::LyXText(BufferView * bv) -{ - bv_owner = bv; - inset_owner = 0; - init(); -} + : number_of_rows(0), height(0), width(0), first(0), + bv_owner(bv), inset_owner(0), the_locking_inset(0), + need_break_row(0), refresh_y(0), refresh_row(0), + status_(LyXText::UNCHANGED), firstrow(0), lastrow(0), + copylayouttype(0) +{} LyXText::LyXText(InsetText * inset) -{ - inset_owner = inset; - bv_owner = 0; - init(); -} - - -void LyXText::init() -{ - the_locking_inset = 0; - firstrow = 0; - lastrow = 0; - number_of_rows = 0; - refresh_y = 0; - height = 0; - width = 0; - first = 0; - status = LyXText::UNCHANGED; - // set cursor at the very top position - selection = true; /* these setting is necessary - because of the delete-empty- - paragraph mechanism in - SetCursor */ - if (bv_owner) { - LyXParagraph * par = OwnerParagraph(); - current_font = GetFont(bv_owner->buffer(), par, 0); - while (par) { - InsertParagraph(bv_owner, par, lastrow); - par = par->Next(); + : number_of_rows(0), height(0), width(0), first(0), + bv_owner(0), inset_owner(inset), the_locking_inset(0), + need_break_row(0), refresh_y(0), refresh_row(0), + status_(LyXText::UNCHANGED), firstrow(0), lastrow(0), + copylayouttype(0) +{} + +void LyXText::init(BufferView * bview, bool reinit) +{ + if (reinit) { + // Delete all rows, this does not touch the paragraphs! + Row * tmprow = firstrow; + while (firstrow) { + tmprow = firstrow->next(); + delete firstrow; + firstrow = tmprow; } - SetCursor(bv_owner, firstrow->par(), 0); - } else - current_font = LyXFont(LyXFont::ALL_SANE); - - sel_cursor = cursor; - selection = false; - mark_set = false; - - // no rebreak necessary - need_break_row = 0; - - undo_finished = true; - undo_frozen = false; - - // Default layouttype for copy environment type - copylayouttype = 0; - -#if 0 - // Dump all rowinformation: - Row * tmprow = firstrow; - lyxerr << "Baseline Paragraph Pos Height Ascent Fill\n"; - while (tmprow) { - lyxerr << tmprow->baseline() << '\t' - << tmprow->par << '\t' - << tmprow->pos() << '\t' - << tmprow->height << '\t' - << tmprow->ascent_of_text << '\t' - << tmprow->fill << '\n'; - tmprow = tmprow->next(); - } - lyxerr.flush(); -#endif -} - - -void LyXText::init(BufferView * bview) -{ - if (firstrow) + lastrow = refresh_row = need_break_row = 0; + width = height = copylayouttype = 0; + number_of_rows = first = refresh_y = 0; + status_ = LyXText::UNCHANGED; + } else if (firstrow) return; - LyXParagraph * par = OwnerParagraph(); - current_font = GetFont(bview->buffer(), par, 0); + Paragraph * par = ownerParagraph(); + current_font = getFont(bview->buffer(), par, 0); while (par) { - InsertParagraph(bview, par, lastrow); - par = par->Next(); + insertParagraph(bview, par, lastrow); + par = par->next(); } - SetCursorIntern(bview, firstrow->par(), 0); - sel_cursor = cursor; -#if 0 - // Dump all rowinformation: - Row * tmprow = firstrow; - lyxerr << "Width = " << width << endl; - lyxerr << "Baseline Paragraph Pos Height Ascent Fill\n"; - while (tmprow) { - lyxerr << tmprow->baseline() << '\t' - << tmprow->par() << '\t' - << tmprow->pos() << '\t' - << tmprow->height() << '\t' - << tmprow->ascent_of_text() << '\t' - << tmprow->fill() << '\n'; - tmprow = tmprow->next(); - } - lyxerr.flush(); -#endif + setCursorIntern(bview, firstrow->par(), 0); + selection.cursor = cursor; } + LyXText::~LyXText() { // Delete all rows, this does not touch the paragraphs! @@ -166,152 +111,253 @@ LyXText::~LyXText() } +namespace { + +LyXFont const realizeFont(LyXFont const & font, + Buffer const * buf, + Paragraph * par) +{ + LyXFont tmpfont(font); + Paragraph::depth_type par_depth = par->getDepth(); + + // Resolve against environment font information + while (par && par_depth && !tmpfont.resolved()) { + par = par->outerHook(); + if (par) { +#ifndef INHERIT_LANGUAGE + tmpfont.realize(textclasslist. + Style(buf->params.textclass, + par->getLayout()).font); +#else + tmpfont.realize(textclasslist. + Style(buf->params.textclass, + par->getLayout()).font, + buf->params.language); +#endif + par_depth = par->getDepth(); + } + } + +#ifndef INHERIT_LANGUAGE + tmpfont.realize(textclasslist.TextClass(buf->params.textclass).defaultfont()); +#else + tmpfont.realize(textclasslist.TextClass(buf->params.textclass).defaultfont(), + buf->params.language); +#endif + + return tmpfont; +} + +} + + // Gets the fully instantiated font at a given position in a paragraph -// Basically the same routine as LyXParagraph::getFont() in paragraph.C. +// Basically the same routine as Paragraph::getFont() in paragraph.C. // The difference is that this one is used for displaying, and thus we // are allowed to make cosmetic improvements. For instance make footnotes // smaller. (Asger) // If position is -1, we get the layout font of the paragraph. // If position is -2, we get the font of the manual label of the paragraph. -LyXFont const LyXText::GetFont(Buffer const * buf, LyXParagraph * par, - LyXParagraph::size_type pos) const +LyXFont const LyXText::getFont(Buffer const * buf, Paragraph * par, + pos_type pos) const { + lyx::Assert(pos >= 0); + LyXLayout const & layout = - textclasslist.Style(buf->params.textclass, par->GetLayout()); - - char par_depth = par->GetDepth(); + textclasslist.Style(buf->params.textclass, par->getLayout()); + + Paragraph::depth_type par_depth = par->getDepth(); // We specialize the 95% common case: - if ( -#ifndef NEW_INSETS - par->footnoteflag == LyXParagraph::NO_FOOTNOTE && -#endif - !par_depth) { - if (pos >= 0){ - // 95% goes here - if (layout.labeltype == LABEL_MANUAL - && pos < BeginningOfMainBody(buf, par)) { + if (!par_depth) { + if (layout.labeltype == LABEL_MANUAL + && pos < beginningOfMainBody(buf, par)) { // 1% goes here - LyXFont f = par->GetFontSettings(buf->params, - pos); - return f.realize(layout.reslabelfont); - } else { - LyXFont f = par->GetFontSettings(buf->params, pos); - return f.realize(layout.resfont); - } - + LyXFont f = par->getFontSettings(buf->params, + pos); +#ifndef INHERIT_LANGUAGE + return f.realize(layout.reslabelfont); +#else + return f.realize(layout.reslabelfont, buf->params.language); +#endif } else { - // 5% goes here. - // process layoutfont for pos == -1 and labelfont for pos < -1 - if (pos == -1) - return layout.resfont; - else - return layout.reslabelfont; + LyXFont f = par->getFontSettings(buf->params, pos); +#ifndef INHERIT_LANGUAGE + return f.realize(layout.resfont); +#else + return f.realize(layout.resfont, buf->params.language); +#endif } } - + // The uncommon case need not be optimized as much - - LyXFont layoutfont, tmpfont; - - if (pos >= 0){ - // 95% goes here - if (pos < BeginningOfMainBody(buf, par)) { - // 1% goes here - layoutfont = layout.labelfont; - } else { - // 99% goes here - layoutfont = layout.font; - } - tmpfont = par->GetFontSettings(buf->params, pos); - tmpfont.realize(layoutfont); + + LyXFont layoutfont; + + if (pos < beginningOfMainBody(buf, par)) { + // 1% goes here + layoutfont = layout.labelfont; } else { - // 5% goes here. - // process layoutfont for pos == -1 and labelfont for pos < -1 - if (pos == -1) - tmpfont = layout.font; - else - tmpfont = layout.labelfont; + // 99% goes here + layoutfont = layout.font; } - // Resolve against environment font information - while (par && par_depth && !tmpfont.resolved()) { - par = par->DepthHook(par_depth - 1); - if (par) { - tmpfont.realize(textclasslist. - Style(buf->params.textclass, - par->GetLayout()).font); - par_depth = par->GetDepth(); - } + LyXFont tmpfont = par->getFontSettings(buf->params, pos); +#ifndef INHERIT_LANGUAGE + tmpfont.realize(layoutfont); +#else + tmpfont.realize(layoutfont, buf->params.language); +#endif + + return realizeFont(tmpfont, buf, par); +} + + +LyXFont const LyXText::getLayoutFont(Buffer const * buf, Paragraph * par) const +{ + LyXLayout const & layout = + textclasslist.Style(buf->params.textclass, par->getLayout()); + + Paragraph::depth_type par_depth = par->getDepth(); + + if (!par_depth) { + return layout.resfont; } - tmpfont.realize(textclasslist.TextClass(buf->params.textclass).defaultfont()); + return realizeFont(layout.font, buf, par); +} + -#ifndef NEW_INSETS - // Cosmetic improvement: If this is an open footnote, make the font - // smaller. - if (par->footnoteflag == LyXParagraph::OPEN_FOOTNOTE - && par->footnotekind == LyXParagraph::FOOTNOTE) { - tmpfont.decSize(); +LyXFont const LyXText::getLabelFont(Buffer const * buf, Paragraph * par) const +{ + LyXLayout const & layout = + textclasslist.Style(buf->params.textclass, par->getLayout()); + + Paragraph::depth_type par_depth = par->getDepth(); + + if (!par_depth) { + return layout.reslabelfont; } -#endif - return tmpfont; + + return realizeFont(layout.labelfont, buf, par); } -void LyXText::SetCharFont(Buffer const * buf, LyXParagraph * par, - LyXParagraph::size_type pos, - LyXFont const & fnt) +void LyXText::setCharFont(BufferView * bv, Paragraph * par, + pos_type pos, LyXFont const & fnt, + bool toggleall) { - LyXFont font(fnt); + Buffer const * buf = bv->buffer(); + LyXFont font = getFont(buf, par, pos); + font.update(fnt, buf->params.language, toggleall); // Let the insets convert their font - if (par->GetChar(pos) == LyXParagraph::META_INSET) { - if (par->GetInset(pos)) - font = par->GetInset(pos)->ConvertFont(font); + if (par->isInset(pos)) { + Inset * inset = par->getInset(pos); + if (isEditableInset(inset)) { + UpdatableInset * uinset = + static_cast(inset); + uinset->setFont(bv, fnt, toggleall, true); + } } LyXLayout const & layout = textclasslist.Style(buf->params.textclass, - par->GetLayout()); + par->getLayout()); // Get concrete layout font to reduce against LyXFont layoutfont; - if (pos < BeginningOfMainBody(buf, par)) + if (pos < beginningOfMainBody(buf, par)) layoutfont = layout.labelfont; else layoutfont = layout.font; // Realize against environment font information - if (par->GetDepth()){ - LyXParagraph * tp = par; - while (!layoutfont.resolved() && tp && tp->GetDepth()) { - tp = tp->DepthHook(tp->GetDepth()-1); + if (par->getDepth()){ + Paragraph * tp = par; + while (!layoutfont.resolved() && tp && tp->getDepth()) { + tp = tp->outerHook(); if (tp) +#ifndef INHERIT_LANGUAGE layoutfont.realize(textclasslist. - Style(buf->params.textclass, - tp->GetLayout()).font); + Style(buf->params.textclass, + tp->getLayout()).font); +#else + layoutfont.realize(textclasslist. + Style(buf->params.textclass, + tp->getLayout()).font, + buf->params.language); +#endif } } +#ifndef INHERIT_LANGUAGE layoutfont.realize(textclasslist.TextClass(buf->params.textclass).defaultfont()); +#else + layoutfont.realize(textclasslist.TextClass(buf->params.textclass).defaultfont(), + buf->params.language); +#endif + + // Now, reduce font against full layout font + font.reduce(layoutfont); + + par->setFont(pos, font); +} + -#ifndef NEW_INSETS - if (par->footnoteflag == LyXParagraph::OPEN_FOOTNOTE - && par->footnotekind == LyXParagraph::FOOTNOTE) { - layoutfont.decSize(); +void LyXText::setCharFont(Buffer const * buf, Paragraph * par, + pos_type pos, LyXFont const & fnt) +{ + LyXFont font(fnt); + + LyXLayout const & layout = + textclasslist.Style(buf->params.textclass, + par->getLayout()); + + // Get concrete layout font to reduce against + LyXFont layoutfont; + + if (pos < beginningOfMainBody(buf, par)) + layoutfont = layout.labelfont; + else + layoutfont = layout.font; + + // Realize against environment font information + if (par->getDepth()){ + Paragraph * tp = par; + while (!layoutfont.resolved() && tp && tp->getDepth()) { + tp = tp->outerHook(); + if (tp) +#ifndef INHERIT_LANGUAGE + layoutfont.realize(textclasslist. + Style(buf->params.textclass, + tp->getLayout()).font); +#else + layoutfont.realize(textclasslist. + Style(buf->params.textclass, + tp->getLayout()).font, + buf->params.language); +#endif + } } + +#ifndef INHERIT_LANGUAGE + layoutfont.realize(textclasslist.TextClass(buf->params.textclass).defaultfont()); +#else + layoutfont.realize(textclasslist.TextClass(buf->params.textclass).defaultfont(), + buf->params.language); #endif + // Now, reduce font against full layout font font.reduce(layoutfont); - par->SetFont(pos, font); + par->setFont(pos, font); } -/* inserts a new row behind the specified row, increments - * the touched counters */ -void LyXText::InsertRow(Row * row, LyXParagraph * par, - LyXParagraph::size_type pos) const +// inserts a new row behind the specified row, increments +// the touched counters +void LyXText::insertRow(Row * row, Paragraph * par, + pos_type pos) const { Row * tmprow = new Row; if (!row) { @@ -336,23 +382,18 @@ void LyXText::InsertRow(Row * row, LyXParagraph * par, if (row == lastrow) lastrow = tmprow; - ++number_of_rows; // one more row + ++number_of_rows; } // removes the row and reset the touched counters -void LyXText::RemoveRow(Row * row) const +void LyXText::removeRow(Row * row) const { - /* this must not happen before the currentrow for clear reasons. - so the trick is just to set the current row onto the previous - row of this row */ - int unused_y; - GetRow(row->par(), row->pos(), unused_y); - if (row->next()) row->next()->previous(row->previous()); if (!row->previous()) { firstrow = row->next(); +// lyx::Assert(firstrow); } else { row->previous()->next(row->next()); } @@ -367,509 +408,344 @@ void LyXText::RemoveRow(Row * row) const // remove all following rows of the paragraph of the specified row. -void LyXText::RemoveParagraph(Row * row) const +void LyXText::removeParagraph(Row * row) const { - LyXParagraph * tmppar = row->par(); + Paragraph * tmppar = row->par(); row = row->next(); Row * tmprow; while (row && row->par() == tmppar) { tmprow = row->next(); - RemoveRow(row); + removeRow(row); row = tmprow; } } // insert the specified paragraph behind the specified row -void LyXText::InsertParagraph(BufferView * bview, LyXParagraph * par, - Row * row) const +void LyXText::insertParagraph(BufferView * bview, Paragraph * par, + Row * row) const { - InsertRow(row, par, 0); /* insert a new row, starting - * at postition 0 */ + insertRow(row, par, 0); /* insert a new row, starting + * at postition 0 */ - SetCounter(bview->buffer(), par); // set the counters + setCounter(bview->buffer(), par); // set the counters // and now append the whole paragraph behind the new row if (!row) { firstrow->height(0); - AppendParagraph(bview, firstrow); + appendParagraph(bview, firstrow); } else { row->next()->height(0); - AppendParagraph(bview, row->next()); + appendParagraph(bview, row->next()); } } -#ifndef NEW_INSETS -void LyXText::ToggleFootnote(BufferView * bview) +Inset * LyXText::getInset() const { - LyXParagraph * par = cursor.par()->ParFromPos(cursor.pos()); - if (par->next - && par->next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) { - OpenFootnote(bview); - bview->owner()->getMiniBuffer()->Set(_("Opened float")); - } else { - bview->owner()->getMiniBuffer()->Set(_("Closed float")); - CloseFootnote(bview); + Inset * inset = 0; + if (cursor.pos() == 0 && cursor.par()->bibkey) { + inset = cursor.par()->bibkey; + } else if (cursor.pos() < cursor.par()->size() + && cursor.par()->isInset(cursor.pos())) { + inset = cursor.par()->getInset(cursor.pos()); } + return inset; } -#endif -#ifndef NEW_INSETS -void LyXText::OpenStuff(BufferView * bview) +void LyXText::toggleInset(BufferView * bview) { - if (cursor.pos() == 0 && cursor.par()->bibkey){ - cursor.par()->bibkey->Edit(bview, 0, 0, 0); - } else if (cursor.pos() < cursor.par()->Last() - && cursor.par()->GetChar(cursor.pos()) == LyXParagraph::META_INSET - && cursor.par()->GetInset(cursor.pos())->Editable()) { - bview->owner()->getMiniBuffer() - ->Set(cursor.par()->GetInset(cursor.pos())->EditMessage()); - if (cursor.par()->GetInset(cursor.pos())->Editable() != Inset::HIGHLY_EDITABLE) - SetCursorParUndo(bview->buffer()); - cursor.par()->GetInset(cursor.pos())->Edit(bview, 0, 0, 0); - } -#ifndef NEW_INSETS - else { - ToggleFootnote(bview); - } -#endif -} -#endif + Inset * inset = getInset(); + if (!isEditableInset(inset)) + return; + //bview->owner()->message(inset->editMessage()); + // do we want to keep this?? (JMarc) + if (!isHighlyEditableInset(inset)) + setCursorParUndo(bview); -#ifndef NEW_INSETS -void LyXText::CloseFootnote(BufferView * bview) -{ - LyXParagraph * tmppar; - LyXParagraph * par = cursor.par()->ParFromPos(cursor.pos()); - - // if the cursor is not in an open footnote, or - // there is no open footnote in this paragraph, just return. - if (cursor.par()->footnoteflag != LyXParagraph::OPEN_FOOTNOTE) { - - if (!par->next || - par->next->footnoteflag != LyXParagraph::OPEN_FOOTNOTE) { - bview->owner()->getMiniBuffer() - ->Set(_("Nothing to do")); - return; - } - - // ok, move the cursor right before the footnote - // just a little faster than using CursorRight() - for (cursor.pos(0); - cursor.par()->ParFromPos(cursor.pos()) != par;) { - cursor.pos(cursor.pos() + 1); - } - - // now the cursor is at the beginning of the physical par - SetCursor(bview, cursor.par(), - cursor.pos() + - cursor.par()->ParFromPos(cursor.pos())->size()); - } else { - /* we are in a footnote, so let us move at the beginning */ - /* this is just faster than using just CursorLeft() */ - - tmppar = cursor.par(); - while (tmppar->footnoteflag == LyXParagraph::OPEN_FOOTNOTE) { - // just a little bit faster than movin the cursor - tmppar = tmppar->Previous(); - } - SetCursor(bview, tmppar, tmppar->Last()); - } - - // the cursor must be exactly before the footnote - par = cursor.par()->ParFromPos(cursor.pos()); - - status = LyXText::NEED_MORE_REFRESH; - refresh_row = cursor.row(); - refresh_y = cursor.y() - cursor.row()->baseline(); - - tmppar = cursor.par(); - LyXParagraph * endpar = par->NextAfterFootnote()->Next(); - Row * row = cursor.row(); - - tmppar->CloseFootnote(cursor.pos()); - - while (tmppar != endpar) { - RemoveRow(row->next()); - if (row->next()) - tmppar = row->next()->par(); - else - tmppar = 0; + if (inset->isOpen()) { + inset->close(bview); + } else { + inset->open(bview); } - - AppendParagraph(bview, cursor.row()); - - SetCursor(bview, cursor.par(), cursor.pos()); - sel_cursor = cursor; - - // just necessary - if (cursor.row()->next()) - SetHeightOfRow(bview, cursor.row()->next()); -} +#if 0 + inset->open(bview, !inset->isOpen()); #endif +} /* used in setlayout */ // Asger is not sure we want to do this... -void LyXText::MakeFontEntriesLayoutSpecific(Buffer const * buf, - LyXParagraph * par) +void LyXText::makeFontEntriesLayoutSpecific(Buffer const * buf, + Paragraph * par) { - LyXLayout const & layout = - textclasslist.Style(buf->params.textclass, par->GetLayout()); + textclasslist.Style(buf->params.textclass, par->getLayout()); - LyXFont layoutfont, tmpfont; - for (LyXParagraph::size_type pos = 0; - pos < par->Last(); ++pos) { - if (pos < BeginningOfMainBody(buf, par)) + LyXFont layoutfont; + for (pos_type pos = 0; pos < par->size(); ++pos) { + if (pos < beginningOfMainBody(buf, par)) layoutfont = layout.labelfont; else layoutfont = layout.font; - tmpfont = par->GetFontSettings(buf->params, pos); + LyXFont tmpfont = par->getFontSettings(buf->params, pos); tmpfont.reduce(layoutfont); - par->SetFont(pos, tmpfont); + par->setFont(pos, tmpfont); } } -LyXParagraph * LyXText::SetLayout(BufferView * bview, - LyXCursor & cur, LyXCursor & sstart_cur, - LyXCursor & send_cur, - LyXTextClass::size_type layout) +Paragraph * LyXText::setLayout(BufferView * bview, + LyXCursor & cur, LyXCursor & sstart_cur, + LyXCursor & send_cur, + lyx::layout_type layout) { -#ifndef NEW_INSETS - LyXParagraph * endpar = send_cur.par()->LastPhysicalPar()->Next(); -#else - LyXParagraph * endpar = send_cur.par()->Next(); -#endif - LyXParagraph * undoendpar = endpar; - - if (endpar && endpar->GetDepth()) { - while (endpar && endpar->GetDepth()) { -#ifndef NEW_INSETS - endpar = endpar->LastPhysicalPar()->Next(); -#else - endpar = endpar->Next(); -#endif + Paragraph * endpar = send_cur.par()->next(); + Paragraph * undoendpar = endpar; + + if (endpar && endpar->getDepth()) { + while (endpar && endpar->getDepth()) { + endpar = endpar->next(); undoendpar = endpar; } } else if (endpar) { - endpar = endpar->Next(); // because of parindents etc. + endpar = endpar->next(); // because of parindents etc. } - - SetUndo(bview->buffer(), Undo::EDIT, -#ifndef NEW_INSETS - sstart_cur.par()->ParFromPos(sstart_cur.pos())->previous, -#else - sstart_cur.par()->previous, -#endif - undoendpar); - - /* ok we have a selection. This is always between sstart_cur - * and sel_end cursor */ + + setUndo(bview, Undo::EDIT, + sstart_cur.par(), undoendpar); + + // ok we have a selection. This is always between sstart_cur + // and sel_end cursor cur = sstart_cur; - + LyXLayout const & lyxlayout = textclasslist.Style(bview->buffer()->params.textclass, layout); - + while (cur.par() != send_cur.par()) { -#ifndef NEW_INSETS - if (cur.par()->footnoteflag == sstart_cur.par()->footnoteflag) { -#endif - cur.par()->SetLayout(bview->buffer()->params, layout); - MakeFontEntriesLayoutSpecific(bview->buffer(), cur.par()); -#ifndef NEW_INSETS - LyXParagraph * fppar = cur.par()->FirstPhysicalPar(); -#else - LyXParagraph * fppar = cur.par(); -#endif - fppar->added_space_top = lyxlayout.fill_top ? - VSpace(VSpace::VFILL) : VSpace(VSpace::NONE); - fppar->added_space_bottom = lyxlayout.fill_bottom ? - VSpace(VSpace::VFILL) : VSpace(VSpace::NONE); - if (lyxlayout.margintype == MARGIN_MANUAL) - cur.par()->SetLabelWidthString(lyxlayout.labelstring()); - if (lyxlayout.labeltype != LABEL_BIBLIO - && fppar->bibkey) { - delete fppar->bibkey; - fppar->bibkey = 0; - } -#ifndef NEW_INSETS - } -#endif - cur.par(cur.par()->Next()); - } -#ifndef NEW_INSETS - if (cur.par()->footnoteflag == sstart_cur.par()->footnoteflag) { -#endif - cur.par()->SetLayout(bview->buffer()->params, layout); - MakeFontEntriesLayoutSpecific(bview->buffer(), cur.par()); -#ifndef NEW_INSETS - LyXParagraph * fppar = cur.par()->FirstPhysicalPar(); -#else - LyXParagraph * fppar = cur.par(); -#endif - fppar->added_space_top = lyxlayout.fill_top ? - VSpace(VSpace::VFILL) : VSpace(VSpace::NONE); - fppar->added_space_bottom = lyxlayout.fill_bottom ? - VSpace(VSpace::VFILL) : VSpace(VSpace::NONE); + cur.par()->setLayout(layout); + makeFontEntriesLayoutSpecific(bview->buffer(), cur.par()); + Paragraph * fppar = cur.par(); + fppar->params().spaceTop(lyxlayout.fill_top ? + VSpace(VSpace::VFILL) + : VSpace(VSpace::NONE)); + fppar->params().spaceBottom(lyxlayout.fill_bottom ? + VSpace(VSpace::VFILL) + : VSpace(VSpace::NONE)); if (lyxlayout.margintype == MARGIN_MANUAL) - cur.par()->SetLabelWidthString(lyxlayout.labelstring()); + cur.par()->setLabelWidthString(lyxlayout.labelstring()); if (lyxlayout.labeltype != LABEL_BIBLIO && fppar->bibkey) { delete fppar->bibkey; fppar->bibkey = 0; } -#ifndef NEW_INSETS + cur.par(cur.par()->next()); + } + cur.par()->setLayout(layout); + makeFontEntriesLayoutSpecific(bview->buffer(), cur.par()); + Paragraph * fppar = cur.par(); + fppar->params().spaceTop(lyxlayout.fill_top ? + VSpace(VSpace::VFILL) : VSpace(VSpace::NONE)); + fppar->params().spaceBottom(lyxlayout.fill_bottom ? + VSpace(VSpace::VFILL) : VSpace(VSpace::NONE)); + if (lyxlayout.margintype == MARGIN_MANUAL) + cur.par()->setLabelWidthString(lyxlayout.labelstring()); + if (lyxlayout.labeltype != LABEL_BIBLIO + && fppar->bibkey) { + delete fppar->bibkey; + fppar->bibkey = 0; } -#endif return endpar; } + // set layout over selection and make a total rebreak of those paragraphs -void LyXText::SetLayout(BufferView * bview, LyXTextClass::size_type layout) +void LyXText::setLayout(BufferView * bview, lyx::layout_type layout) { LyXCursor tmpcursor = cursor; /* store the current cursor */ // if there is no selection just set the layout // of the current paragraph */ - if (!selection) { - sel_start_cursor = cursor; // dummy selection - sel_end_cursor = cursor; - } - LyXParagraph * - endpar = SetLayout(bview, cursor, sel_start_cursor, - sel_end_cursor, layout); - RedoParagraphs(bview, sel_start_cursor, endpar); + if (!selection.set()) { + selection.start = cursor; // dummy selection + selection.end = cursor; + } + Paragraph * endpar = setLayout(bview, cursor, selection.start, + selection.end, layout); + redoParagraphs(bview, selection.start, endpar); // we have to reset the selection, because the // geometry could have changed - SetCursor(bview, sel_start_cursor.par(), - sel_start_cursor.pos(), false); - sel_cursor = cursor; - SetCursor(bview, sel_end_cursor.par(), sel_end_cursor.pos(), - false); - UpdateCounters(bview, cursor.row()); - ClearSelection(); - SetSelection(); - SetCursor(bview, tmpcursor.par(), tmpcursor.pos(), true); + setCursor(bview, selection.start.par(), + selection.start.pos(), false); + selection.cursor = cursor; + setCursor(bview, selection.end.par(), selection.end.pos(), false); + updateCounters(bview, cursor.row()); + clearSelection(); + setSelection(bview); + setCursor(bview, tmpcursor.par(), tmpcursor.pos(), true); } // increment depth over selection and // make a total rebreak of those paragraphs -void LyXText::IncDepth(BufferView * bview) +void LyXText::incDepth(BufferView * bview) { // If there is no selection, just use the current paragraph - if (!selection) { - sel_start_cursor = cursor; // dummy selection - sel_end_cursor = cursor; + if (!selection.set()) { + selection.start = cursor; // dummy selection + selection.end = cursor; } // We end at the next paragraph with depth 0 - LyXParagraph * endpar = -#ifndef NEW_INSETS - sel_end_cursor.par()->LastPhysicalPar()->Next(); -#else - sel_end_cursor.par()->Next(); -#endif - LyXParagraph * undoendpar = endpar; + Paragraph * endpar = selection.end.par()->next(); - if (endpar && endpar->GetDepth()) { - while (endpar && endpar->GetDepth()) { -#ifndef NEW_INSETS - endpar = endpar->LastPhysicalPar()->Next(); -#else - endpar = endpar->Next(); -#endif + Paragraph * undoendpar = endpar; + + if (endpar && endpar->getDepth()) { + while (endpar && endpar->getDepth()) { + endpar = endpar->next(); undoendpar = endpar; } - } - else if (endpar) { - endpar = endpar->Next(); // because of parindents etc. + } else if (endpar) { + endpar = endpar->next(); // because of parindents etc. } - SetUndo(bview->buffer(), Undo::EDIT, -#ifndef NEW_INSETS - sel_start_cursor - .par()->ParFromPos(sel_start_cursor.pos())->previous, -#else - sel_start_cursor.par()->previous, -#endif - undoendpar); + setUndo(bview, Undo::EDIT, + selection.start.par(), undoendpar); LyXCursor tmpcursor = cursor; // store the current cursor // ok we have a selection. This is always between sel_start_cursor // and sel_end cursor - cursor = sel_start_cursor; + cursor = selection.start; bool anything_changed = false; while (true) { // NOTE: you can't change the depth of a bibliography entry if ( -#ifndef NEW_INSETS - cursor.par()->footnoteflag == - sel_start_cursor.par()->footnoteflag && -#endif - textclasslist.Style(bview->buffer()->params.textclass, - cursor.par()->GetLayout() - ).labeltype != LABEL_BIBLIO) { - LyXParagraph * prev = -#ifndef NEW_INSETS - cursor.par()->FirstPhysicalPar()->Previous(); -#else - cursor.par()->Previous(); -#endif + textclasslist.Style(bview->buffer()->params.textclass, + cursor.par()->getLayout() + ).labeltype != LABEL_BIBLIO) { + Paragraph * prev = cursor.par()->previous(); + if (prev - && (prev->GetDepth() - cursor.par()->GetDepth() > 0 - || (prev->GetDepth() == cursor.par()->GetDepth() + && (prev->getDepth() - cursor.par()->getDepth() > 0 + || (prev->getDepth() == cursor.par()->getDepth() && textclasslist.Style(bview->buffer()->params.textclass, - prev->GetLayout()).isEnvironment()))) { -#ifndef NEW_INSETS - cursor.par()->FirstPhysicalPar()->depth++; -#else - cursor.par()->depth++; -#endif + prev->getLayout()).isEnvironment()))) { + cursor.par()->params().depth(cursor.par()->params().depth() + 1); anything_changed = true; - } + } } - if (cursor.par() == sel_end_cursor.par()) - break; - cursor.par(cursor.par()->Next()); + if (cursor.par() == selection.end.par()) + break; + cursor.par(cursor.par()->next()); } // if nothing changed set all depth to 0 if (!anything_changed) { - cursor = sel_start_cursor; - while (cursor.par() != sel_end_cursor.par()) { -#ifndef NEW_INSETS - cursor.par()->FirstPhysicalPar()->depth = 0; -#else - cursor.par()->depth = 0; -#endif - cursor.par(cursor.par()->Next()); + cursor = selection.start; + while (cursor.par() != selection.end.par()) { + cursor.par()->params().depth(0); + cursor.par(cursor.par()->next()); } -#ifndef NEW_INSETS - if (cursor.par()->footnoteflag == sel_start_cursor.par()->footnoteflag) - cursor.par()->FirstPhysicalPar()->depth = 0; -#else - cursor.par()->depth = 0; -#endif + cursor.par()->params().depth(0); } - RedoParagraphs(bview, sel_start_cursor, endpar); + redoParagraphs(bview, selection.start, endpar); // we have to reset the selection, because the // geometry could have changed - SetCursor(bview, sel_start_cursor.par(), - sel_start_cursor.pos()); - sel_cursor = cursor; - SetCursor(bview, sel_end_cursor.par(), sel_end_cursor.pos()); - UpdateCounters(bview, cursor.row()); - ClearSelection(); - SetSelection(); - SetCursor(bview, tmpcursor.par(), tmpcursor.pos()); + setCursor(bview, selection.start.par(), selection.start.pos()); + selection.cursor = cursor; + setCursor(bview, selection.end.par(), selection.end.pos()); + updateCounters(bview, cursor.row()); + clearSelection(); + setSelection(bview); + setCursor(bview, tmpcursor.par(), tmpcursor.pos()); } // decrement depth over selection and // make a total rebreak of those paragraphs -void LyXText::DecDepth(BufferView * bview) +void LyXText::decDepth(BufferView * bview) { // if there is no selection just set the layout // of the current paragraph - if (!selection) { - sel_start_cursor = cursor; // dummy selection - sel_end_cursor = cursor; + if (!selection.set()) { + selection.start = cursor; // dummy selection + selection.end = cursor; } -#ifndef NEW_INSETS - LyXParagraph * endpar = sel_end_cursor.par()->LastPhysicalPar()->Next(); -#else - LyXParagraph * endpar = sel_end_cursor.par()->Next(); -#endif - LyXParagraph * undoendpar = endpar; + Paragraph * endpar = selection.end.par()->next(); + Paragraph * undoendpar = endpar; - if (endpar && endpar->GetDepth()) { - while (endpar && endpar->GetDepth()) { -#ifndef NEW_INSETS - endpar = endpar->LastPhysicalPar()->Next(); -#else - endpar = endpar->Next(); -#endif + if (endpar && endpar->getDepth()) { + while (endpar && endpar->getDepth()) { + endpar = endpar->next(); undoendpar = endpar; } - } - else if (endpar) { - endpar = endpar->Next(); // because of parindents etc. + } else if (endpar) { + endpar = endpar->next(); // because of parindents etc. } - SetUndo(bview->buffer(), Undo::EDIT, -#ifndef NEW_INSETS - sel_start_cursor - .par()->ParFromPos(sel_start_cursor.pos())->previous, -#else - sel_start_cursor.par()->previous, -#endif - undoendpar); + setUndo(bview, Undo::EDIT, + selection.start.par(), undoendpar); LyXCursor tmpcursor = cursor; // store the current cursor // ok we have a selection. This is always between sel_start_cursor // and sel_end cursor - cursor = sel_start_cursor; + cursor = selection.start; while (true) { -#ifndef NEW_INSETS - if (cursor.par()->footnoteflag == - sel_start_cursor.par()->footnoteflag) { - if (cursor.par()->FirstPhysicalPar()->depth) - cursor.par()->FirstPhysicalPar()->depth--; + if (cursor.par()->params().depth()) { + cursor.par()->params() + .depth(cursor.par()->params().depth() - 1); } -#else - if (cursor.par()->depth) - cursor.par()->depth--; -#endif - if (cursor.par() == sel_end_cursor.par()) + if (cursor.par() == selection.end.par()) { break; - cursor.par(cursor.par()->Next()); + } + cursor.par(cursor.par()->next()); } - RedoParagraphs(bview, sel_start_cursor, endpar); + redoParagraphs(bview, selection.start, endpar); // we have to reset the selection, because the // geometry could have changed - SetCursor(bview, sel_start_cursor.par(), - sel_start_cursor.pos()); - sel_cursor = cursor; - SetCursor(bview, sel_end_cursor.par(), sel_end_cursor.pos()); - UpdateCounters(bview, cursor.row()); - ClearSelection(); - SetSelection(); - SetCursor(bview, tmpcursor.par(), tmpcursor.pos()); + setCursor(bview, selection.start.par(), + selection.start.pos()); + selection.cursor = cursor; + setCursor(bview, selection.end.par(), selection.end.pos()); + updateCounters(bview, cursor.row()); + clearSelection(); + setSelection(bview); + setCursor(bview, tmpcursor.par(), tmpcursor.pos()); } // set font over selection and make a total rebreak of those paragraphs -void LyXText::SetFont(BufferView * bview, LyXFont const & font, bool toggleall) +void LyXText::setFont(BufferView * bview, LyXFont const & font, bool toggleall) { // if there is no selection just set the current_font - if (!selection) { + if (!selection.set()) { // Determine basis font LyXFont layoutfont; - if (cursor.pos() < BeginningOfMainBody(bview->buffer(), - cursor.par())) - layoutfont = GetFont(bview->buffer(), cursor.par(),-2); - else - layoutfont = GetFont(bview->buffer(), cursor.par(),-1); + if (cursor.pos() < beginningOfMainBody(bview->buffer(), + cursor.par())) { + layoutfont = getLabelFont(bview->buffer(), + cursor.par()); + } else { + layoutfont = getLayoutFont(bview->buffer(), + cursor.par()); + } // Update current font - real_current_font.update(font, + real_current_font.update(font, bview->buffer()->params.language, toggleall); @@ -877,7 +753,12 @@ void LyXText::SetFont(BufferView * bview, LyXFont const & font, bool toggleall) current_font = real_current_font; current_font.reduce(layoutfont); // And resolve it completely +#ifndef INHERIT_LANGUAGE real_current_font.realize(layoutfont); +#else + real_current_font.realize(layoutfont, + bview->buffer()->params.language); +#endif return; } @@ -886,220 +767,179 @@ void LyXText::SetFont(BufferView * bview, LyXFont const & font, bool toggleall) // ok we have a selection. This is always between sel_start_cursor // and sel_end cursor - SetUndo(bview->buffer(), Undo::EDIT, -#ifndef NEW_INSETS - sel_start_cursor.par()->ParFromPos(sel_start_cursor.pos())->previous, - sel_end_cursor.par()->ParFromPos(sel_end_cursor.pos())->next -#else - sel_start_cursor.par()->previous, - sel_end_cursor.par()->next -#endif - ); - cursor = sel_start_cursor; - while (cursor.par() != sel_end_cursor.par() || - ( -#ifndef NEW_INSETS - cursor.par()->footnoteflag == sel_start_cursor.par()->footnoteflag && -#endif - cursor.pos() < sel_end_cursor.pos())) + setUndo(bview, Undo::EDIT, + selection.start.par(), selection.end.par()->next()); + freezeUndo(); + cursor = selection.start; + while (cursor.par() != selection.end.par() || + (cursor.pos() < selection.end.pos())) { - if (cursor.pos() < cursor.par()->Last() -#ifndef NEW_INSETS - && cursor.par()->footnoteflag - == sel_start_cursor.par()->footnoteflag -#endif - ) { + if (cursor.pos() < cursor.par()->size()) { // an open footnote should behave // like a closed one - LyXFont newfont = GetFont(bview->buffer(), - cursor.par(), cursor.pos()); - newfont.update(font, - bview->buffer()->params.language, - toggleall); - SetCharFont(bview->buffer(), - cursor.par(), cursor.pos(), newfont); + setCharFont(bview, cursor.par(), cursor.pos(), + font, toggleall); cursor.pos(cursor.pos() + 1); } else { cursor.pos(0); - cursor.par(cursor.par()->Next()); + cursor.par(cursor.par()->next()); } } + unFreezeUndo(); - RedoParagraphs(bview, sel_start_cursor, sel_end_cursor.par()->Next()); + redoParagraphs(bview, selection.start, selection.end.par()->next()); // we have to reset the selection, because the - // geometry could have changed - SetCursor(bview, sel_start_cursor.par(), sel_start_cursor.pos()); - sel_cursor = cursor; - SetCursor(bview, sel_end_cursor.par(), sel_end_cursor.pos()); - ClearSelection(); - SetSelection(); - SetCursor(bview, tmpcursor.par(), tmpcursor.pos(), true, - tmpcursor.boundary()); + // geometry could have changed, but we keep + // it for user convenience + setCursor(bview, selection.start.par(), selection.start.pos()); + selection.cursor = cursor; + setCursor(bview, selection.end.par(), selection.end.pos()); + setSelection(bview); + setCursor(bview, tmpcursor.par(), tmpcursor.pos(), true, + tmpcursor.boundary()); } -void LyXText::RedoHeightOfParagraph(BufferView * bview, LyXCursor const & cur) +void LyXText::redoHeightOfParagraph(BufferView * bview, LyXCursor const & cur) { Row * tmprow = cur.row(); int y = cur.y() - tmprow->baseline(); - SetHeightOfRow(bview, tmprow); -#ifndef NEW_INSETS - LyXParagraph * first_phys_par = tmprow->par()->FirstPhysicalPar(); -#else - LyXParagraph * first_phys_par = tmprow->par(); -#endif - // find the first row of the paragraph - if (first_phys_par != tmprow->par()) - while (tmprow->previous() - && tmprow->previous()->par() != first_phys_par) { - tmprow = tmprow->previous(); - y -= tmprow->height(); - SetHeightOfRow(bview, tmprow); - } - while (tmprow->previous() && tmprow->previous()->par() == first_phys_par) { + setHeightOfRow(bview, tmprow); + + while (tmprow->previous() + && tmprow->previous()->par() == tmprow->par()) { tmprow = tmprow->previous(); y -= tmprow->height(); - SetHeightOfRow(bview, tmprow); + setHeightOfRow(bview, tmprow); } // we can set the refreshing parameters now - status = LyXText::NEED_MORE_REFRESH; + status(bview, LyXText::NEED_MORE_REFRESH); refresh_y = y; refresh_row = tmprow; - SetCursor(bview, cur.par(), cur.pos(), false, cursor.boundary()); + setCursor(bview, cur.par(), cur.pos(), false, cursor.boundary()); } -void LyXText::RedoDrawingOfParagraph(BufferView * bview, LyXCursor const & cur) +void LyXText::redoDrawingOfParagraph(BufferView * bview, LyXCursor const & cur) { Row * tmprow = cur.row(); int y = cur.y() - tmprow->baseline(); - SetHeightOfRow(bview, tmprow); -#ifndef NEW_INSETS - LyXParagraph * first_phys_par = tmprow->par()->FirstPhysicalPar(); -#else - LyXParagraph * first_phys_par = tmprow->par(); -#endif - // find the first row of the paragraph - if (first_phys_par != tmprow->par()) - while (tmprow->previous() && tmprow->previous()->par() != first_phys_par) { - tmprow = tmprow->previous(); - y -= tmprow->height(); - } - while (tmprow->previous() && tmprow->previous()->par() == first_phys_par) { + setHeightOfRow(bview, tmprow); + + while (tmprow->previous() + && tmprow->previous()->par() == tmprow->par()) { tmprow = tmprow->previous(); y -= tmprow->height(); } - + // we can set the refreshing parameters now - if (status == LyXText::UNCHANGED || y < refresh_y) { + if (status_ == LyXText::UNCHANGED || y < refresh_y) { refresh_y = y; refresh_row = tmprow; } - status = LyXText::NEED_MORE_REFRESH; - SetCursor(bview, cur.par(), cur.pos()); + status(bview, LyXText::NEED_MORE_REFRESH); + setCursor(bview, cur.par(), cur.pos()); } -/* deletes and inserts again all paragaphs between the cursor -* and the specified par -* This function is needed after SetLayout and SetFont etc. */ -void LyXText::RedoParagraphs(BufferView * bview, LyXCursor const & cur, - LyXParagraph const * endpar) const +// deletes and inserts again all paragaphs between the cursor +// and the specified par +// This function is needed after SetLayout and SetFont etc. +void LyXText::redoParagraphs(BufferView * bview, LyXCursor const & cur, + Paragraph const * endpar) const { Row * tmprow2; - LyXParagraph * tmppar = 0, * first_phys_par = 0; + Paragraph * tmppar = 0; + Paragraph * first_phys_par = 0; Row * tmprow = cur.row(); int y = cur.y() - tmprow->baseline(); - - if (!tmprow->previous()){ - first_phys_par = FirstParagraph(); // a trick/hack for UNDO + + if (!tmprow->previous()) { + // a trick/hack for UNDO + // Can somebody please tell me _why_ this solves + // anything. (Lgb) + first_phys_par = firstParagraph(); } else { -#ifndef NEW_INSETS - first_phys_par = tmprow->par()->FirstPhysicalPar(); -#else first_phys_par = tmprow->par(); -#endif - // find the first row of the paragraph - if (first_phys_par != tmprow->par()) - while (tmprow->previous() && - (tmprow->previous()->par() != first_phys_par)) { - tmprow = tmprow->previous(); - y -= tmprow->height(); - } while (tmprow->previous() - && tmprow->previous()->par() == first_phys_par) { + && tmprow->previous()->par() == first_phys_par) + { tmprow = tmprow->previous(); y -= tmprow->height(); } } - + // we can set the refreshing parameters now - status = LyXText::NEED_MORE_REFRESH; + status(bview, LyXText::NEED_MORE_REFRESH); refresh_y = y; refresh_row = tmprow->previous(); /* the real refresh row will - be deleted, so I store - the previous here */ + be deleted, so I store + the previous here */ // remove it if (tmprow->next()) tmppar = tmprow->next()->par(); else tmppar = 0; while (tmppar != endpar) { - RemoveRow(tmprow->next()); - if (tmprow->next()) + removeRow(tmprow->next()); + if (tmprow->next()) { tmppar = tmprow->next()->par(); - else + } else { tmppar = 0; - } + } + } // remove the first one tmprow2 = tmprow; /* this is because tmprow->previous() - can be 0 */ + can be 0 */ tmprow = tmprow->previous(); - RemoveRow(tmprow2); + removeRow(tmprow2); tmppar = first_phys_par; do { if (tmppar) { - InsertParagraph(bview, tmppar, tmprow); - if (!tmprow) + insertParagraph(bview, tmppar, tmprow); + if (!tmprow) { tmprow = firstrow; - while (tmprow->next() && tmprow->next()->par() == tmppar) + } + while (tmprow->next() + && tmprow->next()->par() == tmppar) { tmprow = tmprow->next(); - tmppar = tmppar->Next(); + } + tmppar = tmppar->next(); } - } while (tmppar != endpar); + } while (tmppar && tmppar != endpar); // this is because of layout changes if (refresh_row) { refresh_y -= refresh_row->height(); - SetHeightOfRow(bview, refresh_row); + setHeightOfRow(bview, refresh_row); } else { refresh_row = firstrow; refresh_y = 0; - SetHeightOfRow(bview, refresh_row); + setHeightOfRow(bview, refresh_row); } if (tmprow && tmprow->next()) - SetHeightOfRow(bview, tmprow->next()); + setHeightOfRow(bview, tmprow->next()); } -bool LyXText::FullRebreak(BufferView * bview) +bool LyXText::fullRebreak(BufferView * bview) { if (!firstrow) { init(bview); return true; } if (need_break_row) { - BreakAgain(bview, need_break_row); + breakAgain(bview, need_break_row); need_break_row = 0; return true; } @@ -1107,7 +947,7 @@ bool LyXText::FullRebreak(BufferView * bview) } -/* important for the screen */ +// important for the screen /* the cursor set functions have a special mechanism. When they @@ -1115,20 +955,22 @@ bool LyXText::FullRebreak(BufferView * bview) * They also delete the corresponding row */ // need the selection cursor: -void LyXText::SetSelection() +void LyXText::setSelection(BufferView * bview) { - if (!selection) { - last_sel_cursor = sel_cursor; - sel_start_cursor = sel_cursor; - sel_end_cursor = sel_cursor; + bool const lsel = selection.set(); + + if (!selection.set()) { + last_sel_cursor = selection.cursor; + selection.start = selection.cursor; + selection.end = selection.cursor; } - selection = true; + selection.set(true); // first the toggling area if (cursor.y() < last_sel_cursor.y() || (cursor.y() == last_sel_cursor.y() - && cursor.x() < last_sel_cursor.x())) { + && cursor.x() < last_sel_cursor.x())) { toggle_end_cursor = last_sel_cursor; toggle_cursor = cursor; } else { @@ -1140,140 +982,132 @@ void LyXText::SetSelection() // and now the whole selection - if (sel_cursor.par() == cursor.par()) - if (sel_cursor.pos() < cursor.pos()) { - sel_end_cursor = cursor; - sel_start_cursor = sel_cursor; - } else { - sel_end_cursor = sel_cursor; - sel_start_cursor = cursor; - } - else if (sel_cursor.y() < cursor.y() || - (sel_cursor.y() == cursor.y() && sel_cursor.x() < cursor.x())) { - sel_end_cursor = cursor; - sel_start_cursor = sel_cursor; + if (selection.cursor.par() == cursor.par()) + if (selection.cursor.pos() < cursor.pos()) { + selection.end = cursor; + selection.start = selection.cursor; + } else { + selection.end = selection.cursor; + selection.start = cursor; + } + else if (selection.cursor.y() < cursor.y() || + (selection.cursor.y() == cursor.y() + && selection.cursor.x() < cursor.x())) { + selection.end = cursor; + selection.start = selection.cursor; } else { - sel_end_cursor = sel_cursor; - sel_start_cursor = cursor; + selection.end = selection.cursor; + selection.start = cursor; } // a selection with no contents is not a selection - if (sel_start_cursor.par() == sel_end_cursor.par() && - sel_start_cursor.pos() == sel_end_cursor.pos()) - selection = false; + if (selection.start.par() == selection.end.par() && + selection.start.pos() == selection.end.pos()) + selection.set(false); + + if (inset_owner && (selection.set() || lsel)) + inset_owner->setUpdateStatus(bview, InsetText::SELECTION); } -string const LyXText::selectionAsString(Buffer const * buffer) const +string const LyXText::selectionAsString(Buffer const * buffer, + bool label) const { - if (!selection) return string(); + if (!selection.set()) return string(); string result; // Special handling if the whole selection is within one paragraph - if (sel_start_cursor.par() == sel_end_cursor.par()) { - result += sel_start_cursor.par()->String(buffer, - sel_start_cursor.pos(), - sel_end_cursor.pos()); + if (selection.start.par() == selection.end.par()) { + result += selection.start.par()->asString(buffer, + selection.start.pos(), + selection.end.pos(), + label); return result; } // The selection spans more than one paragraph // First paragraph in selection - result += sel_start_cursor.par()->String(buffer, - sel_start_cursor.pos(), - sel_start_cursor.par()->Last()) + result += selection.start.par()->asString(buffer, + selection.start.pos(), + selection.start.par()->size(), + label) + "\n\n"; // The paragraphs in between (if any) - LyXCursor tmpcur(sel_start_cursor); - tmpcur.par(tmpcur.par()->Next()); - while (tmpcur.par() != sel_end_cursor.par()) { - result += tmpcur.par()->String(buffer, 0, tmpcur.par()->Last()) + "\n\n"; - tmpcur.par(tmpcur.par()->Next()); // Or NextAfterFootnote?? + LyXCursor tmpcur(selection.start); + tmpcur.par(tmpcur.par()->next()); + while (tmpcur.par() != selection.end.par()) { + result += tmpcur.par()->asString(buffer, 0, + tmpcur.par()->size(), + label) + "\n\n"; + tmpcur.par(tmpcur.par()->next()); } // Last paragraph in selection - result += sel_end_cursor.par()->String(buffer, 0, sel_end_cursor.pos()); + result += selection.end.par()->asString(buffer, 0, + selection.end.pos(), label); return result; } -void LyXText::ClearSelection() const +void LyXText::clearSelection() const { - if (selection) - status = LyXText::NEED_MORE_REFRESH; - selection = false; - mark_set = false; + selection.set(false); + selection.mark(false); + last_sel_cursor = selection.end = selection.start = selection.cursor = cursor; } -void LyXText::CursorHome(BufferView * bview) const +void LyXText::cursorHome(BufferView * bview) const { - SetCursor(bview, cursor.par(), cursor.row()->pos()); + setCursor(bview, cursor.par(), cursor.row()->pos()); } -void LyXText::CursorEnd(BufferView * bview) const +void LyXText::cursorEnd(BufferView * bview) const { - if (!cursor.row()->next() || cursor.row()->next()->par() != cursor.row()->par()) - SetCursor(bview, cursor.par(), RowLast(cursor.row()) + 1); - else { - if (cursor.par()->Last() && - (cursor.par()->GetChar(RowLast(cursor.row())) == ' ' - || cursor.par()->IsNewline(RowLast(cursor.row())))) - SetCursor(bview, cursor.par(), RowLast(cursor.row())); - else - SetCursor(bview,cursor.par(), RowLast(cursor.row()) + 1); + if (!cursor.row()->next() + || cursor.row()->next()->par() != cursor.row()->par()) { + setCursor(bview, cursor.par(), rowLast(cursor.row()) + 1); + } else { + if (cursor.par()->size() && + (cursor.par()->getChar(rowLast(cursor.row())) == ' ' + || cursor.par()->isNewline(rowLast(cursor.row())))) { + setCursor(bview, cursor.par(), rowLast(cursor.row())); + } else { + setCursor(bview,cursor.par(), + rowLast(cursor.row()) + 1); + } } } -void LyXText::CursorTop(BufferView * bview) const +void LyXText::cursorTop(BufferView * bview) const { - while (cursor.par()->Previous()) - cursor.par(cursor.par()->Previous()); - SetCursor(bview, cursor.par(), 0); + while (cursor.par()->previous()) + cursor.par(cursor.par()->previous()); + setCursor(bview, cursor.par(), 0); } -void LyXText::CursorBottom(BufferView * bview) const +void LyXText::cursorBottom(BufferView * bview) const { - while (cursor.par()->Next()) - cursor.par(cursor.par()->Next()); - SetCursor(bview, cursor.par(), cursor.par()->Last()); + while (cursor.par()->next()) + cursor.par(cursor.par()->next()); + setCursor(bview, cursor.par(), cursor.par()->size()); } -/* returns a pointer to the row near the specified y-coordinate -* (relative to the whole text). y is set to the real beginning -* of this row */ -Row * LyXText::GetRowNearY(int & y) const -{ - Row * tmprow = firstrow; - int tmpy = 0; - - while (tmprow->next() && tmpy + tmprow->height() <= y) { - tmpy += tmprow->height(); - tmprow = tmprow->next(); - } - - y = tmpy; // return the real y - return tmprow; -} - - -void LyXText::ToggleFree(BufferView * bview, - LyXFont const & font, bool toggleall) +void LyXText::toggleFree(BufferView * bview, + LyXFont const & font, bool toggleall) { // If the mask is completely neutral, tell user if (font == LyXFont(LyXFont::ALL_IGNORE)) { // Could only happen with user style - bview->owner()->getMiniBuffer() - ->Set(_("No font change defined. Use Character under" - " the Layout menu to define font change.")); + bview->owner()->message(_("No font change defined. Use Character under the Layout menu to define font change.")); return; } @@ -1282,131 +1116,67 @@ void LyXText::ToggleFree(BufferView * bview, // is disabled. LyXCursor resetCursor = cursor; bool implicitSelection = (font.language() == ignore_language - && font.number() == LyXFont::IGNORE) - ? SelectWordWhenUnderCursor(bview) : false; + && font.number() == LyXFont::IGNORE) + ? selectWordWhenUnderCursor(bview, WHOLE_WORD_STRICT) : false; // Set font - SetFont(bview, font, toggleall); + setFont(bview, font, toggleall); - /* Implicit selections are cleared afterwards and cursor is set to the - original position. */ + // Implicit selections are cleared afterwards + //and cursor is set to the original position. if (implicitSelection) { - ClearSelection(); + clearSelection(); cursor = resetCursor; - SetCursor(bview, cursor.par(), cursor.pos()); - sel_cursor = cursor; + setCursor(bview, cursor.par(), cursor.pos()); + selection.cursor = cursor; } + if (inset_owner) + inset_owner->setUpdateStatus(bview, InsetText::CURSOR_PAR); } -LyXParagraph::size_type -LyXText::BeginningOfMainBody(Buffer const * buf, - LyXParagraph const * par) const +string LyXText::getStringToIndex(BufferView * bview) { - if (textclasslist.Style(buf->params.textclass, - par->GetLayout()).labeltype != LABEL_MANUAL) - return 0; - else - return par->BeginningOfMainBody(); -} + string idxstring; + + // Try implicit word selection + // If there is a change in the language the implicit word selection + // is disabled. + LyXCursor resetCursor = cursor; + bool implicitSelection = selectWordWhenUnderCursor(bview, PREVIOUS_WORD); + if (!selection.set()) { + bview->owner()->message(_("Nothing to index!")); + return string(); + } + if (selection.start.par() != selection.end.par()) { + bview->owner()->message(_("Cannot index more than one paragraph!")); + return string(); + } -#ifndef NEW_INSETS -/* if there is a selection, reset every environment you can find -* in the selection, otherwise just the environment you are in */ -void LyXText::MeltFootnoteEnvironment(BufferView * bview) -{ - LyXParagraph * tmppar, * firsttmppar; - - ClearSelection(); - - /* is is only allowed, if the cursor is IN an open footnote. - * Otherwise it is too dangerous */ - if (cursor.par()->footnoteflag != LyXParagraph::OPEN_FOOTNOTE) - return; - - SetUndo(bview->buffer(), Undo::FINISH, - cursor.par()->PreviousBeforeFootnote()->previous, - cursor.par()->NextAfterFootnote()->next); + idxstring = selectionAsString(bview->buffer(), false); + + // Implicit selections are cleared afterwards + //and cursor is set to the original position. + if (implicitSelection) { + clearSelection(); + cursor = resetCursor; + setCursor(bview, cursor.par(), cursor.pos()); + selection.cursor = cursor; + } + return idxstring; +} - /* ok, move to the beginning of the footnote. */ - while (cursor.par()->footnoteflag == LyXParagraph::OPEN_FOOTNOTE) - cursor.par(cursor.par()->Previous()); - - SetCursor(bview, cursor.par(), cursor.par()->Last()); - /* this is just faster than using CursorLeft(); */ - - firsttmppar = cursor.par()->ParFromPos(cursor.pos()); - tmppar = firsttmppar; - /* tmppar is now the paragraph right before the footnote */ - bool first_footnote_par_is_not_empty = tmppar->next->size(); - - while (tmppar->next - && tmppar->next->footnoteflag == LyXParagraph::OPEN_FOOTNOTE) { - tmppar = tmppar->next; /* I use next instead of Next(), - * because there cannot be any - * footnotes in a footnote - * environment */ - tmppar->footnoteflag = LyXParagraph::NO_FOOTNOTE; - - /* remember the captions and empty paragraphs */ - if ((textclasslist.Style(bview->buffer()->params.textclass, - tmppar->GetLayout()) - .labeltype == LABEL_SENSITIVE) - || !tmppar->Last()) - tmppar->SetLayout(bview->buffer()->params, 0); - } - - // now we will paste the ex-footnote, if the layouts allow it - // first restore the layout of the paragraph right behind - // the footnote - if (tmppar->next) - tmppar->next->MakeSameLayout(cursor.par()); - - // first the end - if (!tmppar->GetLayout() - || (tmppar->Next() - && (!tmppar->Next()->Last() - || tmppar->Next()->HasSameLayout(tmppar)))) { - if (tmppar->Next()->Last() - && tmppar->Next()->IsLineSeparator(0)) - tmppar->Next()->Erase(0); - tmppar->PasteParagraph(bview->buffer()->params); - } - - tmppar = tmppar->Next(); /* make sure tmppar cannot be touched - * by the pasting of the beginning */ - - /* then the beginning */ - /* if there is no space between the text and the footnote, so we insert - * a blank - * (only if the previous par and the footnotepar are not empty!) */ - if (!firsttmppar->next->GetLayout() - || firsttmppar->HasSameLayout(firsttmppar->next)) { - if (firsttmppar->size() - && !firsttmppar->IsSeparator(firsttmppar->size() - 1) - && first_footnote_par_is_not_empty) { - firsttmppar->next->InsertChar(0, ' '); - } - firsttmppar->PasteParagraph(bview->buffer()->params); - } - - /* now redo the paragaphs */ - RedoParagraphs(bview, cursor, tmppar); - - SetCursor(bview, cursor.par(), cursor.pos()); - - /* sometimes it can happen, that there is a counter change */ - Row * row = cursor.row(); - while (row->next() && row->par() != tmppar && row->next()->par() != tmppar) - row = row->next(); - UpdateCounters(bview, row); - - - ClearSelection(); +pos_type LyXText::beginningOfMainBody(Buffer const * buf, + Paragraph const * par) const +{ + if (textclasslist.Style(buf->params.textclass, + par->getLayout()).labeltype != LABEL_MANUAL) + return 0; + else + return par->beginningOfMainBody(); } -#endif /* the DTP switches for paragraphs. LyX will store them in the @@ -1415,198 +1185,83 @@ void LyXText::MeltFootnoteEnvironment(BufferView * bview) * they do not duplicate themself and you cannnot make dirty things with * them! */ -void LyXText::SetParagraph(BufferView * bview, +void LyXText::setParagraph(BufferView * bview, bool line_top, bool line_bottom, bool pagebreak_top, bool pagebreak_bottom, VSpace const & space_top, VSpace const & space_bottom, + Spacing const & spacing, LyXAlignment align, string labelwidthstring, bool noindent) { LyXCursor tmpcursor = cursor; - if (!selection) { - sel_start_cursor = cursor; - sel_end_cursor = cursor; + if (!selection.set()) { + selection.start = cursor; + selection.end = cursor; } // make sure that the depth behind the selection are restored, too -#ifndef NEW_INSETS - LyXParagraph * endpar = sel_end_cursor.par()->LastPhysicalPar()->Next(); -#else - LyXParagraph * endpar = sel_end_cursor.par()->Next(); -#endif - LyXParagraph * undoendpar = endpar; + Paragraph * endpar = selection.end.par()->next(); + Paragraph * undoendpar = endpar; - if (endpar && endpar->GetDepth()) { - while (endpar && endpar->GetDepth()) { -#ifndef NEW_INSETS - endpar = endpar->LastPhysicalPar()->Next(); -#else - endpar = endpar->Next(); -#endif + if (endpar && endpar->getDepth()) { + while (endpar && endpar->getDepth()) { + endpar = endpar->next(); undoendpar = endpar; } } else if (endpar) { - endpar = endpar->Next(); // because of parindents etc. + // because of parindents etc. + endpar = endpar->next(); } - SetUndo(bview->buffer(), Undo::EDIT, -#ifndef NEW_INSETS - sel_start_cursor - .par()->ParFromPos(sel_start_cursor.pos())->previous, -#else - sel_start_cursor.par()->previous, -#endif - undoendpar); + setUndo(bview, Undo::EDIT, selection.start.par(), undoendpar); - LyXParagraph * tmppar = sel_end_cursor.par(); -#ifndef NEW_INSETS - while (tmppar != sel_start_cursor.par()->FirstPhysicalPar()->Previous()) { - SetCursor(bview, tmppar->FirstPhysicalPar(), 0); -#else - while (tmppar != sel_start_cursor.par()->Previous()) { - SetCursor(bview, tmppar, 0); -#endif - status = LyXText::NEED_MORE_REFRESH; + Paragraph * tmppar = selection.end.par(); + while (tmppar != selection.start.par()->previous()) { + setCursor(bview, tmppar, 0); + status(bview, LyXText::NEED_MORE_REFRESH); refresh_row = cursor.row(); refresh_y = cursor.y() - cursor.row()->baseline(); -#ifndef NEW_INSETS - if (cursor.par()->footnoteflag == - sel_start_cursor.par()->footnoteflag) { -#endif - cursor.par()->line_top = line_top; - cursor.par()->line_bottom = line_bottom; - cursor.par()->pagebreak_top = pagebreak_top; - cursor.par()->pagebreak_bottom = pagebreak_bottom; - cursor.par()->added_space_top = space_top; - cursor.par()->added_space_bottom = space_bottom; - // does the layout allow the new alignment? - if (align == LYX_ALIGN_LAYOUT) - align = textclasslist - .Style(bview->buffer()->params.textclass, - cursor.par()->GetLayout()).align; - if (align & textclasslist + cursor.par()->params().lineTop(line_top); + cursor.par()->params().lineBottom(line_bottom); + cursor.par()->params().pagebreakTop(pagebreak_top); + cursor.par()->params().pagebreakBottom(pagebreak_bottom); + cursor.par()->params().spaceTop(space_top); + cursor.par()->params().spaceBottom(space_bottom); + cursor.par()->params().spacing(spacing); + // does the layout allow the new alignment? + if (align == LYX_ALIGN_LAYOUT) + align = textclasslist + .Style(bview->buffer()->params.textclass, + cursor.par()->getLayout()).align; + if (align & textclasslist + .Style(bview->buffer()->params.textclass, + cursor.par()->getLayout()).alignpossible) { + if (align == textclasslist .Style(bview->buffer()->params.textclass, - cursor.par()->GetLayout()).alignpossible) { - if (align == textclasslist - .Style(bview->buffer()->params.textclass, - cursor.par()->GetLayout()).align) - cursor.par()->align = LYX_ALIGN_LAYOUT; - else - cursor.par()->align = align; - } - cursor.par()->SetLabelWidthString(labelwidthstring); - cursor.par()->noindent = noindent; -#ifndef NEW_INSETS + cursor.par()->getLayout()).align) + cursor.par()->params().align(LYX_ALIGN_LAYOUT); + else + cursor.par()->params().align(align); } - - tmppar = cursor.par()->FirstPhysicalPar()->Previous(); -#else - tmppar = cursor.par()->Previous(); -#endif + cursor.par()->setLabelWidthString(labelwidthstring); + cursor.par()->params().noindent(noindent); + tmppar = cursor.par()->previous(); } - RedoParagraphs(bview, sel_start_cursor, endpar); + redoParagraphs(bview, selection.start, endpar); - ClearSelection(); - SetCursor(bview, sel_start_cursor.par(), sel_start_cursor.pos()); - sel_cursor = cursor; - SetCursor(bview, sel_end_cursor.par(), sel_end_cursor.pos()); - SetSelection(); - SetCursor(bview, tmpcursor.par(), tmpcursor.pos()); + clearSelection(); + setCursor(bview, selection.start.par(), selection.start.pos()); + selection.cursor = cursor; + setCursor(bview, selection.end.par(), selection.end.pos()); + setSelection(bview); + setCursor(bview, tmpcursor.par(), tmpcursor.pos()); if (inset_owner) - bview->updateInset(inset_owner, true); -} - - -void LyXText::SetParagraphExtraOpt(BufferView * bview, int type, - string const & width, - string const & widthp, - int alignment, bool hfill, - bool start_minipage) -{ - LyXCursor tmpcursor = cursor; - LyXParagraph * tmppar; - if (!selection) { - sel_start_cursor = cursor; - sel_end_cursor = cursor; - } - - // make sure that the depth behind the selection are restored, too -#ifndef NEW_INSETS - LyXParagraph * endpar = sel_end_cursor.par()->LastPhysicalPar()->Next(); -#else - LyXParagraph * endpar = sel_end_cursor.par()->Next(); -#endif - LyXParagraph * undoendpar = endpar; - - if (endpar && endpar->GetDepth()) { - while (endpar && endpar->GetDepth()) { -#ifndef NEW_INSETS - endpar = endpar->LastPhysicalPar()->Next(); -#else - endpar = endpar->Next(); -#endif - undoendpar = endpar; - } - } - else if (endpar) { - endpar = endpar->Next(); // because of parindents etc. - } - - SetUndo(bview->buffer(), Undo::EDIT, -#ifndef NEW_INSETS - sel_start_cursor - .par()->ParFromPos(sel_start_cursor.pos())->previous, -#else - sel_start_cursor.par()->previous, -#endif - undoendpar); - - tmppar = sel_end_cursor.par(); -#ifndef NEW_INSETS - while(tmppar != sel_start_cursor.par()->FirstPhysicalPar()->Previous()) { - SetCursor(bview, tmppar->FirstPhysicalPar(), 0); -#else - while(tmppar != sel_start_cursor.par()->Previous()) { - SetCursor(bview, tmppar, 0); -#endif - status = LyXText::NEED_MORE_REFRESH; - refresh_row = cursor.row(); - refresh_y = cursor.y() - cursor.row()->baseline(); -#ifndef NEW_INSETS - if (cursor.par()->footnoteflag == - sel_start_cursor.par()->footnoteflag) { -#endif - if (type == LyXParagraph::PEXTRA_NONE) { - if (cursor.par()->pextra_type != LyXParagraph::PEXTRA_NONE) { - cursor.par()->UnsetPExtraType(bview->buffer()->params); - cursor.par()->pextra_type = LyXParagraph::PEXTRA_NONE; - } - } else { - cursor.par()->SetPExtraType(bview->buffer()->params, - type, width, widthp); - cursor.par()->pextra_hfill = hfill; - cursor.par()->pextra_start_minipage = start_minipage; - cursor.par()->pextra_alignment = alignment; - } -#ifndef NEW_INSETS - } - tmppar = cursor.par()->FirstPhysicalPar()->Previous(); -#else - tmppar = cursor.par()->Previous(); -#endif - } - RedoParagraphs(bview, sel_start_cursor, endpar); - ClearSelection(); - SetCursor(bview, sel_start_cursor.par(), sel_start_cursor.pos()); - sel_cursor = cursor; - SetCursor(bview, sel_end_cursor.par(), sel_end_cursor.pos()); - SetSelection(); - SetCursor(bview, tmpcursor.par(), tmpcursor.pos()); + bview->updateInset(inset_owner, true); } @@ -1619,7 +1274,9 @@ char loweralphaCounter(int n) } -static inline +namespace { + +inline char alphaCounter(int n) { if (n < 1 || n > 26) @@ -1629,7 +1286,7 @@ char alphaCounter(int n) } -static inline +inline char hebrewCounter(int n) { static const char hebrew[22] = { @@ -1644,7 +1301,7 @@ char hebrewCounter(int n) } -static inline +inline string const romanCounter(int n) { static char const * roman[20] = { @@ -1659,86 +1316,43 @@ string const romanCounter(int n) return roman[n-1]; } +} // namespace anon + // set the counter of a paragraph. This includes the labels -void LyXText::SetCounter(Buffer const * buf, LyXParagraph * par) const +void LyXText::setCounter(Buffer const * buf, Paragraph * par) const { -#ifndef NEW_INSETS - // this is only relevant for the beginning of paragraph - par = par->FirstPhysicalPar(); -#endif LyXLayout const & layout = textclasslist.Style(buf->params.textclass, - par->GetLayout()); + par->getLayout()); LyXTextClass const & textclass = textclasslist.TextClass(buf->params.textclass); - /* copy the prev-counters to this one, unless this is the start of a - footnote or of a bibliography or the very first paragraph */ - if (par->Previous() -#ifndef NEW_INSETS - && !(par->Previous()->footnoteflag == LyXParagraph::NO_FOOTNOTE - && par->footnoteflag == LyXParagraph::OPEN_FOOTNOTE - && par->footnotekind == LyXParagraph::FOOTNOTE) -#endif - && !(textclasslist.Style(buf->params.textclass, - par->Previous()->GetLayout() - ).labeltype != LABEL_BIBLIO - && layout.labeltype == LABEL_BIBLIO)) { + // copy the prev-counters to this one, + // unless this is the first paragraph + if (par->previous()) { for (int i = 0; i < 10; ++i) { - par->setCounter(i, par->Previous()->GetFirstCounter(i)); + par->setCounter(i, par->previous()->getFirstCounter(i)); } -#ifndef NEW_INSETS - par->appendix = par->Previous()->FirstPhysicalPar()->appendix; -#else - par->appendix = par->Previous()->appendix; -#endif - if (!par->appendix && par->start_of_appendix){ - par->appendix = true; - for (int i = 0; i < 10; ++i) { - par->setCounter(i, 0); - } + par->params().appendix(par->previous()->params().appendix()); + if (!par->params().appendix() && par->params().startOfAppendix()) { + par->params().appendix(true); + for (int i = 0; i < 10; ++i) { + par->setCounter(i, 0); + } } -#ifndef NEW_INSETS - par->enumdepth = par->Previous()->FirstPhysicalPar()->enumdepth; - par->itemdepth = par->Previous()->FirstPhysicalPar()->itemdepth; -#else - par->enumdepth = par->Previous()->enumdepth; - par->itemdepth = par->Previous()->itemdepth; -#endif + par->enumdepth = par->previous()->enumdepth; + par->itemdepth = par->previous()->itemdepth; } else { for (int i = 0; i < 10; ++i) { par->setCounter(i, 0); } - par->appendix = par->start_of_appendix; + par->params().appendix(par->params().startOfAppendix()); par->enumdepth = 0; par->itemdepth = 0; } -#ifndef NEW_INSETS - // if this is an open marginnote and this is the first - // entry in the marginnote and the enclosing - // environment is an enum/item then correct for the - // LaTeX behaviour (ARRae) - if(par->footnoteflag == LyXParagraph::OPEN_FOOTNOTE - && par->footnotekind == LyXParagraph::MARGIN - && par->Previous() - && par->Previous()->footnoteflag != LyXParagraph::OPEN_FOOTNOTE - && (par->PreviousBeforeFootnote() - && textclasslist.Style(buf->params.textclass, - par->PreviousBeforeFootnote()->GetLayout() - ).labeltype >= LABEL_COUNTER_ENUMI)) { - // Any itemize or enumerate environment in a marginnote - // that is embedded in an itemize or enumerate - // paragraph is seen by LaTeX as being at a deeper - // level within that enclosing itemization/enumeration - // even if there is a "standard" layout at the start of - // the marginnote. - par->enumdepth++; - par->itemdepth++; - } -#endif /* Maybe we have to increment the enumeration depth. * BUT, enumeration in a footnote is considered in isolation from its * surrounding paragraph so don't increment if this is the @@ -1746,33 +1360,23 @@ void LyXText::SetCounter(Buffer const * buf, LyXParagraph * par) const * AND, bibliographies can't have their depth changed ie. they * are always of depth 0 */ - if (par->Previous() - && par->Previous()->GetDepth() < par->GetDepth() + if (par->previous() + && par->previous()->getDepth() < par->getDepth() && textclasslist.Style(buf->params.textclass, - par->Previous()->GetLayout() - ).labeltype == LABEL_COUNTER_ENUMI + par->previous()->getLayout() + ).labeltype == LABEL_COUNTER_ENUMI && par->enumdepth < 3 -#ifndef NEW_INSETS - && !(par->Previous()->footnoteflag == LyXParagraph::NO_FOOTNOTE - && par->footnoteflag == LyXParagraph::OPEN_FOOTNOTE - && par->footnotekind == LyXParagraph::FOOTNOTE) -#endif && layout.labeltype != LABEL_BIBLIO) { par->enumdepth++; } - /* Maybe we have to decrement the enumeration depth, see note above */ - if (par->Previous() - && par->Previous()->GetDepth() > par->GetDepth() -#ifndef NEW_INSETS - && !(par->Previous()->footnoteflag == LyXParagraph::NO_FOOTNOTE - && par->footnoteflag == LyXParagraph::OPEN_FOOTNOTE - && par->footnotekind == LyXParagraph::FOOTNOTE) -#endif + // Maybe we have to decrement the enumeration depth, see note above + if (par->previous() + && par->previous()->getDepth() > par->getDepth() && layout.labeltype != LABEL_BIBLIO) { - par->enumdepth = par->DepthHook(par->GetDepth())->enumdepth; + par->enumdepth = par->depthHook(par->getDepth())->enumdepth; par->setCounter(6 + par->enumdepth, - par->DepthHook(par->GetDepth())->getCounter(6 + par->enumdepth)); + par->depthHook(par->getDepth())->getCounter(6 + par->enumdepth)); /* reset the counters. * A depth change is like a breaking layout */ @@ -1780,19 +1384,19 @@ void LyXText::SetCounter(Buffer const * buf, LyXParagraph * par) const par->setCounter(i, 0); } - if (!par->labelstring.empty()) { - par->labelstring.erase(); + if (!par->params().labelString().empty()) { + par->params().labelString(string()); } if (layout.margintype == MARGIN_MANUAL) { - if (par->labelwidthstring.empty()) { - par->SetLabelWidthString(layout.labelstring()); + if (par->params().labelWidthString().empty()) { + par->setLabelWidthString(layout.labelstring()); } } else { - par->SetLabelWidthString(string()); + par->setLabelWidthString(string()); } - /* is it a layout that has an automatic label ? */ + // is it a layout that has an automatic label? if (layout.labeltype >= LABEL_COUNTER_CHAPTER) { int i = layout.labeltype - LABEL_COUNTER_CHAPTER; @@ -1800,21 +1404,21 @@ void LyXText::SetCounter(Buffer const * buf, LyXParagraph * par) const par->incCounter(i); // increment the counter // Is there a label? Useful for Chapter layout - if (!par->appendix){ + if (!par->params().appendix()) { if (!layout.labelstring().empty()) - par->labelstring = layout.labelstring(); + par->params().labelString(layout.labelstring()); else - par->labelstring.erase(); + par->params().labelString(string()); } else { if (!layout.labelstring_appendix().empty()) - par->labelstring = layout.labelstring_appendix(); + par->params().labelString(layout.labelstring_appendix()); else - par->labelstring.erase(); + par->params().labelString(string()); } - std::ostringstream s; + ostringstream s; - if (!par->appendix) { + if (!par->params().appendix()) { switch (2 * LABEL_COUNTER_CHAPTER - textclass.maxcounter() + i) { case LABEL_COUNTER_CHAPTER: @@ -1822,7 +1426,7 @@ void LyXText::SetCounter(Buffer const * buf, LyXParagraph * par) const break; case LABEL_COUNTER_SECTION: s << par->getCounter(i - 1) << '.' - << par->getCounter(i); + << par->getCounter(i); break; case LABEL_COUNTER_SUBSECTION: s << par->getCounter(i - 2) << '.' @@ -1937,7 +1541,7 @@ void LyXText::SetCounter(Buffer const * buf, LyXParagraph * par) const } } - par->labelstring += s.str().c_str(); + par->params().labelString(par->params().labelString() +s.str().c_str()); // We really want to remove the c_str as soon as // possible... @@ -1954,7 +1558,7 @@ void LyXText::SetCounter(Buffer const * buf, LyXParagraph * par) const par->incCounter(i + par->enumdepth); int number = par->getCounter(i + par->enumdepth); - std::ostringstream s; + ostringstream s; switch (par->enumdepth) { case 1: @@ -1989,12 +1593,13 @@ void LyXText::SetCounter(Buffer const * buf, LyXParagraph * par) const break; } - par->labelstring = s.str().c_str(); - // we really want to get rid of that c_str() + par->params().labelString(s.str().c_str()); - for (i += par->enumdepth + 1; i < 10; ++i) - par->setCounter(i, 0); /* reset the following counters */ - + for (i += par->enumdepth + 1; i < 10; ++i) { + // reset the following counters + par->setCounter(i, 0); + } + } } else if (layout.labeltype == LABEL_BIBLIO) {// ale970302 int i = LABEL_COUNTER_ENUMI - LABEL_COUNTER_CHAPTER + par->enumdepth; @@ -2005,7 +1610,7 @@ void LyXText::SetCounter(Buffer const * buf, LyXParagraph * par) const par->bibkey = new InsetBibKey(p); } par->bibkey->setCounter(number); - par->labelstring = layout.labelstring(); + par->params().labelString(layout.labelstring()); // In biblio should't be following counters but... } else { @@ -2013,31 +1618,15 @@ void LyXText::SetCounter(Buffer const * buf, LyXParagraph * par) const // the caption hack: if (layout.labeltype == LABEL_SENSITIVE) { - bool isOK (par->InInset() && par->InInset()->owner() && - (par->InInset()->owner()->LyxCode() == Inset::FLOAT_CODE)); -#ifndef NEW_INSETS - if (par->footnoteflag != LyXParagraph::NO_FOOTNOTE - && (par->footnotekind == LyXParagraph::FIG - || par->footnotekind == LyXParagraph::WIDE_FIG)) { - s = (par->getParLanguage(buf->params)->lang() == "hebrew") - ? ":øåéà" : "Figure:"; - } else if (par->footnoteflag != LyXParagraph::NO_FOOTNOTE - && (par->footnotekind == LyXParagraph::TAB - || par->footnotekind == LyXParagraph::WIDE_TAB)) { - s = (par->getParLanguage(buf->params)->lang() == "hebrew") - ? ":äìáè" : "Table:"; - } else if (par->footnoteflag != LyXParagraph::NO_FOOTNOTE - && par->footnotekind == LyXParagraph::ALGORITHM) { - s = (par->getParLanguage(buf->params)->lang() == "hebrew") - ? ":íúéøåâìà" : "Algorithm:"; - } else -#endif + bool isOK (par->inInset() && par->inInset()->owner() && + (par->inInset()->owner()->lyxCode() == Inset::FLOAT_CODE)); + if (isOK) { - InsetFloat * tmp = static_cast(par->InInset()->owner()); + InsetFloat * tmp = static_cast(par->inInset()->owner()); Floating const & fl = floatList.getType(tmp->type()); // We should get the correct number here too. - s = fl.name + " #:"; + s = fl.name() + " #:"; } else { /* par->SetLayout(0); s = layout->labelstring; */ @@ -2045,7 +1634,7 @@ void LyXText::SetCounter(Buffer const * buf, LyXParagraph * par) const ? " :úåòîùî øñç" : "Senseless: "; } } - par->labelstring = s; + par->params().labelString(s); /* reset the enumeration counter. They are always resetted * when there is any other layout between */ @@ -2055,106 +1644,59 @@ void LyXText::SetCounter(Buffer const * buf, LyXParagraph * par) const } -/* Updates all counters BEHIND the row. Changed paragraphs -* with a dynamic left margin will be rebroken. */ -void LyXText::UpdateCounters(BufferView * bview, Row * row) const +// Updates all counters BEHIND the row. Changed paragraphs +// with a dynamic left margin will be rebroken. +void LyXText::updateCounters(BufferView * bview, Row * row) const { - LyXParagraph * par; + Paragraph * par; + if (!row) { row = firstrow; par = row->par(); } else { - if (row->par()->next -#ifndef NEW_INSETS - && row->par()->next->footnoteflag != LyXParagraph::OPEN_FOOTNOTE -#endif - ) { -#ifndef NEW_INSETS - par = row->par()->LastPhysicalPar()->Next(); -#else - par = row->par()->Next(); -#endif - } else { - par = row->par()->next; - } + par = row->par()->next(); } while (par) { while (row->par() != par) row = row->next(); - SetCounter(bview->buffer(), par); + setCounter(bview->buffer(), par); - /* now check for the headline layouts. remember that they - * have a dynamic left margin */ - if ( -#ifndef NEW_INSETS - !par->IsDummy() && -#endif - ( textclasslist.Style(bview->buffer()->params.textclass, - par->layout).margintype == MARGIN_DYNAMIC - || textclasslist.Style(bview->buffer()->params.textclass, - par->layout).labeltype == LABEL_SENSITIVE) - ) { - - /* Rebreak the paragraph */ - RemoveParagraph(row); - AppendParagraph(bview, row); - -#ifndef NEW_INSETS - /* think about the damned open footnotes! */ - while (par->Next() && - (par->Next()->footnoteflag == LyXParagraph::OPEN_FOOTNOTE - || par->Next()->IsDummy())){ - par = par->Next(); - if (par->IsDummy()) { - while (row->par() != par) - row = row->next(); - RemoveParagraph(row); - AppendParagraph(bview, row); - } - } -#endif + // now check for the headline layouts. remember that they + // have a dynamic left margin + if ((textclasslist.Style(bview->buffer()->params.textclass, + par->layout).margintype == MARGIN_DYNAMIC + || textclasslist.Style(bview->buffer()->params.textclass, + par->layout).labeltype == LABEL_SENSITIVE)) { + + // Rebreak the paragraph + removeParagraph(row); + appendParagraph(bview, row); } -#ifndef NEW_INSETS - par = par->LastPhysicalPar()->Next(); -#else - par = par->Next(); -#endif - + par = par->next(); } } -/* insets an inset. */ -void LyXText::InsertInset(BufferView * bview, Inset * inset) +void LyXText::insertInset(BufferView * bview, Inset * inset) { - if (!cursor.par()->InsertInsetAllowed(inset)) + if (!cursor.par()->insetAllowed(inset->lyxCode())) return; - SetUndo(bview->buffer(), Undo::INSERT, -#ifndef NEW_INSETS - cursor.par()->ParFromPos(cursor.pos())->previous, - cursor.par()->ParFromPos(cursor.pos())->next -#else - cursor.par()->previous, - cursor.par()->next -#endif - ); - cursor.par()->InsertInset(cursor.pos(), inset); - InsertChar(bview, LyXParagraph::META_INSET); /* just to rebreak and refresh correctly. - * The character will not be inserted a - * second time */ + setUndo(bview, Undo::INSERT, + cursor.par(), cursor.par()->next()); + cursor.par()->insertInset(cursor.pos(), inset); + // Just to rebreak and refresh correctly. + // The character will not be inserted a second time + insertChar(bview, Paragraph::META_INSET); #if 1 - // if we enter a text-inset the cursor should be to the left side - // of it! This couldn't happen before as Undo was not handled inside + // If we enter a highly editable inset the cursor should be to before + // the inset. This couldn't happen before as Undo was not handled inside // inset now after the Undo LyX tries to call inset->Edit(...) again // and cannot do this as the cursor is behind the inset and GetInset // does not return the inset! - if (inset->IsTextInset()) { - if (cursor.par()->isRightToLeftPar(bview->buffer()->params)) - CursorRight(bview); - else - CursorLeft(bview); + if (isHighlyEditableInset(inset)) { + cursorLeft(bview, true); } #endif } @@ -2162,17 +1704,17 @@ void LyXText::InsertInset(BufferView * bview, Inset * inset) void LyXText::copyEnvironmentType() { - copylayouttype = cursor.par()->GetLayout(); + copylayouttype = cursor.par()->getLayout(); } void LyXText::pasteEnvironmentType(BufferView * bview) { - SetLayout(bview, copylayouttype); + setLayout(bview, copylayouttype); } -void LyXText::CutSelection(BufferView * bview, bool doclear) +void LyXText::cutSelection(BufferView * bview, bool doclear, bool realcut) { // Stuff what we got on the clipboard. Even if there is no selection. @@ -2182,108 +1724,76 @@ void LyXText::CutSelection(BufferView * bview, bool doclear) // finished. The solution used currently just works, to make it // faster we need to be more clever and probably also have more // calls to stuffClipboard. (Lgb) - bview->stuffClipboard(selectionAsString(bview->buffer())); + bview->stuffClipboard(selectionAsString(bview->buffer(), true)); // This doesn't make sense, if there is no selection - if (!selection) + if (!selection.set()) return; - // OK, we have a selection. This is always between sel_start_cursor - // and sel_end cursor -#ifndef NEW_INSETS - // Check whether there are half footnotes in the selection - if (sel_start_cursor.par()->footnoteflag != LyXParagraph::NO_FOOTNOTE - || sel_end_cursor.par()->footnoteflag != LyXParagraph::NO_FOOTNOTE) { - LyXParagraph * tmppar = sel_start_cursor.par(); - while (tmppar != sel_end_cursor.par()){ - if (tmppar->footnoteflag != sel_end_cursor.par()->footnoteflag) { - WriteAlert(_("Impossible operation"), - _("Don't know what to do with half floats."), - _("sorry.")); - return; - } - tmppar = tmppar->Next(); - } - } -#endif + // OK, we have a selection. This is always between selection.start + // and selection.end // make sure that the depth behind the selection are restored, too -#ifndef NEW_INSETS - LyXParagraph * endpar = sel_end_cursor.par()->LastPhysicalPar()->Next(); -#else - LyXParagraph * endpar = sel_end_cursor.par()->Next(); -#endif - LyXParagraph * undoendpar = endpar; + Paragraph * endpar = selection.end.par()->next(); + Paragraph * undoendpar = endpar; - if (endpar && endpar->GetDepth()) { - while (endpar && endpar->GetDepth()) { -#ifndef NEW_INSETS - endpar = endpar->LastPhysicalPar()->Next(); -#else - endpar = endpar->Next(); -#endif + if (endpar && endpar->getDepth()) { + while (endpar && endpar->getDepth()) { + endpar = endpar->next(); undoendpar = endpar; } } else if (endpar) { - endpar = endpar->Next(); // because of parindents etc. + endpar = endpar->next(); // because of parindents etc. } - SetUndo(bview->buffer(), Undo::DELETE, -#ifndef NEW_INSETS - sel_start_cursor - .par()->ParFromPos(sel_start_cursor.pos())->previous, -#else - sel_start_cursor.par()->previous, -#endif - undoendpar); + setUndo(bview, Undo::DELETE, + selection.start.par(), undoendpar); - CutAndPaste cap; - // there are two cases: cut only within one paragraph or // more than one paragraph -#ifndef NEW_INSETS - if (sel_start_cursor.par()->ParFromPos(sel_start_cursor.pos()) - == sel_end_cursor.par()->ParFromPos(sel_end_cursor.pos())) -#else - if (sel_start_cursor.par() == sel_end_cursor.par()) -#endif - { + if (selection.start.par() == selection.end.par()) { // only within one paragraph - endpar = sel_start_cursor.par(); - int pos = sel_end_cursor.pos(); - cap.cutSelection(sel_start_cursor.par(), &endpar, - sel_start_cursor.pos(), pos, - bview->buffer()->params.textclass, doclear); - sel_end_cursor.pos(pos); + endpar = selection.end.par(); + int pos = selection.end.pos(); + CutAndPaste::cutSelection(selection.start.par(), &endpar, + selection.start.pos(), pos, + bview->buffer()->params.textclass, + doclear, realcut); + selection.end.pos(pos); } else { - endpar = sel_end_cursor.par(); - - int pos = sel_end_cursor.pos(); - cap.cutSelection(sel_start_cursor.par(), &endpar, - sel_start_cursor.pos(), pos, - bview->buffer()->params.textclass, doclear); + endpar = selection.end.par(); + int pos = selection.end.pos(); + CutAndPaste::cutSelection(selection.start.par(), &endpar, + selection.start.pos(), pos, + bview->buffer()->params.textclass, + doclear, realcut); cursor.par(endpar); - sel_end_cursor.par(endpar); - sel_end_cursor.pos(pos); - cursor.pos(sel_end_cursor.pos()); + selection.end.par(endpar); + selection.end.pos(pos); + cursor.pos(selection.end.pos()); } - endpar = endpar->Next(); + endpar = endpar->next(); // sometimes necessary if (doclear) - sel_start_cursor.par()->StripLeadingSpaces(bview->buffer()->params.textclass); + selection.start.par()->stripLeadingSpaces(bview->buffer()->params.textclass); - RedoParagraphs(bview, sel_start_cursor, endpar); - - ClearSelection(); - cursor = sel_start_cursor; - SetCursor(bview, cursor.par(), cursor.pos()); - sel_cursor = cursor; - UpdateCounters(bview, cursor.row()); + redoParagraphs(bview, selection.start, endpar); + + // cutSelection can invalidate the cursor so we need to set + // it anew. (Lgb) + cursor = selection.start; + + // need a valid cursor. (Lgb) + clearSelection(); + + setCursor(bview, cursor.par(), cursor.pos()); + selection.cursor = cursor; + updateCounters(bview, cursor.row()); } -void LyXText::CopySelection(BufferView * bview) +void LyXText::copySelection(BufferView * bview) { // Stuff what we got on the clipboard. Even if there is no selection. @@ -2293,531 +1803,326 @@ void LyXText::CopySelection(BufferView * bview) // finished. The solution used currently just works, to make it // faster we need to be more clever and probably also have more // calls to stuffClipboard. (Lgb) - bview->stuffClipboard(selectionAsString(bview->buffer())); + bview->stuffClipboard(selectionAsString(bview->buffer(), true)); // this doesnt make sense, if there is no selection - if (!selection) + if (!selection.set()) return; - // ok we have a selection. This is always between sel_start_cursor - // and sel_end cursor - -#ifndef NEW_INSETS - /* check wether there are half footnotes in the selection */ - if (sel_start_cursor.par()->footnoteflag != LyXParagraph::NO_FOOTNOTE - || sel_end_cursor.par()->footnoteflag != LyXParagraph::NO_FOOTNOTE) { - LyXParagraph * tmppar = sel_start_cursor.par(); - while (tmppar != sel_end_cursor.par()) { - if (tmppar->footnoteflag != - sel_end_cursor.par()->footnoteflag) { - WriteAlert(_("Impossible operation"), - _("Don't know what to do" - " with half floats."), - _("sorry.")); - return; - } - tmppar = tmppar->Next(); - } - } -#endif - - // copy behind a space if there is one - while (sel_start_cursor.par()->Last() > sel_start_cursor.pos() - && sel_start_cursor.par()->IsLineSeparator(sel_start_cursor.pos()) - && (sel_start_cursor.par() != sel_end_cursor.par() - || sel_start_cursor.pos() < sel_end_cursor.pos())) - sel_start_cursor.pos(sel_start_cursor.pos() + 1); - - CutAndPaste cap; + // ok we have a selection. This is always between selection.start + // and sel_end cursor + + // copy behind a space if there is one + while (selection.start.par()->size() > selection.start.pos() + && selection.start.par()->isLineSeparator(selection.start.pos()) + && (selection.start.par() != selection.end.par() + || selection.start.pos() < selection.end.pos())) + selection.start.pos(selection.start.pos() + 1); - cap.copySelection(sel_start_cursor.par(), sel_end_cursor.par(), - sel_start_cursor.pos(), sel_end_cursor.pos(), - bview->buffer()->params.textclass); + CutAndPaste::copySelection(selection.start.par(), selection.end.par(), + selection.start.pos(), selection.end.pos(), + bview->buffer()->params.textclass); } -void LyXText::PasteSelection(BufferView * bview) +void LyXText::pasteSelection(BufferView * bview) { - CutAndPaste cap; - // this does not make sense, if there is nothing to paste - if (!cap.checkPastePossible(cursor.par(), cursor.pos())) + if (!CutAndPaste::checkPastePossible(cursor.par())) return; - SetUndo(bview->buffer(), Undo::INSERT, -#ifndef NEW_INSETS - cursor.par()->ParFromPos(cursor.pos())->previous, - cursor.par()->ParFromPos(cursor.pos())->next -#else - cursor.par()->previous, - cursor.par()->next -#endif - ); - - LyXParagraph * endpar; - LyXParagraph * actpar = cursor.par(); + setUndo(bview, Undo::INSERT, + cursor.par(), cursor.par()->next()); + Paragraph * endpar; + Paragraph * actpar = cursor.par(); int pos = cursor.pos(); - cap.pasteSelection(&actpar, &endpar, pos, bview->buffer()->params.textclass); + + CutAndPaste::pasteSelection(&actpar, &endpar, pos, + bview->buffer()->params.textclass); - RedoParagraphs(bview, cursor, endpar); + redoParagraphs(bview, cursor, endpar); - SetCursor(bview, cursor.par(), cursor.pos()); - ClearSelection(); + setCursor(bview, cursor.par(), cursor.pos()); + clearSelection(); - sel_cursor = cursor; - SetCursor(bview, actpar, pos); - SetSelection(); - UpdateCounters(bview, cursor.row()); + setCursor(bview, actpar, pos); + updateCounters(bview, cursor.row()); } -// returns a pointer to the very first LyXParagraph -LyXParagraph * LyXText::FirstParagraph() const +// returns a pointer to the very first Paragraph +Paragraph * LyXText::firstParagraph() const { - return OwnerParagraph(); -} - - -// returns true if the specified string is at the specified position -bool LyXText::IsStringInText(LyXParagraph * par, - LyXParagraph::size_type pos, - string const & str) const -{ - if (!par) - return false; - - LyXParagraph::size_type i = 0; - while (pos + i < par->Last() - && string::size_type(i) < str.length() - && str[i] == par->GetChar(pos + i)) { - ++i; - } - if (str.length() == string::size_type(i)) - return true; - return false; + return ownerParagraph(); } // sets the selection over the number of characters of string, no check!! -void LyXText::SetSelectionOverString(BufferView * bview, string const & str) +void LyXText::setSelectionOverString(BufferView * bview, string const & str) { - sel_cursor = cursor; - for (int i = 0; str[i]; ++i) - CursorRight(bview); - SetSelection(); + if (str.empty()) + return; + + selection.cursor = cursor; + for (string::size_type i = 0; i < str.length(); ++i) + cursorRight(bview); + setSelection(bview); } // simple replacing. The font of the first selected character is used -void LyXText::ReplaceSelectionWithString(BufferView * bview, +void LyXText::replaceSelectionWithString(BufferView * bview, string const & str) { - SetCursorParUndo(bview->buffer()); - FreezeUndo(); + setCursorParUndo(bview); + freezeUndo(); - if (!selection) { // create a dummy selection - sel_end_cursor = cursor; - sel_start_cursor = cursor; + if (!selection.set()) { // create a dummy selection + selection.end = cursor; + selection.start = cursor; } // Get font setting before we cut - LyXParagraph::size_type pos = sel_end_cursor.pos(); - LyXFont const font = sel_start_cursor.par() - ->GetFontSettings(bview->buffer()->params, - sel_start_cursor.pos()); + pos_type pos = selection.end.pos(); + LyXFont const font = selection.start.par() + ->getFontSettings(bview->buffer()->params, + selection.start.pos()); // Insert the new string for (string::const_iterator cit = str.begin(); cit != str.end(); ++cit) { - sel_end_cursor.par()->InsertChar(pos, (*cit), font); + selection.end.par()->insertChar(pos, (*cit), font); ++pos; } // Cut the selection - CutSelection(bview); - - UnFreezeUndo(); -} - - -// if the string can be found: return true and set the cursor to -// the new position -bool LyXText::SearchForward(BufferView * bview, string const & str) const -{ - LyXParagraph * par = cursor.par(); - LyXParagraph::size_type pos = cursor.pos(); - while (par && !IsStringInText(par, pos, str)) { - if (pos < par->Last() - 1) - ++pos; - else { - pos = 0; - par = par->Next(); - } - } - if (par) { - SetCursor(bview, par, pos); - return true; - } - else - return false; -} - - -bool LyXText::SearchBackward(BufferView * bview, string const & str) const -{ - LyXParagraph * par = cursor.par(); - int pos = cursor.pos(); + cutSelection(bview, true, false); - do { - if (pos > 0) - --pos; - else { - // We skip empty paragraphs (Asger) - do { - par = par->Previous(); - if (par) - pos = par->Last() - 1; - } while (par && pos < 0); - } - } while (par && !IsStringInText(par, pos, str)); - - if (par) { - SetCursor(bview, par, pos); - return true; - } else - return false; + unFreezeUndo(); } // needed to insert the selection -void LyXText::InsertStringA(BufferView * bview, string const & str) +void LyXText::insertStringAsLines(BufferView * bview, string const & str) { - LyXParagraph * par = cursor.par(); - LyXParagraph::size_type pos = cursor.pos(); - LyXParagraph::size_type a = 0; - LyXParagraph * endpar = cursor.par()->Next(); + Paragraph * par = cursor.par(); + pos_type pos = cursor.pos(); + Paragraph * endpar = cursor.par()->next(); - SetCursorParUndo(bview->buffer()); + setCursorParUndo(bview); - bool flag = - textclasslist.Style(bview->buffer()->params.textclass, - cursor.par()->GetLayout()).isEnvironment(); // only to be sure, should not be neccessary - ClearSelection(); - - // insert the string, don't insert doublespace - string::size_type i = 0; - while (i < str.length()) { - if (str[i] != '\n') { - if (str[i] == ' ' - && i + 1 < str.length() && str[i + 1] != ' ' - && pos && par->GetChar(pos - 1)!= ' ') { - par->InsertChar(pos, ' ', current_font); - ++pos; - } else if (str[i] == ' ') { - InsetSpecialChar * new_inset = - new InsetSpecialChar(InsetSpecialChar::PROTECTED_SEPARATOR); - if (par->InsertInsetAllowed(new_inset)) { - par->InsertInset(pos, new_inset, - current_font); - } else { - delete new_inset; - } - ++pos; - } else if (str[i] == '\t') { - for (a = pos; a < (pos / 8 + 1) * 8 ; ++a) { - InsetSpecialChar * new_inset = - new InsetSpecialChar(InsetSpecialChar::PROTECTED_SEPARATOR); - if (par->InsertInsetAllowed(new_inset)) { - par->InsertInset(pos, new_inset, - current_font); - } else { - delete new_inset; - } - } - pos = a; - } else if (str[i] != 13 && - // Ignore unprintables - (str[i] & 127) >= ' ') { - par->InsertChar(pos, str[i], current_font); - ++pos; - } - } else { - if (!par->size()) { // par is empty - InsetSpecialChar * new_inset = - new InsetSpecialChar(InsetSpecialChar::PROTECTED_SEPARATOR); - if (par->InsertInsetAllowed(new_inset)) { - par->InsertInset(pos, - new_inset, - current_font); - } else { - delete new_inset; - } - ++pos; - } - par->BreakParagraph(bview->buffer()->params, pos, flag); - par = par->Next(); - pos = 0; - } - ++i; - } + clearSelection(); - RedoParagraphs(bview, cursor, endpar); - SetCursor(bview, cursor.par(), cursor.pos()); - sel_cursor = cursor; - SetCursor(bview, par, pos); - SetSelection(); -} - - -/* turns double-CR to single CR, others where converted into one blank and 13s - * that are ignored .Double spaces are also converted into one. Spaces at - * the beginning of a paragraph are forbidden. tabs are converted into one - * space. then InsertStringA is called */ -void LyXText::InsertStringB(BufferView * bview, string const & s) -{ - string str(s); - string::size_type i = 1; - while (i < str.length()) { - if (str[i] == '\t') - str[i] = ' '; - if (str[i] == ' ' && i + 1 < str.length() && str[i + 1] == ' ') - str[i] = 13; - if (str[i] == '\n' && i + 1 < str.length()) { - if (str[i + 1] != '\n') { - if (str[i - 1] != ' ') - str[i] = ' '; - else - str[i] = 13; - } - while (i + 1 < str.length() - && (str[i + 1] == ' ' - || str[i + 1] == '\t' - || str[i + 1] == '\n' - || str[i + 1] == 13)) { - str[i + 1] = 13; - ++i; - } + bview->buffer()->insertStringAsLines(par, pos, current_font, str); + + redoParagraphs(bview, cursor, endpar); + setCursor(bview, cursor.par(), cursor.pos()); + selection.cursor = cursor; + setCursor(bview, par, pos); + setSelection(bview); +} + + +// turns double-CR to single CR, others where converted into one +// blank. Then InsertStringAsLines is called +void LyXText::insertStringAsParagraphs(BufferView * bview, string const & str) +{ + string linestr(str); + bool newline_inserted = false; + for (string::size_type i = 0; i < linestr.length(); ++i) { + if (linestr[i] == '\n') { + if (newline_inserted) { + // we know that \r will be ignored by + // InsertStringA. Of course, it is a dirty + // trick, but it works... + linestr[i - 1] = '\r'; + linestr[i] = '\n'; + } else { + linestr[i] = ' '; + newline_inserted = true; + } + } else if (IsPrintable(linestr[i])) { + newline_inserted = false; } - ++i; } - InsertStringA(bview, str); + insertStringAsLines(bview, linestr); } -bool LyXText::GotoNextError(BufferView * bview) const +bool LyXText::gotoNextInset(BufferView * bview, + std::vector const & codes, + string const & contents) const { LyXCursor res = cursor; + Inset * inset; do { - if (res.pos() < res.par()->Last() - 1) { + if (res.pos() < res.par()->size() - 1) { res.pos(res.pos() + 1); } else { - res.par(res.par()->Next()); + res.par(res.par()->next()); res.pos(0); } } while (res.par() && - !(res.par()->GetChar(res.pos()) == LyXParagraph::META_INSET - && res.par()->GetInset(res.pos())->AutoDelete())); - - if (res.par()) { - SetCursor(bview, res.par(), res.pos()); - return true; - } - return false; -} + !(res.par()->isInset(res.pos()) + && (inset = res.par()->getInset(res.pos())) != 0 + && find(codes.begin(), codes.end(), inset->lyxCode()) + != codes.end() + && (contents.empty() || + static_cast(res.par()->getInset(res.pos()))->getContents() + == contents))); - -bool LyXText::GotoNextNote(BufferView * bview) const -{ - LyXCursor res = cursor; - do { - if (res.pos() < res.par()->Last() - 1) { - res.pos(res.pos() + 1); - } else { - res.par(res.par()->Next()); - res.pos(0); - } - - } while (res.par() && - !(res.par()->GetChar(res.pos()) == LyXParagraph::META_INSET - && res.par()->GetInset(res.pos())->LyxCode() == Inset::IGNORE_CODE)); - if (res.par()) { - SetCursor(bview, res.par(), res.pos()); + setCursor(bview, res.par(), res.pos(), false); return true; } return false; } -void LyXText::CheckParagraph(BufferView * bview, LyXParagraph * par, - LyXParagraph::size_type pos) +void LyXText::checkParagraph(BufferView * bview, Paragraph * par, + pos_type pos) { LyXCursor tmpcursor; int y = 0; - LyXParagraph::size_type z; - Row * row = GetRow(par, pos, y); + pos_type z; + Row * row = getRow(par, pos, y); // is there a break one row above if (row->previous() && row->previous()->par() == row->par()) { - z = NextBreakPoint(bview, row->previous(), workWidth(bview)); - if ( z >= row->pos()) { + z = nextBreakPoint(bview, row->previous(), workWidth(bview)); + if (z >= row->pos()) { // set the dimensions of the row above y -= row->previous()->height(); refresh_y = y; refresh_row = row->previous(); - status = LyXText::NEED_MORE_REFRESH; + status(bview, LyXText::NEED_MORE_REFRESH); - BreakAgain(bview, row->previous()); + breakAgain(bview, row->previous()); // set the cursor again. Otherwise // dangling pointers are possible - SetCursor(bview, cursor.par(), cursor.pos()); - sel_cursor = cursor; + setCursor(bview, cursor.par(), cursor.pos(), + false, cursor.boundary()); + selection.cursor = cursor; return; } } int const tmpheight = row->height(); - LyXParagraph::size_type const tmplast = RowLast(row); + pos_type const tmplast = rowLast(row); refresh_y = y; refresh_row = row; - BreakAgain(bview, row); - if (row->height() == tmpheight && RowLast(row) == tmplast) - status = LyXText::NEED_VERY_LITTLE_REFRESH; + breakAgain(bview, row); + if (row->height() == tmpheight && rowLast(row) == tmplast) + status(bview, LyXText::NEED_VERY_LITTLE_REFRESH); else - status = LyXText::NEED_MORE_REFRESH; + status(bview, LyXText::NEED_MORE_REFRESH); // check the special right address boxes if (textclasslist.Style(bview->buffer()->params.textclass, - par->GetLayout()).margintype - == MARGIN_RIGHT_ADDRESS_BOX) { + par->getLayout()).margintype + == MARGIN_RIGHT_ADDRESS_BOX) + { tmpcursor.par(par); tmpcursor.row(row); tmpcursor.y(y); tmpcursor.x(0); tmpcursor.x_fix(0); tmpcursor.pos(pos); - RedoDrawingOfParagraph(bview, tmpcursor); + redoDrawingOfParagraph(bview, tmpcursor); } // set the cursor again. Otherwise dangling pointers are possible // also set the selection - if (selection) { + if (selection.set()) { tmpcursor = cursor; - SetCursorIntern(bview, sel_cursor.par(), sel_cursor.pos()); - sel_cursor = cursor; - SetCursorIntern(bview, sel_start_cursor.par(), - sel_start_cursor.pos()); - sel_start_cursor = cursor; - SetCursorIntern(bview, sel_end_cursor.par(), - sel_end_cursor.pos()); - sel_end_cursor = cursor; - SetCursorIntern(bview, last_sel_cursor.par(), - last_sel_cursor.pos()); + setCursorIntern(bview, selection.cursor.par(), selection.cursor.pos(), + false, selection.cursor.boundary()); + selection.cursor = cursor; + setCursorIntern(bview, selection.start.par(), + selection.start.pos(), + false, selection.start.boundary()); + selection.start = cursor; + setCursorIntern(bview, selection.end.par(), + selection.end.pos(), + false, selection.end.boundary()); + selection.end = cursor; + setCursorIntern(bview, last_sel_cursor.par(), + last_sel_cursor.pos(), + false, last_sel_cursor.boundary()); last_sel_cursor = cursor; cursor = tmpcursor; } - SetCursorIntern(bview, cursor.par(), cursor.pos()); + setCursorIntern(bview, cursor.par(), cursor.pos(), + false, cursor.boundary()); } // returns false if inset wasn't found -bool LyXText::UpdateInset(BufferView * bview, Inset * inset) +bool LyXText::updateInset(BufferView * bview, Inset * inset) { // first check the current paragraph - int pos = cursor.par()->GetPositionOfInset(inset); - if (pos != -1){ - CheckParagraph(bview, cursor.par(), pos); + int pos = cursor.par()->getPositionOfInset(inset); + if (pos != -1) { + checkParagraph(bview, cursor.par(), pos); return true; } // check every paragraph - LyXParagraph * par = FirstParagraph(); + Paragraph * par = firstParagraph(); do { -#ifndef NEW_INSETS - // make sure the paragraph is open - if (par->footnoteflag != LyXParagraph::CLOSED_FOOTNOTE){ -#endif - pos = par->GetPositionOfInset(inset); - if (pos != -1){ - CheckParagraph(bview, par, pos); - return true; - } -#ifndef NEW_INSETS + pos = par->getPositionOfInset(inset); + if (pos != -1) { + checkParagraph(bview, par, pos); + return true; } -#endif - par = par->Next(); + par = par->next(); } while (par); return false; } -void LyXText::SetCursor(BufferView * bview, LyXParagraph * par, - LyXParagraph::size_type pos, - bool setfont, bool boundary) const +void LyXText::setCursor(BufferView * bview, Paragraph * par, + pos_type pos, + bool setfont, bool boundary) const { LyXCursor old_cursor = cursor; - SetCursorIntern(bview, par, pos, setfont, boundary); - DeleteEmptyParagraphMechanism(bview, old_cursor); -} - - -void LyXText::SetCursor(BufferView *bview, LyXCursor & cur, LyXParagraph * par, - LyXParagraph::size_type pos, bool boundary) const -{ -#ifndef NEW_INSETS - // correct the cursor position if impossible - if (pos > par->Last()){ - LyXParagraph * tmppar = par->ParFromPos(pos); - pos = par->PositionInParFromPos(pos); - par = tmppar; - } - if (par->IsDummy() && par->previous && - par->previous->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) { - while (par->previous && - ((par->previous->IsDummy() && - (par->previous->previous->footnoteflag == - LyXParagraph::CLOSED_FOOTNOTE)) || - (par->previous->footnoteflag == - LyXParagraph::CLOSED_FOOTNOTE))) { - par = par->previous ; - if (par->IsDummy() && - (par->previous->footnoteflag == - LyXParagraph::CLOSED_FOOTNOTE)) - pos += par->size() + 1; - } - if (par->previous) { - par = par->previous; - } - pos += par->size() + 1; - } -#endif + setCursorIntern(bview, par, pos, setfont, boundary); + deleteEmptyParagraphMechanism(bview, old_cursor); +} + + +void LyXText::setCursor(BufferView *bview, LyXCursor & cur, Paragraph * par, + pos_type pos, bool boundary) const +{ cur.par(par); cur.pos(pos); cur.boundary(boundary); - /* get the cursor y position in text */ + // get the cursor y position in text int y = 0; - Row * row = GetRow(par, pos, y); - /* y is now the beginning of the cursor row */ + Row * row = getRow(par, pos, y); + // y is now the beginning of the cursor row y += row->baseline(); - /* y is now the cursor baseline */ + // y is now the cursor baseline cur.y(y); - - /* now get the cursors x position */ + + // now get the cursors x position float x; - float fill_separator, fill_hfill, fill_label_hfill; - PrepareToPrint(bview, row, x, fill_separator, fill_hfill, + float fill_separator; + float fill_hfill; + float fill_label_hfill; + prepareToPrint(bview, row, x, fill_separator, fill_hfill, fill_label_hfill); - LyXParagraph::size_type cursor_vpos = 0; - LyXParagraph::size_type last = RowLastPrintable(row); + pos_type cursor_vpos = 0; + pos_type last = rowLastPrintable(row); if (pos > last + 1) // This shouldn't happen. pos = last + 1; @@ -2839,120 +2144,134 @@ void LyXText::SetCursor(BufferView *bview, LyXCursor & cur, LyXParagraph * par, cursor_vpos = (bidi_level(pos) % 2 == 0) ? log2vis(pos) : log2vis(pos) + 1; - LyXParagraph::size_type main_body = - BeginningOfMainBody(bview->buffer(), row->par()); + pos_type main_body = + beginningOfMainBody(bview->buffer(), row->par()); if ((main_body > 0) && ((main_body-1 > last) || - !row->par()->IsLineSeparator(main_body-1))) + !row->par()->isLineSeparator(main_body-1))) main_body = 0; - for (LyXParagraph::size_type vpos = row->pos(); + for (pos_type vpos = row->pos(); vpos < cursor_vpos; ++vpos) { pos = vis2log(vpos); if (main_body > 0 && pos == main_body - 1) { x += fill_label_hfill + lyxfont::width(textclasslist.Style( bview->buffer()->params.textclass, - row->par()->GetLayout()) + row->par()->getLayout()) .labelsep, - GetFont(bview->buffer(), row->par(), -2)); - if (row->par()->IsLineSeparator(main_body-1)) - x -= SingleWidth(bview, row->par(),main_body-1); + getLabelFont(bview->buffer(), row->par())); + if (row->par()->isLineSeparator(main_body-1)) + x -= singleWidth(bview, row->par(),main_body-1); } - if (HfillExpansion(bview->buffer(), row, pos)) { - x += SingleWidth(bview, row->par(), pos); + if (hfillExpansion(bview->buffer(), row, pos)) { + x += singleWidth(bview, row->par(), pos); if (pos >= main_body) x += fill_hfill; else x += fill_label_hfill; - } else if (row->par()->IsSeparator(pos)) { - x += SingleWidth(bview, row->par(), pos); + } else if (row->par()->isSeparator(pos)) { + x += singleWidth(bview, row->par(), pos); if (pos >= main_body) x += fill_separator; } else - x += SingleWidth(bview, row->par(), pos); + x += singleWidth(bview, row->par(), pos); } cur.x(int(x)); - cur.x_fix(cur.x()); + cur.x_fix(cur.x()); cur.row(row); } -void LyXText::SetCursorIntern(BufferView * bview, LyXParagraph * par, - LyXParagraph::size_type pos, +void LyXText::setCursorIntern(BufferView * bview, Paragraph * par, + pos_type pos, bool setfont, bool boundary) const { - SetCursor(bview, cursor, par, pos, boundary); + InsetText * it = static_cast(par->inInset()); + if (it) { + if (it != inset_owner) { + lyxerr << "InsetText is " << it << endl; + lyxerr << "inset_owner is " << inset_owner << endl; +#warning I believe this code is wrong. (Lgb) +#warning Jürgen, have a look at this. (Lgb) +#warning Hmmm, I guess you are right but we +#warning should verify when this is needed + // Jürgen, would you like to have a look? + // I guess we need to move the outer cursor + // and open and lock the inset (bla bla bla) + // stuff I don't know... so can you have a look? + // (Lgb) + // I moved the lyxerr stuff in here so we can see if + // this is actually really needed and where! + // (Jug) + it->getLyXText(bview)->setCursorIntern(bview, par, pos, setfont, + boundary); + return; + } + } + + setCursor(bview, cursor, par, pos, boundary); if (setfont) - SetCurrentFont(bview); + setCurrentFont(bview); } -void LyXText::SetCurrentFont(BufferView * bview) const +void LyXText::setCurrentFont(BufferView * bview) const { - LyXParagraph::size_type pos = cursor.pos(); + pos_type pos = cursor.pos(); if (cursor.boundary() && pos > 0) --pos; if (pos > 0) { - if (pos == cursor.par()->Last()) + if (pos == cursor.par()->size()) --pos; - else if (cursor.par()->IsSeparator(pos)) { - if (pos > cursor.row()->pos() && - bidi_level(pos) % 2 == - bidi_level(pos - 1) % 2) - --pos; - else if (pos + 1 < cursor.par()->Last()) - ++pos; - } + else // potentional bug... BUG (Lgb) + if (cursor.par()->isSeparator(pos)) { + if (pos > cursor.row()->pos() && + bidi_level(pos) % 2 == + bidi_level(pos - 1) % 2) + --pos; + else if (pos + 1 < cursor.par()->size()) + ++pos; + } } current_font = - cursor.par()->GetFontSettings(bview->buffer()->params, pos); - real_current_font = GetFont(bview->buffer(), cursor.par(), pos); + cursor.par()->getFontSettings(bview->buffer()->params, pos); + real_current_font = getFont(bview->buffer(), cursor.par(), pos); - if (cursor.pos() == cursor.par()->Last() && - IsBoundary(bview->buffer(), cursor.par(), cursor.pos()) && + if (cursor.pos() == cursor.par()->size() && + isBoundary(bview->buffer(), cursor.par(), cursor.pos()) && !cursor.boundary()) { Language const * lang = cursor.par()->getParLanguage(bview->buffer()->params); current_font.setLanguage(lang); + current_font.setNumber(LyXFont::OFF); real_current_font.setLanguage(lang); + real_current_font.setNumber(LyXFont::OFF); } } -void LyXText::SetCursorFromCoordinates(BufferView * bview, int x, int y) const +void LyXText::setCursorFromCoordinates(BufferView * bview, int x, int y) const { LyXCursor old_cursor = cursor; - - /* get the row first */ - - Row * row = GetRowNearY(y); - cursor.par(row->par()); - bool bound = false; - int column = GetColumnNearX(bview, row, x, bound); - cursor.pos(row->pos() + column); - cursor.x(x); - cursor.y(y + row->baseline()); - cursor.row(row); - cursor.boundary(bound); - SetCurrentFont(bview); - DeleteEmptyParagraphMechanism(bview, old_cursor); + setCursorFromCoordinates(bview, cursor, x, y); + setCurrentFont(bview); + deleteEmptyParagraphMechanism(bview, old_cursor); } -void LyXText::SetCursorFromCoordinates(BufferView * bview, LyXCursor & cur, +void LyXText::setCursorFromCoordinates(BufferView * bview, LyXCursor & cur, int x, int y) const { - /* get the row first */ + // Get the row first. - Row * row = GetRowNearY(y); + Row * row = getRowNearY(y); bool bound = false; - int column = GetColumnNearX(bview, row, x, bound); - + pos_type const column = getColumnNearX(bview, row, x, bound); cur.par(row->par()); cur.pos(row->pos() + column); cur.x(x); @@ -2962,82 +2281,105 @@ void LyXText::SetCursorFromCoordinates(BufferView * bview, LyXCursor & cur, } -void LyXText::CursorLeft(BufferView * bview, bool internal) const +void LyXText::cursorLeft(BufferView * bview, bool internal) const { if (cursor.pos() > 0) { bool boundary = cursor.boundary(); - SetCursor(bview, cursor.par(), cursor.pos() - 1, true, false); + setCursor(bview, cursor.par(), cursor.pos() - 1, true, false); if (!internal && !boundary && - IsBoundary(bview->buffer(), cursor.par(), cursor.pos() + 1)) - SetCursor(bview, cursor.par(), cursor.pos() + 1, true, true); - } else if (cursor.par()->Previous()) { // steps into the above paragraph. - LyXParagraph * par = cursor.par()->Previous(); - SetCursor(bview, par, par->Last()); + isBoundary(bview->buffer(), cursor.par(), cursor.pos() + 1)) + setCursor(bview, cursor.par(), cursor.pos() + 1, true, true); + } else if (cursor.par()->previous()) { // steps into the above paragraph. + Paragraph * par = cursor.par()->previous(); + setCursor(bview, par, par->size()); } } -void LyXText::CursorRight(BufferView * bview, bool internal) const +void LyXText::cursorRight(BufferView * bview, bool internal) const { if (!internal && cursor.boundary() && - !cursor.par()->IsNewline(cursor.pos())) - SetCursor(bview, cursor.par(), cursor.pos(), true, false); - else if (cursor.pos() < cursor.par()->Last()) { - SetCursor(bview, cursor.par(), cursor.pos() + 1, true, false); + !cursor.par()->isNewline(cursor.pos())) + setCursor(bview, cursor.par(), cursor.pos(), true, false); + else if (cursor.pos() < cursor.par()->size()) { + setCursor(bview, cursor.par(), cursor.pos() + 1, true, false); if (!internal && - IsBoundary(bview->buffer(), cursor.par(), cursor.pos())) - SetCursor(bview, cursor.par(), cursor.pos(), true, true); - } else if (cursor.par()->Next()) - SetCursor(bview, cursor.par()->Next(), 0); + isBoundary(bview->buffer(), cursor.par(), cursor.pos())) + setCursor(bview, cursor.par(), cursor.pos(), true, true); + } else if (cursor.par()->next()) + setCursor(bview, cursor.par()->next(), 0); } -void LyXText::CursorUp(BufferView * bview) const +void LyXText::cursorUp(BufferView * bview) const { - SetCursorFromCoordinates(bview, cursor.x_fix(), + setCursorFromCoordinates(bview, cursor.x_fix(), cursor.y() - cursor.row()->baseline() - 1); } -void LyXText::CursorDown(BufferView * bview) const +void LyXText::cursorDown(BufferView * bview) const { - SetCursorFromCoordinates(bview, cursor.x_fix(), + setCursorFromCoordinates(bview, cursor.x_fix(), cursor.y() - cursor.row()->baseline() + cursor.row()->height() + 1); } -void LyXText::CursorUpParagraph(BufferView * bview) const +void LyXText::cursorUpParagraph(BufferView * bview) const { if (cursor.pos() > 0) { - SetCursor(bview, cursor.par(), 0); + setCursor(bview, cursor.par(), 0); } - else if (cursor.par()->Previous()) { - SetCursor(bview, cursor.par()->Previous(), 0); + else if (cursor.par()->previous()) { + setCursor(bview, cursor.par()->previous(), 0); } } -void LyXText::CursorDownParagraph(BufferView * bview) const +void LyXText::cursorDownParagraph(BufferView * bview) const { - if (cursor.par()->Next()) { - SetCursor(bview, cursor.par()->Next(), 0); + if (cursor.par()->next()) { + setCursor(bview, cursor.par()->next(), 0); } else { - SetCursor(bview, cursor.par(), cursor.par()->Last()); + setCursor(bview, cursor.par(), cursor.par()->size()); } } +// fix the cursor `cur' after a characters has been deleted at `where' +// position. Called by deleteEmptyParagraphMechanism +void LyXText::fixCursorAfterDelete(BufferView * bview, + LyXCursor & cur, + LyXCursor const & where) const +{ + // if cursor is not in the paragraph where the delete occured, + // do nothing + if (cur.par() != where.par()) + return; + + // if cursor position is after the place where the delete occured, + // update it + if (cur.pos() > where.pos()) + cur.pos(cur.pos()-1); + + // recompute row et al. for this cursor + setCursor(bview, cur, cur.par(), cur.pos(), cur.boundary()); +} + -void LyXText::DeleteEmptyParagraphMechanism(BufferView * bview, +void LyXText::deleteEmptyParagraphMechanism(BufferView * bview, LyXCursor const & old_cursor) const { // Would be wrong to delete anything if we have a selection. - if (selection) return; + if (selection.set()) return; // We allow all kinds of "mumbo-jumbo" when freespacing. if (textclasslist.Style(bview->buffer()->params.textclass, - old_cursor.par()->GetLayout()).free_spacing) + old_cursor.par()->getLayout()).free_spacing + || old_cursor.par()->isFreeSpacing()) + { return; + } bool deleted = false; @@ -3065,547 +2407,237 @@ void LyXText::DeleteEmptyParagraphMechanism(BufferView * bview, // MISSING // If the pos around the old_cursor were spaces, delete one of them. - if (old_cursor.par() != cursor.par() || old_cursor.pos() != cursor.pos()) { + if (old_cursor.par() != cursor.par() + || old_cursor.pos() != cursor.pos()) { // Only if the cursor has really moved if (old_cursor.pos() > 0 - && old_cursor.pos() < old_cursor.par()->Last() - && old_cursor.par()->IsLineSeparator(old_cursor.pos()) - && old_cursor.par()->IsLineSeparator(old_cursor.pos() - 1)) { - old_cursor.par()->Erase(old_cursor.pos() - 1); - RedoParagraphs(bview, old_cursor, old_cursor.par()->Next()); - // correct cursor - if (old_cursor.par() == cursor.par() && - cursor.pos() > old_cursor.pos()) { - SetCursorIntern(bview, cursor.par(), - cursor.pos() - 1); - } else - SetCursorIntern(bview, cursor.par(), - cursor.pos()); + && old_cursor.pos() < old_cursor.par()->size() + && old_cursor.par()->isLineSeparator(old_cursor.pos()) + && old_cursor.par()->isLineSeparator(old_cursor.pos() - 1)) { + old_cursor.par()->erase(old_cursor.pos() - 1); + redoParagraphs(bview, old_cursor, old_cursor.par()->next()); + +#ifdef WITH_WARNINGS +#warning This will not work anymore when we have multiple views of the same buffer +// In this case, we will have to correct also the cursors held by +// other bufferviews. It will probably be easier to do that in a more +// automated way in LyXCursor code. (JMarc 26/09/2001) +#endif + // correct all cursors held by the LyXText + fixCursorAfterDelete(bview, cursor, old_cursor); + fixCursorAfterDelete(bview, selection.cursor, + old_cursor); + fixCursorAfterDelete(bview, selection.start, + old_cursor); + fixCursorAfterDelete(bview, selection.end, old_cursor); + fixCursorAfterDelete(bview, last_sel_cursor, + old_cursor); + fixCursorAfterDelete(bview, toggle_cursor, old_cursor); + fixCursorAfterDelete(bview, toggle_end_cursor, + old_cursor); return; } } + // don't delete anything if this is the ONLY paragraph! + if (!old_cursor.par()->next() && !old_cursor.par()->previous()) + return; + // Do not delete empty paragraphs with keepempty set. if ((textclasslist.Style(bview->buffer()->params.textclass, - old_cursor.par()->GetLayout())).keepempty) + old_cursor.par()->getLayout())).keepempty) return; - LyXCursor tmpcursor; - - if (old_cursor.par() != cursor.par()) { - if ( (old_cursor.par()->Last() == 0 - || (old_cursor.par()->Last() == 1 - && old_cursor.par()->IsLineSeparator(0))) -#ifndef NEW_INSETS - && old_cursor.par()->FirstPhysicalPar() - == old_cursor.par()->LastPhysicalPar() -#endif - ) { - // ok, we will delete anything - - // make sure that you do not delete any environments -#ifndef NEW_INSETS - if (( - old_cursor.par()->footnoteflag != LyXParagraph::OPEN_FOOTNOTE && - !(old_cursor.row()->previous() - && old_cursor.row()->previous()->par()->footnoteflag == LyXParagraph::OPEN_FOOTNOTE) - && !(old_cursor.row()->next() - && old_cursor.row()->next()->par()->footnoteflag == LyXParagraph::OPEN_FOOTNOTE)) - || (old_cursor.par()->footnoteflag == LyXParagraph::OPEN_FOOTNOTE - && ((old_cursor.row()->previous() - && old_cursor.row()->previous()->par()->footnoteflag == LyXParagraph::OPEN_FOOTNOTE) - || (old_cursor.row()->next() - && old_cursor.row()->next()->par()->footnoteflag == LyXParagraph::OPEN_FOOTNOTE)) - )) { -#endif - status = LyXText::NEED_MORE_REFRESH; - deleted = true; - - if (old_cursor.row()->previous()) { - refresh_row = old_cursor.row()->previous(); - refresh_y = old_cursor.y() - old_cursor.row()->baseline() - refresh_row->height(); - tmpcursor = cursor; - cursor = old_cursor; // that undo can restore the right cursor position - LyXParagraph * endpar = old_cursor.par()->next; - if (endpar && endpar->GetDepth()) { - while (endpar && endpar->GetDepth()) { -#ifndef NEW_INSETS - endpar = endpar->LastPhysicalPar()->Next(); -#else - endpar = endpar->Next(); -#endif - } - } - SetUndo(bview->buffer(), Undo::DELETE, - old_cursor.par()->previous, - endpar); - cursor = tmpcursor; - - // delete old row - RemoveRow(old_cursor.row()); - if (OwnerParagraph() == old_cursor.par()) { - OwnerParagraph(OwnerParagraph()->next); - } - // delete old par - delete old_cursor.par(); - - /* Breakagain the next par. Needed - * because of the parindent that - * can occur or dissappear. The - * next row can change its height, - * if there is another layout before */ - if (refresh_row->next()) { - BreakAgain(bview, refresh_row->next()); - UpdateCounters(bview, refresh_row); - } - SetHeightOfRow(bview, refresh_row); - } else { - refresh_row = old_cursor.row()->next(); - refresh_y = old_cursor.y() - old_cursor.row()->baseline(); - - tmpcursor = cursor; - cursor = old_cursor; // that undo can restore the right cursor position - LyXParagraph * endpar = old_cursor.par()->next; - if (endpar && endpar->GetDepth()) { - while (endpar && endpar->GetDepth()) { -#ifndef NEW_INSETS - endpar = endpar->LastPhysicalPar()->Next(); -#else - endpar = endpar->Next(); -#endif - } - } - SetUndo(bview->buffer(), Undo::DELETE, - old_cursor.par()->previous, - endpar); - cursor = tmpcursor; - - // delete old row - RemoveRow(old_cursor.row()); - // delete old par - if (OwnerParagraph() == old_cursor.par()) { - OwnerParagraph(OwnerParagraph()->next); - } - delete old_cursor.par(); - - /* Breakagain the next par. Needed - because of the parindent that can - occur or dissappear. - The next row can change its height, - if there is another layout before - */ - if (refresh_row) { - BreakAgain(bview, refresh_row); - UpdateCounters(bview, refresh_row->previous()); - } - } + // only do our magic if we changed paragraph + if (old_cursor.par() == cursor.par()) + return; + + if ((old_cursor.par()->size() == 0 + || (old_cursor.par()->size() == 1 + && old_cursor.par()->isLineSeparator(0)))) { + // ok, we will delete anything + LyXCursor tmpcursor; + + // make sure that you do not delete any environments + status(bview, LyXText::NEED_MORE_REFRESH); + deleted = true; - // correct cursor y - - SetCursorIntern(bview, cursor.par(), cursor.pos()); - - if (sel_cursor.par() == old_cursor.par() - && sel_cursor.pos() == sel_cursor.pos()) { - // correct selection - sel_cursor = cursor; + if (old_cursor.row()->previous()) { + refresh_row = old_cursor.row()->previous(); + refresh_y = old_cursor.y() - old_cursor.row()->baseline() - refresh_row->height(); + tmpcursor = cursor; + cursor = old_cursor; // that undo can restore the right cursor position + Paragraph * endpar = old_cursor.par()->next(); + if (endpar && endpar->getDepth()) { + while (endpar && endpar->getDepth()) { + endpar = endpar->next(); } -#ifndef NEW_INSETS - } -#endif - } - if (!deleted) { - if (old_cursor.par()->StripLeadingSpaces(bview->buffer()->params.textclass)) { - RedoParagraphs(bview, old_cursor, old_cursor.par()->Next()); - // correct cursor y - SetCursorIntern(bview, cursor.par(), cursor.pos()); - sel_cursor = cursor; } - } - } -} - + setUndo(bview, Undo::DELETE, old_cursor.par(), endpar); + cursor = tmpcursor; -LyXParagraph * LyXText::GetParFromID(int id) -{ - LyXParagraph * result = FirstParagraph(); - while (result && result->id() != id) - result = result->next; - return result; -} - - -// undo functions -bool LyXText::TextUndo(BufferView * bview) -{ - if (inset_owner) - return false; - // returns false if no undo possible - Undo * undo = bview->buffer()->undostack.pop(); - if (undo) { - FinishUndo(); - if (!undo_frozen) - bview->buffer()->redostack - .push(CreateUndo(bview->buffer(), undo->kind, - GetParFromID(undo->number_of_before_par), - GetParFromID(undo->number_of_behind_par))); - } - return TextHandleUndo(bview, undo); -} - - -bool LyXText::TextRedo(BufferView * bview) -{ - if (inset_owner) - return false; - // returns false if no redo possible - Undo * undo = bview->buffer()->redostack.pop(); - if (undo) { - FinishUndo(); - if (!undo_frozen) - bview->buffer()->undostack - .push(CreateUndo(bview->buffer(), undo->kind, - GetParFromID(undo->number_of_before_par), - GetParFromID(undo->number_of_behind_par))); - } - return TextHandleUndo(bview, undo); -} - - -bool LyXText::TextHandleUndo(BufferView * bview, Undo * undo) -{ - if (inset_owner) - return false; - // returns false if no undo possible - bool result = false; - if (undo) { - LyXParagraph * before = - GetParFromID(undo->number_of_before_par); - LyXParagraph * behind = - GetParFromID(undo->number_of_behind_par); - LyXParagraph * tmppar; - LyXParagraph * tmppar2; - LyXParagraph * endpar; - LyXParagraph * tmppar5; - - // if there's no before take the beginning - // of the document for redoing - if (!before) - SetCursorIntern(bview, FirstParagraph(), 0); - - // replace the paragraphs with the undo informations - - LyXParagraph * tmppar3 = undo->par; - undo->par = 0; // otherwise the undo destructor would delete the paragraph - LyXParagraph * tmppar4 = tmppar3; - if (tmppar4){ - while (tmppar4->next) - tmppar4 = tmppar4->next; - } // get last undo par - - // now remove the old text if there is any - if (before != behind || (!behind && !before)){ - if (before) - tmppar5 = before->next; - else - tmppar5 = OwnerParagraph(); - tmppar2 = tmppar3; - while (tmppar5 && tmppar5 != behind){ - tmppar = tmppar5; - tmppar5 = tmppar5->next; - // a memory optimization for edit: Only layout information - // is stored in the undo. So restore the text informations. - if (undo->kind == Undo::EDIT) { - tmppar2->setContentsFromPar(tmppar); - tmppar->clearContents(); - tmppar2 = tmppar2->next; - } + // delete old row + removeRow(old_cursor.row()); + if (ownerParagraph() == old_cursor.par()) { + ownerParagraph(ownerParagraph()->next()); } - } - - // put the new stuff in the list if there is one - if (tmppar3){ - if (before) - before->next = tmppar3; - else - OwnerParagraph(tmppar3); - tmppar3->previous = before; + // delete old par + delete old_cursor.par(); + + /* Breakagain the next par. Needed because of + * the parindent that can occur or dissappear. + * The next row can change its height, if + * there is another layout before */ + if (refresh_row->next()) { + breakAgain(bview, refresh_row->next()); + updateCounters(bview, refresh_row); + } + setHeightOfRow(bview, refresh_row); } else { - if (!before) - OwnerParagraph(behind); - } - if (tmppar4) { - tmppar4->next = behind; - if (behind) - behind->previous = tmppar4; - } - - - // Set the cursor for redoing - if (before) { -#ifndef NEW_INSETS - SetCursorIntern(bview, before->FirstSelfrowPar(), 0); -#else - SetCursorIntern(bview, before, 0); -#endif -#ifndef NEW_INSETS - // check wether before points to a closed float and open it if necessary - if (before && before->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE - && before->next && before->next->footnoteflag != LyXParagraph::NO_FOOTNOTE){ - tmppar4 = before; - while (tmppar4->previous && - tmppar4->previous->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) - tmppar4 = tmppar4->previous; - while (tmppar4 && tmppar4->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE){ - tmppar4->footnoteflag = LyXParagraph::OPEN_FOOTNOTE; - tmppar4 = tmppar4->next; + refresh_row = old_cursor.row()->next(); + refresh_y = old_cursor.y() - old_cursor.row()->baseline(); + + tmpcursor = cursor; + cursor = old_cursor; // that undo can restore the right cursor position + Paragraph * endpar = old_cursor.par()->next(); + if (endpar && endpar->getDepth()) { + while (endpar && endpar->getDepth()) { + endpar = endpar->next(); } } -#endif - } + setUndo(bview, Undo::DELETE, old_cursor.par(), endpar); + cursor = tmpcursor; + + // delete old row + removeRow(old_cursor.row()); + // delete old par + if (ownerParagraph() == old_cursor.par()) { + ownerParagraph(ownerParagraph()->next()); + } -#ifndef NEW_INSETS - // open a cosed footnote at the end if necessary - if (behind && behind->previous && - behind->previous->footnoteflag != LyXParagraph::NO_FOOTNOTE && - behind->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE){ - while (behind && behind->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE){ - behind->footnoteflag = LyXParagraph::OPEN_FOOTNOTE; - behind = behind->next; + delete old_cursor.par(); + + /* Breakagain the next par. Needed because of + the parindent that can occur or dissappear. + The next row can change its height, if + there is another layout before */ + if (refresh_row) { + breakAgain(bview, refresh_row); + updateCounters(bview, refresh_row->previous()); } } -#endif - - // calculate the endpar for redoing the paragraphs. - if (behind) { -#ifndef NEW_INSETS - if (behind->footnoteflag != LyXParagraph::CLOSED_FOOTNOTE) - endpar = behind->LastPhysicalPar()->Next(); - else - endpar = behind->NextAfterFootnote()->LastPhysicalPar()->Next(); -#else - endpar = behind->Next(); -#endif - } else - endpar = behind; - - tmppar = GetParFromID(undo->number_of_cursor_par); - RedoParagraphs(bview, cursor, endpar); - if (tmppar){ - SetCursorIntern(bview, tmppar, undo->cursor_pos); - UpdateCounters(bview, cursor.row()); + + // correct cursor y + setCursorIntern(bview, cursor.par(), cursor.pos()); + + if (selection.cursor.par() == old_cursor.par() + && selection.cursor.pos() == selection.cursor.pos()) { + // correct selection + selection.cursor = cursor; + } + } + if (!deleted) { + if (old_cursor.par()->stripLeadingSpaces(bview->buffer()->params.textclass)) { + redoParagraphs(bview, old_cursor, + old_cursor.par()->next()); + // correct cursor y + setCursorIntern(bview, cursor.par(), cursor.pos()); + selection.cursor = cursor; } - result = true; - delete undo; } - FinishUndo(); - return result; -} - - -void LyXText::FinishUndo() -{ - if (inset_owner) - return; - // makes sure the next operation will be stored - undo_finished = true; } -void LyXText::FreezeUndo() +void LyXText::toggleAppendix(BufferView * bview) { - if (inset_owner) - return; - // this is dangerous and for internal use only - undo_frozen = true; -} + Paragraph * par = cursor.par(); + bool start = !par->params().startOfAppendix(); + // ensure that we have only one start_of_appendix in this document + Paragraph * tmp = firstParagraph(); + for (; tmp; tmp = tmp->next()) { + tmp->params().startOfAppendix(false); + } + + par->params().startOfAppendix(start); -void LyXText::UnFreezeUndo() -{ - if (inset_owner) - return; - // this is dangerous and for internal use only - undo_frozen = false; + // we can set the refreshing parameters now + status(bview, LyXText::NEED_MORE_REFRESH); + refresh_y = 0; + refresh_row = 0; // not needed for full update + updateCounters(bview, 0); + setCursor(bview, cursor.par(), cursor.pos()); } -void LyXText::SetUndo(Buffer * buf, Undo::undo_kind kind, - LyXParagraph const * before, - LyXParagraph const * behind) const +Paragraph * LyXText::ownerParagraph() const { - if (inset_owner) - return; - if (!undo_frozen) - buf->undostack.push(CreateUndo(buf, kind, before, behind)); - buf->redostack.clear(); + if (inset_owner) { + return inset_owner->paragraph(); + } + return bv_owner->buffer()->paragraph; } -void LyXText::SetRedo(Buffer * buf, Undo::undo_kind kind, - LyXParagraph const * before, LyXParagraph const * behind) +void LyXText::ownerParagraph(Paragraph * p) const { - if (inset_owner) - return; - buf->redostack.push(CreateUndo(buf, kind, before, behind)); + if (inset_owner) { + inset_owner->paragraph(p); + } else { + bv_owner->buffer()->paragraph = p; + } } -Undo * LyXText::CreateUndo(Buffer * buf, Undo::undo_kind kind, - LyXParagraph const * before, - LyXParagraph const * behind) const +void LyXText::ownerParagraph(int id, Paragraph * p) const { - if (inset_owner) - return 0; - - int before_number = -1; - int behind_number = -1; - if (before) - before_number = before->id(); - if (behind) - behind_number = behind->id(); - // Undo::EDIT and Undo::FINISH are - // always finished. (no overlapping there) - // overlapping only with insert and delete inside one paragraph: - // Nobody wants all removed character - // appear one by one when undoing. - // EDIT is special since only layout information, not the - // contents of a paragaph are stored. - if (!undo_finished && (kind != Undo::EDIT) && (kind != Undo::FINISH)){ - // check wether storing is needed - if (!buf->undostack.empty() && - buf->undostack.top()->kind == kind && - buf->undostack.top()->number_of_before_par == before_number && - buf->undostack.top()->number_of_behind_par == behind_number ){ - // no undo needed - return 0; + Paragraph * op = bv_owner->buffer()->getParFromID(id); + if (op && op->inInset()) { + static_cast(op->inInset())->paragraph(p); + } else { + if (inset_owner) { + inset_owner->paragraph(p); + } else { + bv_owner->buffer()->paragraph = p; } } - // create a new Undo - LyXParagraph * undopar; - LyXParagraph * tmppar; - LyXParagraph * tmppar2; - - LyXParagraph * start = 0; - LyXParagraph * end = 0; - - if (before) - start = before->next; - else - start = FirstParagraph(); - if (behind) - end = behind->previous; - else { - end = FirstParagraph(); - while (end->next) - end = end->next; - } - - if (start && end - && start != end->next - && (before != behind || (!before && !behind))) { - tmppar = start; - tmppar2 = tmppar->Clone(); - tmppar2->id(tmppar->id()); - - // a memory optimization: Just store the layout information - // when only edit - if (kind == Undo::EDIT){ - //tmppar2->text.clear(); - tmppar2->clearContents(); - } - - undopar = tmppar2; - - while (tmppar != end && tmppar->next) { - tmppar = tmppar->next; - tmppar2->next = tmppar->Clone(); - tmppar2->next->id(tmppar->id()); - // a memory optimization: Just store the layout - // information when only edit - if (kind == Undo::EDIT){ - //tmppar2->next->text.clear(); - tmppar2->clearContents(); - } - tmppar2->next->previous = tmppar2; - tmppar2 = tmppar2->next; - } - tmppar2->next = 0; - } else - undopar = 0; // nothing to replace (undo of delete maybe) - -#ifndef NEW_INSETS - int cursor_par = cursor.par()->ParFromPos(cursor.pos())->id(); - int cursor_pos = cursor.par()->PositionInParFromPos(cursor.pos()); -#else - int cursor_par = cursor.par()->id(); - int cursor_pos = cursor.pos(); -#endif - - Undo * undo = new Undo(kind, - before_number, behind_number, - cursor_par, cursor_pos, - undopar); - - undo_finished = false; - return undo; -} - - -void LyXText::SetCursorParUndo(Buffer * buf) -{ - if (inset_owner) - return; - SetUndo(buf, Undo::FINISH, -#ifndef NEW_INSETS - cursor.par()->ParFromPos(cursor.pos())->previous, - cursor.par()->ParFromPos(cursor.pos())->next -#else - cursor.par()->previous, - cursor.par()->next -#endif - ); } -void LyXText::toggleAppendix(BufferView * bview) +LyXText::text_status LyXText::status() const { -#ifndef NEW_INSETS - LyXParagraph * par = cursor.par()->FirstPhysicalPar(); -#else - LyXParagraph * par = cursor.par(); -#endif - bool start = !par->start_of_appendix; - - // ensure that we have only one start_of_appendix in this document - LyXParagraph * tmp = FirstParagraph(); - for (; tmp; tmp = tmp->next) - tmp->start_of_appendix = 0; - par->start_of_appendix = start; - - // we can set the refreshing parameters now - status = LyXText::NEED_MORE_REFRESH; - refresh_y = 0; - refresh_row = 0; // not needed for full update - UpdateCounters(bview, 0); - SetCursor(bview, cursor.par(), cursor.pos()); + return status_; } -LyXParagraph * LyXText::OwnerParagraph() const +void LyXText::status(BufferView * bview, LyXText::text_status st) const { - if (inset_owner) - return inset_owner->par; - - return bv_owner->buffer()->paragraph; -} - + // well as much as I know && binds more then || so the above and the + // below are identical (this for your known use of parentesis!) + // Now some explanation: + // We should only go up with refreshing code so this means that if + // we have a MORE refresh we should never set it to LITTLE if we still + // didn't handle it (and then it will be UNCHANGED. Now as long as + // we stay inside one LyXText this may work but we need to tell the + // outermost LyXText that it should REALLY draw us if there is some + // change in a Inset::LyXText. So you see that when we are inside a + // inset's LyXText we give the LITTLE to the outermost LyXText to + // tell'em that it should redraw the actual row (where the inset + // resides! Capito?! -LyXParagraph * LyXText::OwnerParagraph(LyXParagraph * p) const -{ - if (inset_owner) - inset_owner->par = p; - else - bv_owner->buffer()->paragraph = p; - return 0; + if ((status_ != NEED_MORE_REFRESH) + || (status_ == NEED_MORE_REFRESH + && st != NEED_VERY_LITTLE_REFRESH)) + { + status_ = st; + if (inset_owner && st != UNCHANGED) { + bview->text->status(bview, NEED_VERY_LITTLE_REFRESH); + if (!bview->text->refresh_row) { + bview->text->refresh_row = bview->text->cursor.row(); + bview->text->refresh_y = bview->text->cursor.y() - + bview->text->cursor.row()->baseline(); + } + } + } }