X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsettext.C;h=8889f2869eaf74df095728353ab3e7f85d664d23;hb=4a5b7a5952ad2381fcdf4830511293e184c7c5a1;hp=3bd324d4676acf2006294d2b0c98aaad2d503cf6;hpb=12d3ca28862982e724d8d542d88e72a7e19ded6c;p=lyx.git diff --git a/src/insets/insettext.C b/src/insets/insettext.C index 3bd324d467..8889f2869e 100644 --- a/src/insets/insettext.C +++ b/src/insets/insettext.C @@ -10,12 +10,6 @@ #include -#include -#include - -#include -//#include - #ifdef __GNUG__ #pragma implementation #endif @@ -29,18 +23,14 @@ #include "buffer.h" #include "LyXView.h" #include "BufferView.h" -#include "layout.h" +#include "lyxtextclasslist.h" #include "LaTeXFeatures.h" #include "Painter.h" -#include "frontends/Alert.h" #include "lyxtext.h" #include "lyxcursor.h" #include "CutAndPaste.h" #include "font.h" #include "LColor.h" -#include "support/textutils.h" -#include "support/LAssert.h" -#include "support/lstrings.h" #include "lyxrow.h" #include "lyxrc.h" #include "intl.h" @@ -53,6 +43,18 @@ #include "undo_funcs.h" #include "lyxfind.h" +#include "frontends/Alert.h" + +#include "support/textutils.h" +#include "support/LAssert.h" +#include "support/lstrings.h" +#include "support/lyxalgo.h" // lyx::count + +#include +#include +#include +//#include + using std::ostream; using std::ifstream; using std::endl; @@ -60,6 +62,7 @@ using std::min; using std::max; using std::make_pair; using std::vector; +using std::pair; using lyx::pos_type; using lyx::layout_type; @@ -261,7 +264,7 @@ void InsetText::read(Buffer const * buf, LyXLex & lex) continue; if (token == "\\end_inset") { #ifndef NO_COMPABILITY - const_cast(buf)->insertErtContents(par, pos, font, false); + const_cast(buf)->insertErtContents(par, pos, false); #endif break; } @@ -292,29 +295,17 @@ void InsetText::read(Buffer const * buf, LyXLex & lex) int InsetText::ascent(BufferView * bv, LyXFont const &) const { - bool clear = false; - if (!lt) { - lt = getLyXText(bv); - clear = true; - } - insetAscent = lt->firstRow()->ascent_of_text() + TEXT_TO_INSET_OFFSET; - if (clear) - lt = 0; + insetAscent = getLyXText(bv)->firstRow()->ascent_of_text() + + TEXT_TO_INSET_OFFSET; return insetAscent; } int InsetText::descent(BufferView * bv, LyXFont const &) const { - bool clear = false; - if (!lt) { - lt = getLyXText(bv); - clear = true; - } - insetDescent = lt->height - lt->firstRow()->ascent_of_text() + + LyXText * llt = getLyXText(bv); + insetDescent = llt->height - llt->firstRow()->ascent_of_text() + TEXT_TO_INSET_OFFSET; - if (clear) - lt = 0; return insetDescent; } @@ -360,29 +351,29 @@ void InsetText::draw(BufferView * bv, LyXFont const & f, int old_x = top_x; if (top_x != int(x)) { top_x = int(x); + topx_set = true; int nw = getMaxWidth(bv, this); if (nw > 0 && old_max_width != nw) { need_update = INIT; old_max_width = nw; bv->text->status(bv, LyXText::CHANGED_IN_DRAW); - topx_set = true; return; - } else { - top_x = old_x; } } + // call these methods so that insetWidth, insetAscent and + // insetDescent have the right values. + width(bv, f); + ascent(bv, f); + descent(bv, f); + // repaint the background if needed if (cleared && backgroundColor() != LColor::background) { - top_x = int(x); clearInset(bv, baseline, cleared); - top_x = old_x; } // no draw is necessary !!! if ((drawFrame_ == LOCKED) && !locked && !par->size()) { - top_x = int(x); - topx_set = true; top_baseline = baseline; x += width(bv, f); if (need_update & CLEAR_FRAME) @@ -396,14 +387,15 @@ void InsetText::draw(BufferView * bv, LyXFont const & f, x += static_cast(scroll()); // if top_x differs we did it already - if (!cleared && (top_x == int(x)) + if (!cleared && (old_x == int(x)) && ((need_update&(INIT|FULL)) || (top_baseline != baseline) - ||(last_drawn_width != insetWidth))) { - clearInset(bv, baseline, cleared); + ||(last_drawn_width != insetWidth))) + { + // Condition necessary to eliminate bug 59 attachment 37 + if (baseline > 0) + clearInset(bv, baseline, cleared); } - top_x = int(x); - topx_set = true; if (cleared) frame_is_visible = false; @@ -413,12 +405,6 @@ void InsetText::draw(BufferView * bv, LyXFont const & f, return; } - // call these methods so that insetWidth, insetAscent and - // insetDescent have the right values. - width(bv, f); - ascent(bv, f); - descent(bv, f); - top_baseline = baseline; top_y = baseline - insetAscent; @@ -507,7 +493,6 @@ void InsetText::draw(BufferView * bv, LyXFont const & f, } else if (need_update != INIT) { need_update = NONE; } - if (clear) lt = 0; } @@ -521,8 +506,7 @@ void InsetText::drawFrame(Painter & pain, bool cleared) const frame_y = top_baseline - insetAscent + ttoD2; frame_w = insetWidth - TEXT_TO_INSET_OFFSET; frame_h = insetAscent + insetDescent - TEXT_TO_INSET_OFFSET; - pain.rectangle(frame_x, frame_y, - frame_w, frame_h, + pain.rectangle(frame_x, frame_y, frame_w, frame_h, frame_color); frame_is_visible = true; } @@ -571,18 +555,6 @@ void InsetText::update(BufferView * bv, LyXFont const & font, bool reinit) lt = getLyXText(bv); clear = true; } -#if 0 - int oldw = insetWidth; - insetWidth = lt->width + (2 * TEXT_TO_INSET_OFFSET); - if (oldw != insetWidth) { - resizeLyXText(bv); - need_update |= FULL; - if (clear) - lt = 0; - in_update = false; - return; - } -#endif if ((need_update & CURSOR_PAR) && (lt->status() == LyXText::UNCHANGED) && the_locking_inset) { @@ -598,36 +570,34 @@ void InsetText::update(BufferView * bv, LyXFont const & font, bool reinit) void InsetText::setUpdateStatus(BufferView * bv, int what) const { - bool clear = false; - if (!lt) { - lt = getLyXText(bv); - clear = true; - } + // this does nothing dangerous so use only a localized buffer + LyXText * llt = getLyXText(bv); + need_update |= what; // we have to redraw us full if our LyXText NEEDS_MORE_REFRES or // if we don't break row so that we only have one row to update! - if ((lt->status() == LyXText::NEED_MORE_REFRESH) || + if ((llt->status() == LyXText::NEED_MORE_REFRESH) || (!autoBreakRows && - (lt->status() == LyXText::NEED_VERY_LITTLE_REFRESH))) + (llt->status() == LyXText::NEED_VERY_LITTLE_REFRESH))) { need_update |= FULL; - } else if (lt->status() == LyXText::NEED_VERY_LITTLE_REFRESH) { + } else if (llt->status() == LyXText::NEED_VERY_LITTLE_REFRESH) { need_update |= CURSOR_PAR; } // this to not draw a selection when we redraw all of it! if (need_update & CURSOR && !(need_update & SELECTION)) { - if (lt->selection.set()) + if (llt->selection.set()) need_update = FULL; - lt->clearSelection(); + llt->clearSelection(); } - if (clear) - lt = 0; } void InsetText::updateLocal(BufferView * bv, int what, bool mark_dirty) const { + if (!autoBreakRows && par->next()) + collapseParagraphs(bv->buffer()->params); bool clear = false; if (!lt) { lt = getLyXText(bv); @@ -635,20 +605,24 @@ void InsetText::updateLocal(BufferView * bv, int what, bool mark_dirty) const } lt->fullRebreak(bv); setUpdateStatus(bv, what); - if (((need_update != CURSOR) && (need_update != NONE)) || - (lt->status() != LyXText::UNCHANGED) || lt->selection.set()) - { + bool flag = (((need_update != CURSOR) && (need_update != NONE)) || + (lt->status() != LyXText::UNCHANGED) || lt->selection.set()); + if (clear) + lt = 0; + if (flag) bv->updateInset(const_cast(this), mark_dirty); - } + else + bv->fitCursor(); + if (need_update == CURSOR) need_update = NONE; bv->owner()->showState(); + bv->owner()->updateMenubar(); + bv->owner()->updateToolbar(); if (old_par != cpar(bv)) { bv->owner()->setLayout(cpar(bv)->getLayout()); old_par = cpar(bv); } - if (clear) - lt = 0; } @@ -678,25 +652,28 @@ void InsetText::edit(BufferView * bv, int x, int y, unsigned int button) lt = getLyXText(bv); clear = true; } - if (!checkAndActivateInset(bv, x, tmp_y, button)) lt->setCursorFromCoordinates(bv, x - drawTextXOffset, y + insetAscent); lt->clearSelection(); finishUndo(); - showInsetCursor(bv); - updateLocal(bv, CURSOR, false); - // If the inset is empty set the language of the current font to the // language to the surronding text (if different). if (par->size() == 0 && !par->next() && - bv->getParentLanguage(this) != lt->current_font.language()) { + bv->getParentLanguage(this) != lt->current_font.language()) + { LyXFont font(LyXFont::ALL_IGNORE); font.setLanguage(bv->getParentLanguage(this)); setFont(bv, font, false); } + showInsetCursor(bv); if (clear) lt = 0; + + int code = CURSOR; + if (drawFrame_ == LOCKED) + code = CURSOR|DRAW_FRAME; + updateLocal(bv, code, false); } @@ -730,9 +707,6 @@ void InsetText::edit(BufferView * bv, bool front) } lt->clearSelection(); finishUndo(); - showInsetCursor(bv); - updateLocal(bv, CURSOR, false); - // If the inset is empty set the language of the current font to the // language to the surronding text (if different). if (par->size() == 0 && !par->next() && @@ -741,8 +715,13 @@ void InsetText::edit(BufferView * bv, bool front) font.setLanguage(bv->getParentLanguage(this)); setFont(bv, font, false); } + showInsetCursor(bv); if (clear) lt = 0; + int code = CURSOR; + if (drawFrame_ == LOCKED) + code = CURSOR|DRAW_FRAME; + updateLocal(bv, code, false); } @@ -775,9 +754,9 @@ void InsetText::insetUnlock(BufferView * bv) bv->owner()->setLayout(bv->text->cursor.par()->getLayout()); // hack for deleteEmptyParMech lt->setCursor(bv, par, 0); - updateLocal(bv, code, false); if (clear) lt = 0; + updateLocal(bv, code, false); } void InsetText::lockInset(BufferView * bv, UpdatableInset * inset) @@ -813,7 +792,8 @@ bool InsetText::lockInsetInInset(BufferView * bv, UpdatableInset * inset) return true; } if ((*it)->getInsetFromID(id)) { - lockInset(bv, static_cast(*it)); + getLyXText(bv)->setCursorIntern(bv, p, it.getPos()); + (*it)->edit(bv); return the_locking_inset->lockInsetInInset(bv, inset); } } @@ -843,7 +823,7 @@ bool InsetText::lockInsetInInset(BufferView * bv, UpdatableInset * inset) bool InsetText::unlockInsetInInset(BufferView * bv, UpdatableInset * inset, - bool lr) + bool lr) { if (!the_locking_inset) return false; @@ -866,6 +846,10 @@ bool InsetText::unlockInsetInInset(BufferView * bv, UpdatableInset * inset, bool InsetText::updateInsetInInset(BufferView * bv, Inset * inset) { + if (!autoBreakRows && par->next()) + collapseParagraphs(bv->buffer()->params); + if (inset == this) + return true; bool clear = false; if (!lt) { lt = getLyXText(bv); @@ -880,10 +864,6 @@ bool InsetText::updateInsetInInset(BufferView * bv, Inset * inset) return found; } if (the_locking_inset != inset) { -#if 0 - lt->updateInset(bv, the_locking_inset); - setUpdateStatus(bv, CURSOR_PAR); -#endif bool found = the_locking_inset->updateInsetInInset(bv, inset); if (clear) lt = 0; @@ -896,9 +876,6 @@ bool InsetText::updateInsetInInset(BufferView * bv, Inset * inset) lt = 0; if (found) { setUpdateStatus(bv, CURSOR_PAR); -#if 0 - updateLocal(bv, CURSOR_PAR, false); -#endif if (cpar(bv) == inset_par && cpos(bv) == inset_pos) { inset_x = cx(bv) - top_x + drawTextXOffset; inset_y = cy(bv) + drawTextYOffset; @@ -912,6 +889,10 @@ void InsetText::insetButtonPress(BufferView * bv, int x, int y, int button) { no_selection = true; + // use this to check mouse motion for selection! + mouse_x = x; + mouse_y = y; + int tmp_x = x - drawTextXOffset; int tmp_y = y + insetAscent - getLyXText(bv)->first; Inset * inset = bv->checkInsetHit(getLyXText(bv), tmp_x, tmp_y); @@ -919,7 +900,10 @@ void InsetText::insetButtonPress(BufferView * bv, int x, int y, int button) hideInsetCursor(bv); if (the_locking_inset) { if (the_locking_inset == inset) { - the_locking_inset->insetButtonPress(bv,x-inset_x,y-inset_y,button); + the_locking_inset->insetButtonPress(bv, + x - inset_x, + y - inset_y, + button); no_selection = false; return; } else if (inset) { @@ -927,8 +911,9 @@ void InsetText::insetButtonPress(BufferView * bv, int x, int y, int button) the_locking_inset->insetUnlock(bv); inset_x = cx(bv) - top_x + drawTextXOffset; inset_y = cy(bv) + drawTextYOffset; - the_locking_inset = static_cast(inset); - inset->insetButtonPress(bv, x - inset_x, y - inset_y, button); + the_locking_inset = 0; + inset->insetButtonPress(bv, x - inset_x, + y - inset_y, button); inset->edit(bv, x - inset_x, y - inset_y, button); if (the_locking_inset) updateLocal(bv, CURSOR, false); @@ -968,15 +953,23 @@ void InsetText::insetButtonPress(BufferView * bv, int x, int y, int button) lt = getLyXText(bv); clear = true; } - lt->setCursorFromCoordinates(bv, x-drawTextXOffset, y + insetAscent); + + lt->setCursorFromCoordinates(bv, x - drawTextXOffset, + y + insetAscent); // set the selection cursor! lt->selection.cursor = lt->cursor; lt->cursor.x_fix(lt->cursor.x()); + if (lt->selection.set()) { lt->clearSelection(); + if (clear) + lt = 0; updateLocal(bv, FULL, false); } else { lt->clearSelection(); + if (clear) + lt = 0; + updateLocal(bv, CURSOR, false); } bv->owner()->setLayout(cpar(bv)->getLayout()); old_par = cpar(bv); @@ -990,10 +983,8 @@ void InsetText::insetButtonPress(BufferView * bv, int x, int y, int button) localDispatch(bv, LFUN_PASTESELECTION, "paragraph"); } - if (clear) - lt = 0; } else { - lt->clearSelection(); + getLyXText(bv)->clearSelection(); } showInsetCursor(bv); no_selection = false; @@ -1031,7 +1022,7 @@ bool InsetText::insetButtonRelease(BufferView * bv, int x, int y, int button) void InsetText::insetMotionNotify(BufferView * bv, int x, int y, int state) { - if (no_selection) + if (no_selection || ((mouse_x == x) && (mouse_y == y))) return; if (the_locking_inset) { the_locking_inset->insetMotionNotify(bv, x - inset_x, @@ -1046,17 +1037,20 @@ void InsetText::insetMotionNotify(BufferView * bv, int x, int y, int state) hideInsetCursor(bv); LyXCursor cur = lt->cursor; lt->setCursorFromCoordinates(bv, x - drawTextXOffset, y + insetAscent); - if (cur == lt->cursor) + if (cur == lt->cursor) { + if (clear) + lt = 0; return; + } lt->setSelection(bv); - if (lt->toggle_cursor.par() != lt->toggle_end_cursor.par() || - lt->toggle_cursor.pos() != lt->toggle_end_cursor.pos()) - { + bool flag = (lt->toggle_cursor.par() != lt->toggle_end_cursor.par() || + lt->toggle_cursor.pos() != lt->toggle_end_cursor.pos()); + if (clear) + lt = 0; + if (flag) { updateLocal(bv, SELECTION, false); } showInsetCursor(bv); - if (clear) - lt = 0; } @@ -1093,7 +1087,7 @@ InsetText::localDispatch(BufferView * bv, updateLocal(bv, CURSOR_PAR, false); return result; } else if (result >= FINISHED) { - switch(result) { + switch (result) { case FINISHED_RIGHT: moveRightIntern(bv, false, false); result = DISPATCHED; @@ -1127,6 +1121,8 @@ InsetText::localDispatch(BufferView * bv, lt = getLyXText(bv); clear = true; } + int updwhat = 0; + int updflag = false; switch (action) { // Normal chars case LFUN_SELFINSERT: @@ -1155,7 +1151,8 @@ InsetText::localDispatch(BufferView * bv, } } lt->selection.cursor = lt->cursor; - updateLocal(bv, CURSOR_PAR, true); + updwhat = CURSOR_PAR; + updflag = true; result = DISPATCHED_NOUPDATE; break; // --- Cursor Movements ----------------------------------- @@ -1163,54 +1160,54 @@ InsetText::localDispatch(BufferView * bv, finishUndo(); moveRight(bv, false, true); lt->setSelection(bv); - updateLocal(bv, SELECTION, false); + updwhat = SELECTION; break; case LFUN_RIGHT: result = moveRight(bv); finishUndo(); - updateLocal(bv, CURSOR, false); + updwhat = CURSOR; break; case LFUN_LEFTSEL: finishUndo(); moveLeft(bv, false, true); lt->setSelection(bv); - updateLocal(bv, SELECTION, false); + updwhat = SELECTION; break; case LFUN_LEFT: finishUndo(); result = moveLeft(bv); - updateLocal(bv, CURSOR, false); + updwhat = CURSOR; break; case LFUN_DOWNSEL: finishUndo(); moveDown(bv); lt->setSelection(bv); - updateLocal(bv, SELECTION, false); + updwhat = SELECTION; break; case LFUN_DOWN: finishUndo(); result = moveDown(bv); - updateLocal(bv, CURSOR, false); + updwhat = CURSOR; break; case LFUN_UPSEL: finishUndo(); moveUp(bv); lt->setSelection(bv); - updateLocal(bv, SELECTION, false); + updwhat = SELECTION; break; case LFUN_UP: finishUndo(); result = moveUp(bv); - updateLocal(bv, CURSOR, false); + updwhat = CURSOR; break; case LFUN_HOME: finishUndo(); lt->cursorHome(bv); - updateLocal(bv, CURSOR, false); + updwhat = CURSOR; break; case LFUN_END: lt->cursorEnd(bv); - updateLocal(bv, CURSOR, false); + updwhat = CURSOR; break; case LFUN_BACKSPACE: { setUndo(bv, Undo::DELETE, @@ -1219,7 +1216,8 @@ InsetText::localDispatch(BufferView * bv, lt->cutSelection(bv); else lt->backspace(bv); - updateLocal(bv, CURSOR_PAR, true); + updwhat = CURSOR_PAR; + updflag = true; } break; @@ -1231,7 +1229,8 @@ InsetText::localDispatch(BufferView * bv, } else { lt->Delete(bv); } - updateLocal(bv, CURSOR_PAR, true); + updwhat = CURSOR_PAR; + updflag = true; } break; @@ -1239,14 +1238,15 @@ InsetText::localDispatch(BufferView * bv, setUndo(bv, Undo::DELETE, lt->cursor.par(), lt->cursor.par()->next()); lt->cutSelection(bv); - updateLocal(bv, CURSOR_PAR, true); + updwhat = CURSOR_PAR; + updflag = true; } break; case LFUN_COPY: finishUndo(); lt->copySelection(bv); - updateLocal(bv, CURSOR_PAR, false); + updwhat = CURSOR_PAR; break; case LFUN_PASTESELECTION: { @@ -1259,7 +1259,8 @@ InsetText::localDispatch(BufferView * bv, } else { lt->insertStringAsLines(bv, clip); } - updateLocal(bv, CURSOR_PAR, true); + updwhat = CURSOR_PAR; + updflag = true; break; } case LFUN_PASTE: { @@ -1275,7 +1276,8 @@ InsetText::localDispatch(BufferView * bv, setUndo(bv, Undo::INSERT, lt->cursor.par(), lt->cursor.par()->next()); lt->pasteSelection(bv); - updateLocal(bv, CURSOR_PAR, true); + updwhat = CURSOR_PAR; + updflag = true; } break; @@ -1285,7 +1287,8 @@ InsetText::localDispatch(BufferView * bv, break; } lt->breakParagraph(bv, 0); - updateLocal(bv, FULL, true); + updwhat = FULL; + updflag = true; break; case LFUN_BREAKPARAGRAPHKEEPLAYOUT: if (!autoBreakRows) { @@ -1293,7 +1296,8 @@ InsetText::localDispatch(BufferView * bv, break; } lt->breakParagraph(bv, 1); - updateLocal(bv, FULL, true); + updwhat = FULL; + updflag = true; break; case LFUN_BREAKLINE: { @@ -1304,7 +1308,8 @@ InsetText::localDispatch(BufferView * bv, setUndo(bv, Undo::INSERT, lt->cursor.par(), lt->cursor.par()->next()); lt->insertChar(bv, Paragraph::META_NEWLINE); - updateLocal(bv, CURSOR_PAR, true); + updwhat = CURSOR_PAR; + updflag = true; } break; @@ -1316,7 +1321,7 @@ InsetText::localDispatch(BufferView * bv, // Derive layout number from given argument (string) // and current buffer's textclass (number). */ textclass_type tclass = bv->buffer()->params.textclass; - std::pair layout = + pair layout = textclasslist.NumberOfLayout(tclass, arg); // If the entry is obsolete, use the new one instead. @@ -1338,7 +1343,8 @@ InsetText::localDispatch(BufferView * bv, cur_layout = layout.second; lt->setLayout(bv, layout.second); bv->owner()->setLayout(cpar(bv)->getLayout()); - updateLocal(bv, CURSOR_PAR, true); + updwhat = CURSOR_PAR; + updflag = true; } } else { // reset the layout box @@ -1386,7 +1392,8 @@ InsetText::localDispatch(BufferView * bv, } if (cur_spacing != new_spacing || cur_value != new_value) { par->params().spacing(Spacing(new_spacing, new_value)); - updateLocal(bv, CURSOR_PAR, true); + updwhat = CURSOR_PAR; + updflag = true; } } break; @@ -1397,6 +1404,10 @@ InsetText::localDispatch(BufferView * bv, break; } + if (clear) + lt = 0; + if (updwhat > 0) + updateLocal(bv, updwhat, updflag); /// If the action has deleted all text in the inset, we need to change the // language to the language of the surronding text. if (!was_empty && par->size() == 0 && !par->next()) { @@ -1409,8 +1420,6 @@ InsetText::localDispatch(BufferView * bv, showInsetCursor(bv); } else bv->unlockInset(this); - if (clear) - lt = 0; return result; } @@ -1429,8 +1438,8 @@ int InsetText::ascii(Buffer const * buf, ostream & os, int linelen) const unsigned int lines = 0; while (p) { - string const tmp = buf->asciiParagraph(p, linelen); - lines += countChar(tmp, '\n'); + string const tmp = buf->asciiParagraph(p, linelen, p->previous()==0); + lines += lyx::count(tmp.begin(), tmp.end(), '\n'); os << tmp; p = p->next(); } @@ -1516,7 +1525,7 @@ int InsetText::docbook(Buffer const * buf, ostream & os) const } if (environment_stack[depth] != style.latexname()) { - if(environment_stack.size() == depth + 1) { + if (environment_stack.size() == depth + 1) { environment_stack.push_back("!-- --"); environment_inner.push_back("!-- --"); } @@ -1539,7 +1548,7 @@ int InsetText::docbook(Buffer const * buf, ostream & os) const if (style.latextype == LATEX_ENVIRONMENT) { if (!style.latexparam().empty()) { - if(style.latexparam() == "CDATA") + if (style.latexparam() == "CDATA") os << "sgmlOpenTag(os, depth + command_depth, @@ -1583,7 +1592,7 @@ int InsetText::docbook(Buffer const * buf, ostream & os) const switch (style.latextype) { case LATEX_ENVIRONMENT: if (!style.latexparam().empty()) { - if(style.latexparam() == "CDATA") + if (style.latexparam() == "CDATA") os << "]]>"; else buf->sgmlCloseTag(os, depth + command_depth, @@ -1811,25 +1820,21 @@ bool InsetText::insertInset(BufferView * bv, Inset * inset) return the_locking_inset->insertInset(bv, inset); return false; } - inset->setOwner(this); - hideInsetCursor(bv); - bool clear = false; if (!lt) { lt = getLyXText(bv); clear = true; } + setUndo(bv, Undo::FINISH, lt->cursor.par(), lt->cursor.par()->next()); + freezeUndo(); + inset->setOwner(this); + hideInsetCursor(bv); lt->insertInset(bv, inset); -#if 0 - if ((!cpar(bv)->isInset(cpos(bv))) || - (cpar(bv)->getInset(cpos(bv)) != inset)) - lt->cursorLeft(bv); -#endif bv->fitCursor(); - updateLocal(bv, CURSOR_PAR|CURSOR, true); -// showInsetCursor(bv); if (clear) lt = 0; + updateLocal(bv, CURSOR_PAR|CURSOR, true); + unFreezeUndo(); return true; } @@ -1878,16 +1883,16 @@ bool InsetText::showInsetDialog(BufferView * bv) const } -std::vector const InsetText::getLabelList() const +vector const InsetText::getLabelList() const { - std::vector label_list; + vector label_list; Paragraph * tpar = par; while (tpar) { Paragraph::inset_iterator beg = tpar->inset_iterator_begin(); Paragraph::inset_iterator end = tpar->inset_iterator_end(); for (; beg != end; ++beg) { - std::vector const l = (*beg)->getLabelList(); + vector const l = (*beg)->getLabelList(); label_list.insert(label_list.end(), l.begin(), l.end()); } tpar = tpar->next(); @@ -1921,12 +1926,13 @@ void InsetText::setFont(BufferView * bv, LyXFont const & font, bool toggleall, if (selectall) lt->clearSelection(); bv->fitCursor(); - if (selectall || lt->selection.set()) + bool flag = (selectall || lt->selection.set()); + if (clear) + lt = 0; + if (flag) updateLocal(bv, FULL, true); else updateLocal(bv, CURSOR_PAR, true); - if (clear) - lt = 0; } @@ -2071,21 +2077,15 @@ void InsetText::setFrameColor(BufferView * bv, LColor::color col) int InsetText::cx(BufferView * bv) const { - bool clear = false; - if (!lt) { - lt = getLyXText(bv); - clear = true; - } - int x = lt->cursor.x() + top_x + TEXT_TO_INSET_OFFSET; + // we do nothing dangerous so we use a local cache + LyXText * llt = getLyXText(bv); + int x = llt->cursor.x() + top_x + TEXT_TO_INSET_OFFSET; if (the_locking_inset) { - LyXFont font = lt->getFont(bv->buffer(), - lt->cursor.par(), - lt->cursor.pos()); + LyXFont font = llt->getFont(bv->buffer(), llt->cursor.par(), + llt->cursor.pos()); if (font.isVisibleRightToLeft()) x -= the_locking_inset->width(bv, font); } - if (clear) - lt = 0; return x; } @@ -2127,7 +2127,7 @@ LyXText * InsetText::getLyXText(BufferView const * lbv, if (!recursive && (cached_bview == lbv)) { LyXText * lt = cached_text.get(); lyx::Assert(lt && lt->firstRow()->par() == par); - return cached_text.get(); + return lt; } // Super UGLY! (Lgb) @@ -2137,26 +2137,41 @@ LyXText * InsetText::getLyXText(BufferView const * lbv, Cache::iterator it = cache.find(bv); if (it != cache.end()) { - if (do_reinit) + if (do_reinit) { reinitLyXText(); - else if (do_resize) + } else if (do_resize) { resizeLyXText(do_resize); - if (lt || !it->second.remove) { - lyx::Assert(it->second.text.get()); - cached_text = it->second.text; - if (recursive && the_locking_inset) { - return the_locking_inset->getLyXText(bv, true); - } - return cached_text.get(); - } else if (it->second.remove) { - if (locked) { - saveLyXTextState(it->second.text.get()); - } else { - sstate.lpar = 0; + } else { + if (lt || !it->second.remove) { + lyx::Assert(it->second.text.get()); + cached_text = it->second.text; + if (recursive && the_locking_inset) { + return the_locking_inset->getLyXText(bv, true); + } + return cached_text.get(); + } else if (it->second.remove) { + if (locked) { + saveLyXTextState(it->second.text.get()); + } else { + sstate.lpar = 0; + } } + // + // when we have to reinit the existing LyXText! + // + it->second.text->init(bv); + restoreLyXTextState(bv, it->second.text.get()); + it->second.remove = false; + } + cached_text = it->second.text; + if (the_locking_inset && recursive) { + return the_locking_inset->getLyXText(bv); } + return cached_text.get(); } - + /// + // we are here only if we don't have a BufferView * in the cache!!! + /// cached_text.reset(new LyXText(const_cast(this))); cached_text->init(bv); restoreLyXTextState(bv, cached_text.get()); @@ -2203,8 +2218,14 @@ void InsetText::resizeLyXText(BufferView * bv, bool force) const } do_resize = 0; // lyxerr << "InsetText::resizeLyXText\n"; - if (!par->next() && !par->size()) // no data, resize not neccessary! + if (!par->next() && !par->size()) { // no data, resize not neccessary! + // we have to do this as a fixed width may have changed! + LyXText * t = getLyXText(bv); + saveLyXTextState(t); + t->init(bv, true); + restoreLyXTextState(bv, t); return; + } // one endless line, resize normally not necessary if (!force && getMaxWidth(bv, this) < 0) return; @@ -2340,10 +2361,9 @@ void InsetText::clearSelection(BufferView * bv) void InsetText::clearInset(BufferView * bv, int baseline, bool & cleared) const { - LyXFont dummy; Painter & pain = bv->painter(); int w = insetWidth; - int h = ascent(bv, dummy) + descent(bv, dummy); + int h = insetAscent + insetDescent; int ty = baseline - insetAscent; if (ty < 0) { @@ -2481,9 +2501,7 @@ string const InsetText::selectNextWordToSpellcheck(BufferView * bv, float & valu lt = 0; return str; } -#warning Dekel please have a look on this one RTL? (Jug) -#warning DEKEL! - // we have to go on checking so move cusor to the right + // we have to go on checking so move cusor to the next char lt->cursor.pos(lt->cursor.pos() + 1); } str = lt->selectNextWordToSpellcheck(bv, value); @@ -2540,7 +2558,7 @@ void InsetText::toggleSelection(BufferView * bv, bool kill_selection) bool InsetText::searchForward(BufferView * bv, string const & str, - bool const & cs, bool const & mw) + bool cs, bool mw) { if (the_locking_inset) { if (the_locking_inset->searchForward(bv, str, cs, mw)) @@ -2578,7 +2596,7 @@ bool InsetText::searchForward(BufferView * bv, string const & str, } bool InsetText::searchBackward(BufferView * bv, string const & str, - bool const & cs, bool const & mw) + bool cs, bool mw) { if (the_locking_inset) if (the_locking_inset->searchBackward(bv, str, cs, mw)) @@ -2598,3 +2616,14 @@ bool InsetText::checkInsertChar(LyXFont & font) return owner()->checkInsertChar(font); return true; } + + +void InsetText::collapseParagraphs(BufferParams const & bparams) const +{ + while(par->next()) { + if (!par->isSeparator(par->size()-1)) + par->insertChar(par->size()-1, ' '); + par->pasteParagraph(bparams); + } + reinitLyXText(); +}