X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ftext2.C;h=1440f91c561c231dfe5469c97ac90dd470d44efa;hb=08b1fdacad52474c2aceb6e5ff354e8e870ddc47;hp=4a451e408931f714205905fc2a2d6c0c4f22bd64;hpb=76ef051b1cb1fb51c3ffd8ccc9105be4471e74d4;p=lyx.git diff --git a/src/text2.C b/src/text2.C index 4a451e4089..1440f91c56 100644 --- a/src/text2.C +++ b/src/text2.C @@ -10,9 +10,6 @@ #include -#include FORMS_H_LOCATION - - #ifdef __GNUG__ #pragma implementation "lyxtext.h" #endif @@ -28,7 +25,8 @@ #include "layout.h" #include "LyXView.h" #include "support/textutils.h" -#include "undo.h" +#include "support/lstrings.h" +#include "undo_funcs.h" #include "buffer.h" #include "bufferparams.h" #include "lyx_gui_misc.h" @@ -40,95 +38,52 @@ #include "font.h" #include "debug.h" #include "lyxrc.h" +#include "lyxrow.h" #include "FloatList.h" #include "language.h" #include "ParagraphParameters.h" +#include "support/LAssert.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.set(true); /* these setting is necessary - because of the delete-empty- - paragraph mechanism in - SetCursor */ - if (bv_owner) { - Paragraph * 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); - - selection.cursor = cursor; - selection.set(false); - selection.mark(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; Paragraph * par = ownerParagraph(); @@ -139,25 +94,9 @@ void LyXText::init(BufferView * bview) } setCursorIntern(bview, firstrow->par(), 0); selection.cursor = cursor; -#if 0 - printf("TP = %x\n",inset_owner->owner()); - // 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 } + LyXText::~LyXText() { // Delete all rows, this does not touch the paragraphs! @@ -170,6 +109,46 @@ 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 Paragraph::getFont() in paragraph.C. // The difference is that this one is used for displaying, and thus we @@ -178,94 +157,103 @@ LyXText::~LyXText() // 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, Paragraph * par, - Paragraph::size_type pos) const + pos_type pos) const { + lyx::Assert(pos >= 0); + LyXLayout const & layout = textclasslist.Style(buf->params.textclass, par->getLayout()); - + Paragraph::depth_type par_depth = par->getDepth(); // We specialize the 95% common case: if (!par_depth) { - if (pos >= 0){ - // 95% goes here - if (layout.labeltype == LABEL_MANUAL - && pos < beginningOfMainBody(buf, par)) { + 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->outerHook(); - 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); +} - return tmpfont; + +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; + } + + return realizeFont(layout.labelfont, buf, par); } void LyXText::setCharFont(BufferView * bv, Paragraph * par, - Paragraph::size_type pos, LyXFont const & fnt, + pos_type pos, LyXFont const & fnt, bool toggleall) { 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) == Paragraph::META_INSET) { + if (par->isInset(pos)) { Inset * inset = par->getInset(pos); - if (inset) { - if (inset->Editable()==Inset::HIGHLY_EDITABLE) { - UpdatableInset * uinset = static_cast(inset); - uinset->SetFont(bv, fnt, toggleall, true); - } - font = inset->ConvertFont(font); + if (isEditableInset(inset)) { + UpdatableInset * uinset = + static_cast(inset); + uinset->setFont(bv, fnt, toggleall, true); } } @@ -287,13 +275,25 @@ void LyXText::setCharFont(BufferView * bv, Paragraph * 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); + 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); @@ -301,14 +301,11 @@ void LyXText::setCharFont(BufferView * bv, Paragraph * par, par->setFont(pos, font); } + void LyXText::setCharFont(Buffer const * buf, Paragraph * par, - Paragraph::size_type pos, LyXFont const & fnt) + pos_type pos, LyXFont const & fnt) { LyXFont font(fnt); - // Let the insets convert their font - if (par->getChar(pos) == Paragraph::META_INSET) { - font = par->getInset(pos)->ConvertFont(font); - } LyXLayout const & layout = textclasslist.Style(buf->params.textclass, @@ -328,13 +325,25 @@ void LyXText::setCharFont(Buffer const * buf, Paragraph * 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); @@ -343,10 +352,10 @@ void LyXText::setCharFont(Buffer const * buf, Paragraph * par, } -/* inserts a new row behind the specified row, increments - * the touched counters */ +// inserts a new row behind the specified row, increments +// the touched counters void LyXText::insertRow(Row * row, Paragraph * par, - Paragraph::size_type pos) const + pos_type pos) const { Row * tmprow = new Row; if (!row) { @@ -371,23 +380,18 @@ void LyXText::insertRow(Row * row, Paragraph * 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 { - /* 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()); } @@ -418,10 +422,10 @@ void LyXText::removeParagraph(Row * row) const // insert the specified paragraph behind the specified row void LyXText::insertParagraph(BufferView * bview, Paragraph * par, - Row * row) const + 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 @@ -436,24 +440,57 @@ void LyXText::insertParagraph(BufferView * bview, Paragraph * par, } +Inset * LyXText::getInset() const +{ + 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; +} + + +void LyXText::toggleInset(BufferView * bview) +{ + Inset * inset = getInset(); + if (!isEditableInset(inset)) + return; + //bview->owner()->message(inset->editMessage()); + + // do we want to keep this?? (JMarc) + if (!isHighlyEditableInset(inset)) + setCursorParUndo(bview); + + if (inset->isOpen()) { + inset->close(bview); + } else { + inset->open(bview); + } +#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, Paragraph * par) { - LyXLayout const & layout = textclasslist.Style(buf->params.textclass, par->getLayout()); - LyXFont layoutfont, tmpfont; - for (Paragraph::size_type pos = 0; - pos < par->size(); ++pos) { + 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); } @@ -461,9 +498,9 @@ void LyXText::makeFontEntriesLayoutSpecific(Buffer const * buf, Paragraph * LyXText::setLayout(BufferView * bview, - LyXCursor & cur, LyXCursor & sstart_cur, - LyXCursor & send_cur, - LyXTextClass::size_type layout) + LyXCursor & cur, LyXCursor & sstart_cur, + LyXCursor & send_cur, + lyx::layout_type layout) { Paragraph * endpar = send_cur.par()->next(); Paragraph * undoendpar = endpar; @@ -477,12 +514,11 @@ Paragraph * LyXText::setLayout(BufferView * bview, endpar = endpar->next(); // because of parindents etc. } - setUndo(bview->buffer(), Undo::EDIT, - sstart_cur.par()->previous(), - undoendpar); + setUndo(bview, Undo::EDIT, + sstart_cur.par(), undoendpar); - /* ok we have a selection. This is always between sstart_cur - * and sel_end cursor */ + // ok we have a selection. This is always between sstart_cur + // and sel_end cursor cur = sstart_cur; LyXLayout const & lyxlayout = @@ -493,11 +529,11 @@ Paragraph * LyXText::setLayout(BufferView * bview, makeFontEntriesLayoutSpecific(bview->buffer(), cur.par()); Paragraph * fppar = cur.par(); fppar->params().spaceTop(lyxlayout.fill_top ? - VSpace(VSpace::VFILL) - : VSpace(VSpace::NONE)); + VSpace(VSpace::VFILL) + : VSpace(VSpace::NONE)); fppar->params().spaceBottom(lyxlayout.fill_bottom ? - VSpace(VSpace::VFILL) - : VSpace(VSpace::NONE)); + VSpace(VSpace::VFILL) + : VSpace(VSpace::NONE)); if (lyxlayout.margintype == MARGIN_MANUAL) cur.par()->setLabelWidthString(lyxlayout.labelstring()); if (lyxlayout.labeltype != LABEL_BIBLIO @@ -511,9 +547,9 @@ Paragraph * LyXText::setLayout(BufferView * bview, makeFontEntriesLayoutSpecific(bview->buffer(), cur.par()); Paragraph * fppar = cur.par(); fppar->params().spaceTop(lyxlayout.fill_top ? - VSpace(VSpace::VFILL) : VSpace(VSpace::NONE)); + VSpace(VSpace::VFILL) : VSpace(VSpace::NONE)); fppar->params().spaceBottom(lyxlayout.fill_bottom ? - VSpace(VSpace::VFILL) : VSpace(VSpace::NONE)); + VSpace(VSpace::VFILL) : VSpace(VSpace::NONE)); if (lyxlayout.margintype == MARGIN_MANUAL) cur.par()->setLabelWidthString(lyxlayout.labelstring()); if (lyxlayout.labeltype != LABEL_BIBLIO @@ -526,7 +562,7 @@ Paragraph * LyXText::setLayout(BufferView * bview, // 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 */ @@ -537,7 +573,7 @@ void LyXText::setLayout(BufferView * bview, LyXTextClass::size_type layout) selection.end = cursor; } Paragraph * endpar = setLayout(bview, cursor, selection.start, - selection.end, layout); + selection.end, layout); redoParagraphs(bview, selection.start, endpar); // we have to reset the selection, because the @@ -545,10 +581,9 @@ void LyXText::setLayout(BufferView * bview, LyXTextClass::size_type layout) setCursor(bview, selection.start.par(), selection.start.pos(), false); selection.cursor = cursor; - setCursor(bview, selection.end.par(), selection.end.pos(), - false); + setCursor(bview, selection.end.par(), selection.end.pos(), false); updateCounters(bview, cursor.row()); - clearSelection(bview); + clearSelection(); setSelection(bview); setCursor(bview, tmpcursor.par(), tmpcursor.pos(), true); } @@ -574,14 +609,12 @@ void LyXText::incDepth(BufferView * bview) endpar = endpar->next(); undoendpar = endpar; } - } - else if (endpar) { + } else if (endpar) { endpar = endpar->next(); // because of parindents etc. } - setUndo(bview->buffer(), Undo::EDIT, - selection.start.par()->previous(), - undoendpar); + setUndo(bview, Undo::EDIT, + selection.start.par(), undoendpar); LyXCursor tmpcursor = cursor; // store the current cursor @@ -594,22 +627,22 @@ void LyXText::incDepth(BufferView * bview) while (true) { // NOTE: you can't change the depth of a bibliography entry if ( - textclasslist.Style(bview->buffer()->params.textclass, - cursor.par()->getLayout() - ).labeltype != LABEL_BIBLIO) { + 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() && textclasslist.Style(bview->buffer()->params.textclass, - prev->getLayout()).isEnvironment()))) { + prev->getLayout()).isEnvironment()))) { cursor.par()->params().depth(cursor.par()->params().depth() + 1); anything_changed = true; - } + } } if (cursor.par() == selection.end.par()) - break; + break; cursor.par(cursor.par()->next()); } @@ -631,7 +664,7 @@ void LyXText::incDepth(BufferView * bview) selection.cursor = cursor; setCursor(bview, selection.end.par(), selection.end.pos()); updateCounters(bview, cursor.row()); - clearSelection(bview); + clearSelection(); setSelection(bview); setCursor(bview, tmpcursor.par(), tmpcursor.pos()); } @@ -659,9 +692,8 @@ void LyXText::decDepth(BufferView * bview) endpar = endpar->next(); // because of parindents etc. } - setUndo(bview->buffer(), Undo::EDIT, - selection.start.par()->previous(), - undoendpar); + setUndo(bview, Undo::EDIT, + selection.start.par(), undoendpar); LyXCursor tmpcursor = cursor; // store the current cursor @@ -670,10 +702,13 @@ void LyXText::decDepth(BufferView * bview) cursor = selection.start; while (true) { - if (cursor.par()->params().depth()) - cursor.par()->params().depth(cursor.par()->params().depth() - 1); - if (cursor.par() == selection.end.par()) + if (cursor.par()->params().depth()) { + cursor.par()->params() + .depth(cursor.par()->params().depth() - 1); + } + if (cursor.par() == selection.end.par()) { break; + } cursor.par(cursor.par()->next()); } @@ -686,7 +721,7 @@ void LyXText::decDepth(BufferView * bview) selection.cursor = cursor; setCursor(bview, selection.end.par(), selection.end.pos()); updateCounters(bview, cursor.row()); - clearSelection(bview); + clearSelection(); setSelection(bview); setCursor(bview, tmpcursor.par(), tmpcursor.pos()); } @@ -700,12 +735,15 @@ void LyXText::setFont(BufferView * bview, LyXFont const & font, bool toggleall) // 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); + 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); @@ -713,7 +751,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; } @@ -722,17 +765,18 @@ 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, - selection.start.par()->previous(), - selection.end.par()->next()); + 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())) { + (cursor.pos() < selection.end.pos())) + { if (cursor.pos() < cursor.par()->size()) { // an open footnote should behave // like a closed one - setCharFont(bview, cursor.par(), cursor.pos(), font, toggleall); + setCharFont(bview, cursor.par(), cursor.pos(), + font, toggleall); cursor.pos(cursor.pos() + 1); } else { cursor.pos(0); @@ -748,10 +792,10 @@ void LyXText::setFont(BufferView * bview, LyXFont const & font, bool toggleall) setCursor(bview, selection.start.par(), selection.start.pos()); selection.cursor = cursor; setCursor(bview, selection.end.par(), selection.end.pos()); - clearSelection(bview); + clearSelection(); setSelection(bview); setCursor(bview, tmpcursor.par(), tmpcursor.pos(), true, - tmpcursor.boundary()); + tmpcursor.boundary()); } @@ -761,24 +805,16 @@ void LyXText::redoHeightOfParagraph(BufferView * bview, LyXCursor const & cur) int y = cur.y() - tmprow->baseline(); setHeightOfRow(bview, tmprow); - Paragraph * first_phys_par = tmprow->par(); - - // 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) { + + while (tmprow->previous() + && tmprow->previous()->par() == tmprow->par()) { tmprow = tmprow->previous(); y -= tmprow->height(); 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()); @@ -791,66 +827,58 @@ void LyXText::redoDrawingOfParagraph(BufferView * bview, LyXCursor const & cur) int y = cur.y() - tmprow->baseline(); setHeightOfRow(bview, tmprow); - Paragraph * first_phys_par = tmprow->par(); - // 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) { + 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; + 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. */ +// 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 + Paragraph const * endpar) const { Row * tmprow2; - Paragraph * 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 { first_phys_par = tmprow->par(); - // 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(); @@ -866,7 +894,7 @@ void LyXText::redoParagraphs(BufferView * bview, LyXCursor const & cur, // remove the first one tmprow2 = tmprow; /* this is because tmprow->previous() - can be 0 */ + can be 0 */ tmprow = tmprow->previous(); removeRow(tmprow2); @@ -875,13 +903,16 @@ void LyXText::redoParagraphs(BufferView * bview, LyXCursor const & cur, do { if (tmppar) { insertParagraph(bview, tmppar, tmprow); - if (!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(); } - } while (tmppar != endpar); + } while (tmppar && tmppar != endpar); // this is because of layout changes if (refresh_row) { @@ -913,7 +944,7 @@ bool LyXText::fullRebreak(BufferView * bview) } -/* important for the screen */ +// important for the screen /* the cursor set functions have a special mechanism. When they @@ -936,7 +967,7 @@ void LyXText::setSelection(BufferView * bview) // 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 { @@ -949,15 +980,16 @@ void LyXText::setSelection(BufferView * bview) // and now the whole selection 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; - } + 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.cursor.y() == cursor.y() + && selection.cursor.x() < cursor.x())) { selection.end = cursor; selection.start = selection.cursor; } @@ -972,11 +1004,12 @@ void LyXText::setSelection(BufferView * bview) selection.set(false); if (inset_owner && (selection.set() || lsel)) - inset_owner->SetUpdateStatus(bview, InsetText::SELECTION); + 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.set()) return string(); string result; @@ -984,8 +1017,9 @@ string const LyXText::selectionAsString(Buffer const * buffer) const // Special handling if the whole selection is within one paragraph if (selection.start.par() == selection.end.par()) { result += selection.start.par()->asString(buffer, - selection.start.pos(), - selection.end.pos()); + selection.start.pos(), + selection.end.pos(), + label); return result; } @@ -993,30 +1027,34 @@ string const LyXText::selectionAsString(Buffer const * buffer) const // First paragraph in selection result += selection.start.par()->asString(buffer, - selection.start.pos(), - selection.start.par()->size()) + selection.start.pos(), + selection.start.par()->size(), + label) + "\n\n"; // The paragraphs in between (if any) LyXCursor tmpcur(selection.start); tmpcur.par(tmpcur.par()->next()); while (tmpcur.par() != selection.end.par()) { - result += tmpcur.par()->asString(buffer, 0, tmpcur.par()->size()) + "\n\n"; - tmpcur.par(tmpcur.par()->next()); // Or NextAfterFootnote?? + result += tmpcur.par()->asString(buffer, 0, + tmpcur.par()->size(), + label) + "\n\n"; + tmpcur.par(tmpcur.par()->next()); } // Last paragraph in selection - result += selection.end.par()->asString(buffer, 0, selection.end.pos()); + result += selection.end.par()->asString(buffer, 0, + selection.end.pos(), label); return result; } -void LyXText::clearSelection(BufferView * /*bview*/) const +void LyXText::clearSelection() const { selection.set(false); selection.mark(false); - selection.end = selection.start = cursor; + selection.end = selection.start = selection.cursor = cursor; } @@ -1028,15 +1066,18 @@ void LyXText::cursorHome(BufferView * bview) const void LyXText::cursorEnd(BufferView * bview) const { - if (!cursor.row()->next() || cursor.row()->next()->par() != cursor.row()->par()) + if (!cursor.row()->next() + || cursor.row()->next()->par() != cursor.row()->par()) { setCursor(bview, cursor.par(), rowLast(cursor.row()) + 1); - else { + } else { if (cursor.par()->size() && (cursor.par()->getChar(rowLast(cursor.row())) == ' ' - || cursor.par()->isNewline(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); + } else { + setCursor(bview,cursor.par(), + rowLast(cursor.row()) + 1); + } } } @@ -1072,27 +1113,59 @@ 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); - /* 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(bview); + clearSelection(); cursor = resetCursor; setCursor(bview, cursor.par(), cursor.pos()); selection.cursor = cursor; } if (inset_owner) - inset_owner->SetUpdateStatus(bview, InsetText::CURSOR_PAR); + inset_owner->setUpdateStatus(bview, InsetText::CURSOR_PAR); +} + + +string LyXText::getStringToIndex(BufferView * bview) +{ + 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(); + } + + 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; } -Paragraph::size_type -LyXText::beginningOfMainBody(Buffer const * buf, +pos_type LyXText::beginningOfMainBody(Buffer const * buf, Paragraph const * par) const { if (textclasslist.Style(buf->params.textclass, @@ -1114,6 +1187,7 @@ void LyXText::setParagraph(BufferView * bview, bool pagebreak_top, bool pagebreak_bottom, VSpace const & space_top, VSpace const & space_bottom, + Spacing const & spacing, LyXAlignment align, string labelwidthstring, bool noindent) @@ -1135,56 +1209,56 @@ void LyXText::setParagraph(BufferView * bview, } } else if (endpar) { - endpar = endpar->next(); // because of parindents etc. + // because of parindents etc. + endpar = endpar->next(); } - setUndo(bview->buffer(), Undo::EDIT, - selection.start.par()->previous(), - undoendpar); + setUndo(bview, Undo::EDIT, selection.start.par(), undoendpar); Paragraph * tmppar = selection.end.par(); while (tmppar != selection.start.par()->previous()) { setCursor(bview, tmppar, 0); - status = LyXText::NEED_MORE_REFRESH; + status(bview, LyXText::NEED_MORE_REFRESH); refresh_row = cursor.row(); refresh_y = cursor.y() - cursor.row()->baseline(); - 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); - // 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()->params().align(LYX_ALIGN_LAYOUT); - else - cursor.par()->params().align(align); - } - cursor.par()->setLabelWidthString(labelwidthstring); - cursor.par()->params().noindent(noindent); + cursor.par()->getLayout()).align) + cursor.par()->params().align(LYX_ALIGN_LAYOUT); + else + cursor.par()->params().align(align); + } + cursor.par()->setLabelWidthString(labelwidthstring); + cursor.par()->params().noindent(noindent); tmppar = cursor.par()->previous(); } redoParagraphs(bview, selection.start, endpar); - clearSelection(bview); + 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); + bview->updateInset(inset_owner, true); } @@ -1252,22 +1326,18 @@ void LyXText::setCounter(Buffer const * buf, Paragraph * par) const 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() - && !(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->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); - } + par->params().appendix(true); + for (int i = 0; i < 10; ++i) { + par->setCounter(i, 0); + } } par->enumdepth = par->previous()->enumdepth; par->itemdepth = par->previous()->itemdepth; @@ -1290,20 +1360,20 @@ void LyXText::setCounter(Buffer const * buf, Paragraph * par) const 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 && layout.labeltype != LABEL_BIBLIO) { par->enumdepth++; } - /* Maybe we have to decrement the enumeration depth, see note above */ + // 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->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 */ @@ -1323,7 +1393,7 @@ void LyXText::setCounter(Buffer const * buf, Paragraph * par) const 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; @@ -1343,7 +1413,7 @@ void LyXText::setCounter(Buffer const * buf, Paragraph * par) const par->params().labelString(string()); } - std::ostringstream s; + ostringstream s; if (!par->params().appendix()) { switch (2 * LABEL_COUNTER_CHAPTER - @@ -1353,7 +1423,7 @@ void LyXText::setCounter(Buffer const * buf, Paragraph * 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) << '.' @@ -1485,7 +1555,7 @@ void LyXText::setCounter(Buffer const * buf, Paragraph * par) const par->incCounter(i + par->enumdepth); int number = par->getCounter(i + par->enumdepth); - std::ostringstream s; + ostringstream s; switch (par->enumdepth) { case 1: @@ -1521,11 +1591,12 @@ void LyXText::setCounter(Buffer const * buf, Paragraph * par) const } par->params().labelString(s.str().c_str()); - // we really want to get rid of that 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; @@ -1544,11 +1615,11 @@ void LyXText::setCounter(Buffer const * buf, Paragraph * par) const // the caption hack: if (layout.labeltype == LABEL_SENSITIVE) { - bool isOK (par->InInset() && par->InInset()->owner() && - (par->InInset()->owner()->LyxCode() == Inset::FLOAT_CODE)); + 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. @@ -1570,8 +1641,8 @@ void LyXText::setCounter(Buffer const * buf, Paragraph * par) const } -/* Updates all counters BEHIND the row. Changed paragraphs -* with a dynamic left margin will be rebroken. */ +// Updates all counters BEHIND the row. Changed paragraphs +// with a dynamic left margin will be rebroken. void LyXText::updateCounters(BufferView * bview, Row * row) const { Paragraph * par; @@ -1589,14 +1660,14 @@ void LyXText::updateCounters(BufferView * bview, Row * row) const setCounter(bview->buffer(), par); - /* now check for the headline layouts. remember that they - * have a dynamic left margin */ + // 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 */ + // Rebreak the paragraph removeParagraph(row); appendParagraph(bview, row); } @@ -1605,25 +1676,23 @@ void LyXText::updateCounters(BufferView * bview, Row * row) const } -/* insets an 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, - cursor.par()->previous(), - cursor.par()->next()); + setUndo(bview, Undo::INSERT, + cursor.par(), cursor.par()->next()); cursor.par()->insertInset(cursor.pos(), inset); - insertChar(bview, Paragraph::META_INSET); /* just to rebreak and refresh correctly. - * The character will not be inserted a - * second time */ + // 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 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->Editable() == Inset::HIGHLY_EDITABLE) { + if (isHighlyEditableInset(inset)) { cursorLeft(bview, true); } #endif @@ -1642,7 +1711,7 @@ void LyXText::pasteEnvironmentType(BufferView * bview) } -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. @@ -1652,7 +1721,7 @@ 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.set()) @@ -1674,28 +1743,27 @@ void LyXText::cutSelection(BufferView * bview, bool doclear) endpar = endpar->next(); // because of parindents etc. } - setUndo(bview->buffer(), Undo::DELETE, - selection.start.par()->previous(), - 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 if (selection.start.par() == selection.end.par()) { // only within one paragraph endpar = selection.end.par(); int pos = selection.end.pos(); - cap.cutSelection(selection.start.par(), &endpar, - selection.start.pos(), pos, - bview->buffer()->params.textclass, doclear); + CutAndPaste::cutSelection(selection.start.par(), &endpar, + selection.start.pos(), pos, + bview->buffer()->params.textclass, + doclear, realcut); selection.end.pos(pos); } else { endpar = selection.end.par(); int pos = selection.end.pos(); - cap.cutSelection(selection.start.par(), &endpar, - selection.start.pos(), pos, - bview->buffer()->params.textclass, doclear); + CutAndPaste::cutSelection(selection.start.par(), &endpar, + selection.start.pos(), pos, + bview->buffer()->params.textclass, + doclear, realcut); cursor.par(endpar); selection.end.par(endpar); selection.end.pos(pos); @@ -1714,7 +1782,7 @@ void LyXText::cutSelection(BufferView * bview, bool doclear) cursor = selection.start; // need a valid cursor. (Lgb) - clearSelection(bview); + clearSelection(); setCursor(bview, cursor.par(), cursor.pos()); selection.cursor = cursor; @@ -1732,7 +1800,7 @@ 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.set()) @@ -1748,41 +1816,34 @@ void LyXText::copySelection(BufferView * bview) || selection.start.pos() < selection.end.pos())) selection.start.pos(selection.start.pos() + 1); - CutAndPaste cap; - - cap.copySelection(selection.start.par(), selection.end.par(), - selection.start.pos(), selection.end.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) { - CutAndPaste cap; - // this does not make sense, if there is nothing to paste - if (!cap.checkPastePossible(cursor.par())) + if (!CutAndPaste::checkPastePossible(cursor.par())) return; - setUndo(bview->buffer(), Undo::INSERT, - cursor.par()->previous(), - cursor.par()->next()); + 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); setCursor(bview, cursor.par(), cursor.pos()); - clearSelection(bview); + clearSelection(); - selection.cursor = cursor; setCursor(bview, actpar, pos); - setSelection(bview); updateCounters(bview, cursor.row()); } @@ -1811,7 +1872,7 @@ void LyXText::setSelectionOverString(BufferView * bview, string const & str) void LyXText::replaceSelectionWithString(BufferView * bview, string const & str) { - setCursorParUndo(bview->buffer()); + setCursorParUndo(bview); freezeUndo(); if (!selection.set()) { // create a dummy selection @@ -1820,7 +1881,7 @@ void LyXText::replaceSelectionWithString(BufferView * bview, } // Get font setting before we cut - Paragraph::size_type pos = selection.end.pos(); + pos_type pos = selection.end.pos(); LyXFont const font = selection.start.par() ->getFontSettings(bview->buffer()->params, selection.start.pos()); @@ -1832,7 +1893,7 @@ void LyXText::replaceSelectionWithString(BufferView * bview, } // Cut the selection - cutSelection(bview); + cutSelection(bview, true, false); unFreezeUndo(); } @@ -1842,70 +1903,15 @@ void LyXText::replaceSelectionWithString(BufferView * bview, void LyXText::insertStringAsLines(BufferView * bview, string const & str) { Paragraph * par = cursor.par(); - Paragraph::size_type pos = cursor.pos(); + pos_type pos = cursor.pos(); Paragraph * endpar = cursor.par()->next(); - setCursorParUndo(bview->buffer()); + setCursorParUndo(bview); - bool isEnvironment = - textclasslist.Style(bview->buffer()->params.textclass, - cursor.par()->getLayout()).isEnvironment(); - bool free_spacing = - textclasslist.Style(bview->buffer()->params.textclass, - cursor.par()->getLayout()).free_spacing; - bool keepempty = - textclasslist.Style(bview->buffer()->params.textclass, - cursor.par()->getLayout()).keepempty; - // only to be sure, should not be neccessary - clearSelection(bview); + clearSelection(); - // insert the string, don't insert doublespace - bool space_inserted = true; - for(string::const_iterator cit = str.begin(); - cit != str.end(); ++cit) { - if (*cit == '\n') { - if (par->size() || keepempty) { - par->breakParagraph(bview->buffer()->params, - pos, isEnvironment); - par = par->next(); - pos = 0; - space_inserted = true; - } else { - continue; - } - // do not insert consecutive spaces if !free_spacing - } else if ((*cit == ' ' || *cit == '\t') - && space_inserted && !free_spacing) { - continue; - } else if (*cit == '\t') { - if (!free_spacing) { - // tabs are like spaces here - par->insertChar(pos, ' ', - current_font); - ++pos; - space_inserted = true; - } else { - const Paragraph::value_type nb = 8 - pos % 8; - for (Paragraph::size_type a = 0; - a < nb ; ++a) { - par->insertChar(pos, ' ', - current_font); - ++pos; - } - space_inserted = true; - } - } else if (!IsPrintable(*cit)) { - // Ignore unprintables - continue; - } else { - // just insert the character - par->insertChar(pos, *cit, current_font); - ++pos; - space_inserted = (*cit == ' '); - } - - } + bview->buffer()->insertStringAsLines(par, pos, current_font, str); redoParagraphs(bview, cursor, endpar); setCursor(bview, cursor.par(), cursor.pos()); @@ -1915,8 +1921,8 @@ void LyXText::insertStringAsLines(BufferView * bview, string const & str) } -/* turns double-CR to single CR, others where converted into one - blank. Then InsertStringAsLines is called */ +// 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); @@ -1956,16 +1962,16 @@ bool LyXText::gotoNextInset(BufferView * bview, } } while (res.par() && - !(res.par()->getChar(res.pos()) == Paragraph::META_INSET + !(res.par()->isInset(res.pos()) && (inset = res.par()->getInset(res.pos())) != 0 - && find(codes.begin(), codes.end(), inset->LyxCode()) - != codes.end() + && find(codes.begin(), codes.end(), inset->lyxCode()) + != codes.end() && (contents.empty() || static_cast(res.par()->getInset(res.pos()))->getContents() == contents))); if (res.par()) { - setCursor(bview, res.par(), res.pos()); + setCursor(bview, res.par(), res.pos(), false); return true; } return false; @@ -1973,12 +1979,12 @@ bool LyXText::gotoNextInset(BufferView * bview, void LyXText::checkParagraph(BufferView * bview, Paragraph * par, - Paragraph::size_type pos) + pos_type pos) { LyXCursor tmpcursor; int y = 0; - Paragraph::size_type z; + pos_type z; Row * row = getRow(par, pos, y); // is there a break one row above @@ -1989,7 +1995,7 @@ void LyXText::checkParagraph(BufferView * bview, Paragraph * par, 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()); @@ -2003,20 +2009,21 @@ void LyXText::checkParagraph(BufferView * bview, Paragraph * par, } int const tmpheight = row->height(); - Paragraph::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; + 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) { + == MARGIN_RIGHT_ADDRESS_BOX) + { tmpcursor.par(par); tmpcursor.row(row); tmpcursor.y(y); @@ -2058,7 +2065,7 @@ bool LyXText::updateInset(BufferView * bview, Inset * inset) { // first check the current paragraph int pos = cursor.par()->getPositionOfInset(inset); - if (pos != -1){ + if (pos != -1) { checkParagraph(bview, cursor.par(), pos); return true; } @@ -2067,11 +2074,11 @@ bool LyXText::updateInset(BufferView * bview, Inset * inset) Paragraph * par = firstParagraph(); do { - pos = par->getPositionOfInset(inset); - if (pos != -1){ - checkParagraph(bview, par, pos); - return true; - } + pos = par->getPositionOfInset(inset); + if (pos != -1) { + checkParagraph(bview, par, pos); + return true; + } par = par->next(); } while (par); @@ -2080,8 +2087,8 @@ bool LyXText::updateInset(BufferView * bview, Inset * inset) void LyXText::setCursor(BufferView * bview, Paragraph * par, - Paragraph::size_type pos, - bool setfont, bool boundary) const + pos_type pos, + bool setfont, bool boundary) const { LyXCursor old_cursor = cursor; setCursorIntern(bview, par, pos, setfont, boundary); @@ -2090,29 +2097,29 @@ void LyXText::setCursor(BufferView * bview, Paragraph * par, void LyXText::setCursor(BufferView *bview, LyXCursor & cur, Paragraph * par, - Paragraph::size_type pos, bool boundary) const + 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 */ + // 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; float fill_hfill; float fill_label_hfill; prepareToPrint(bview, row, x, fill_separator, fill_hfill, fill_label_hfill); - Paragraph::size_type cursor_vpos = 0; - Paragraph::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; @@ -2134,14 +2141,14 @@ void LyXText::setCursor(BufferView *bview, LyXCursor & cur, Paragraph * par, cursor_vpos = (bidi_level(pos) % 2 == 0) ? log2vis(pos) : log2vis(pos) + 1; - Paragraph::size_type main_body = + pos_type main_body = beginningOfMainBody(bview->buffer(), row->par()); if ((main_body > 0) && ((main_body-1 > last) || !row->par()->isLineSeparator(main_body-1))) main_body = 0; - for (Paragraph::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) { @@ -2150,7 +2157,7 @@ void LyXText::setCursor(BufferView *bview, LyXCursor & cur, Paragraph * par, bview->buffer()->params.textclass, row->par()->getLayout()) .labelsep, - getFont(bview->buffer(), row->par(), -2)); + getLabelFont(bview->buffer(), row->par())); if (row->par()->isLineSeparator(main_body-1)) x -= singleWidth(bview, row->par(),main_body-1); } @@ -2169,15 +2176,38 @@ void LyXText::setCursor(BufferView *bview, LyXCursor & cur, Paragraph * par, } cur.x(int(x)); - cur.x_fix(cur.x()); + cur.x_fix(cur.x()); cur.row(row); } void LyXText::setCursorIntern(BufferView * bview, Paragraph * par, - Paragraph::size_type pos, + pos_type pos, bool setfont, bool boundary) const { + 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); @@ -2186,7 +2216,7 @@ void LyXText::setCursorIntern(BufferView * bview, Paragraph * par, void LyXText::setCurrentFont(BufferView * bview) const { - Paragraph::size_type pos = cursor.pos(); + pos_type pos = cursor.pos(); if (cursor.boundary() && pos > 0) --pos; @@ -2194,14 +2224,14 @@ void LyXText::setCurrentFont(BufferView * bview) const if (pos == cursor.par()->size()) --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; - } + 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 = @@ -2224,19 +2254,8 @@ void LyXText::setCurrentFont(BufferView * bview) 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); + setCursorFromCoordinates(bview, cursor, x, y); setCurrentFont(bview); deleteEmptyParagraphMechanism(bview, old_cursor); } @@ -2245,12 +2264,11 @@ void LyXText::setCursorFromCoordinates(BufferView * bview, int x, int y) const void LyXText::setCursorFromCoordinates(BufferView * bview, LyXCursor & cur, int x, int y) const { - /* get the row first */ + // Get the row first. 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); @@ -2325,10 +2343,34 @@ void LyXText::cursorDownParagraph(BufferView * bview) const } } +// 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, LyXCursor const & old_cursor) const { + // don't delete anything if this is the ONLY paragraph! + if (!old_cursor.par()->next() && !old_cursor.par()->previous()) + return; + // Would be wrong to delete anything if we have a selection. if (selection.set()) return; @@ -2372,14 +2414,25 @@ void LyXText::deleteEmptyParagraphMechanism(BufferView * bview, && 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()); + +#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; } } @@ -2389,400 +2442,103 @@ void LyXText::deleteEmptyParagraphMechanism(BufferView * bview, old_cursor.par()->getLayout())).keepempty) return; - LyXCursor tmpcursor; - - if (old_cursor.par() != cursor.par()) { - if ((old_cursor.par()->size() == 0 - || (old_cursor.par()->size() == 1 - && old_cursor.par()->isLineSeparator(0)))) { - // ok, we will delete anything - - // make sure that you do not delete any environments - status = LyXText::NEED_MORE_REFRESH; - deleted = true; + // 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; - 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(); - } - } - 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 - Paragraph * endpar = old_cursor.par()->next(); - if (endpar && endpar->getDepth()) { - while (endpar && endpar->getDepth()) { - endpar = endpar->next(); - } - } - 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()); - } + 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(); } - - // correct cursor y - - setCursorIntern(bview, cursor.par(), cursor.pos()); + } + setUndo(bview, Undo::DELETE, old_cursor.par(), endpar); + cursor = tmpcursor; - if (selection.cursor.par() == old_cursor.par() - && selection.cursor.pos() == selection.cursor.pos()) { - // correct selection - selection.cursor = cursor; + // 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 + Paragraph * endpar = old_cursor.par()->next(); + if (endpar && endpar->getDepth()) { + while (endpar && endpar->getDepth()) { + endpar = endpar->next(); } - } - 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; } - } - } -} - - -Paragraph * LyXText::getParFromID(int id) -{ - Paragraph * 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) { - Paragraph * before = - getParFromID(undo->number_of_before_par); - Paragraph * behind = - getParFromID(undo->number_of_behind_par); - Paragraph * tmppar; - Paragraph * tmppar2; - Paragraph * endpar; - Paragraph * 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 - - Paragraph * tmppar3 = undo->par; - undo->par = 0; // otherwise the undo destructor would delete the paragraph - Paragraph * tmppar4 = tmppar3; + 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()); + } - 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_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()); } } - - // put the new stuff in the list if there is one - if (tmppar3){ - if (before) - before->next(tmppar3); - else - ownerParagraph(tmppar3); - tmppar3->previous(before); - } else { - if (!before) - ownerParagraph(behind); - } - if (tmppar4) { - tmppar4->next(behind); - if (behind) - behind->previous(tmppar4); - } - - - // Set the cursor for redoing - if (before) { - setCursorIntern(bview, before, 0); - } + + // correct cursor y + setCursorIntern(bview, cursor.par(), cursor.pos()); - // calculate the endpar for redoing the paragraphs. - if (behind) { - endpar = behind->next(); - } 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()); + if (selection.cursor.par() == old_cursor.par() + && selection.cursor.pos() == selection.cursor.pos()) { + // correct selection + 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() -{ - if (inset_owner) - return; - // this is dangerous and for internal use only - undo_frozen = true; -} - - -void LyXText::unFreezeUndo() -{ - if (inset_owner) - return; - // this is dangerous and for internal use only - undo_frozen = false; -} - - -void LyXText::setUndo(Buffer * buf, Undo::undo_kind kind, - Paragraph const * before, - Paragraph const * behind) const -{ - if (inset_owner) - return; - if (!undo_frozen) - buf->undostack.push(createUndo(buf, kind, before, behind)); - buf->redostack.clear(); -} - - -void LyXText::setRedo(Buffer * buf, Undo::undo_kind kind, - Paragraph const * before, Paragraph const * behind) -{ - if (inset_owner) - return; - buf->redostack.push(createUndo(buf, kind, before, behind)); -} - - -Undo * LyXText::createUndo(Buffer * buf, Undo::undo_kind kind, - Paragraph const * before, - Paragraph const * behind) 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; + 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; } } - // create a new Undo - Paragraph * undopar; - - Paragraph * start = 0; - Paragraph * end = 0; - - if (before) - start = const_cast(before->next()); - else - start = firstParagraph(); - if (behind) - end = const_cast(behind->previous()); - else { - end = firstParagraph(); - while (end->next()) - end = end->next(); - } - if (start && end && (start != end->next()) && - ((before != behind) || (!before && !behind))) { - Paragraph * tmppar = start; - Paragraph * tmppar2 = new Paragraph(*tmppar); - 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(new Paragraph(*tmppar)); - 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) - - int cursor_par = cursor.par()->id(); - int cursor_pos = cursor.pos(); - - 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, - cursor.par()->previous(), - cursor.par()->next()); } @@ -2793,13 +2549,14 @@ void LyXText::toggleAppendix(BufferView * bview) // ensure that we have only one start_of_appendix in this document Paragraph * tmp = firstParagraph(); - for (; tmp; tmp = tmp->next()) + for (; tmp; tmp = tmp->next()) { tmp->params().startOfAppendix(false); - + } + par->params().startOfAppendix(start); // we can set the refreshing parameters now - status = LyXText::NEED_MORE_REFRESH; + status(bview, LyXText::NEED_MORE_REFRESH); refresh_y = 0; refresh_row = 0; // not needed for full update updateCounters(bview, 0); @@ -2809,18 +2566,71 @@ void LyXText::toggleAppendix(BufferView * bview) Paragraph * LyXText::ownerParagraph() const { - if (inset_owner) - return inset_owner->par; - + if (inset_owner) { + return inset_owner->paragraph(); + } return bv_owner->buffer()->paragraph; } -Paragraph * LyXText::ownerParagraph(Paragraph * p) const +void LyXText::ownerParagraph(Paragraph * p) const { - if (inset_owner) - inset_owner->par = p; - else + if (inset_owner) { + inset_owner->paragraph(p); + } else { bv_owner->buffer()->paragraph = p; - return 0; + } +} + + +void LyXText::ownerParagraph(int id, Paragraph * p) const +{ + 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; + } + } +} + + +LyXText::text_status LyXText::status() const +{ + return status_; +} + + +void LyXText::status(BufferView * bview, LyXText::text_status st) const +{ + // 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?! + + 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(); + } + } + } }