]> git.lyx.org Git - lyx.git/blobdiff - src/insets/insettext.C
patch from Dekel, change lyxformat to int
[lyx.git] / src / insets / insettext.C
index 44d51639331f8751bd02b3dc93a7a63e60bd9098..a1f98b51634c6bc2a35215c4e8b531167776bfec 100644 (file)
@@ -38,7 +38,6 @@
 #include "CutAndPaste.h"
 #include "font.h"
 #include "minibuffer.h"
-#include "toolbar.h"
 #include "LColor.h"
 #include "support/textutils.h"
 #include "support/LAssert.h"
@@ -47,6 +46,7 @@
 #include "intl.h"
 #include "trans_mgr.h"
 #include "lyxscreen.h"
+#include "WorkArea.h"
 
 using std::ostream;
 using std::ifstream;
@@ -55,8 +55,8 @@ using std::min;
 using std::max;
 
 extern unsigned char getCurrentTextClass(Buffer *);
-
-#define TEXT(a) getLyXText(a)
+extern bool math_insert_greek(BufferView *, char);
+extern int greek_kb_flag;
 
 InsetText::InsetText()
 {
@@ -81,21 +81,29 @@ InsetText & InsetText::operator=(InsetText const & it)
     return * this;
 }
 
+
 void InsetText::init(InsetText const * ins)
 {
-    insetAscent = insetDescent = insetWidth = 0;
+    top_y = 0;
+    last_width = 0;
+    last_height = 0;
+    insetAscent = 0;
+    insetDescent = 0;
+    insetWidth = 0;
     the_locking_inset = 0;
     cursor_visible = false;
     interline_space = 1;
     no_selection = false;
     need_update = INIT;
-    drawTextXOffset = drawTextYOffset = 0;
-    autoBreakRows = drawLockedFrame = false;
+    drawTextXOffset = 0;
+    drawTextYOffset = 0;
+    autoBreakRows = false;
+    drawFrame = NEVER;
     xpos = 0.0;
     if (ins) {
        SetParagraphData(ins->par);
        autoBreakRows = ins->autoBreakRows;
-       drawLockedFrame = ins->drawLockedFrame;
+       drawFrame = ins->drawFrame;
     }
     par->SetInsetOwner(this);
     frame_color = LColor::insetframe;
@@ -106,8 +114,13 @@ void InsetText::init(InsetText const * ins)
 
 InsetText::~InsetText()
 {
-    LyXParagraph * p;
-    p = par->next;
+    // delete all instances of LyXText before deleting the paragraps used
+    // by it.
+    for (Cache::iterator cit = cache.begin(); cit != cache.end(); ++cit){
+       delete (*cit).second;
+       (*cit).second = 0;
+    }
+    LyXParagraph * p = par->next;
     delete par;
     while(p) {
        par = p;
@@ -117,7 +130,26 @@ InsetText::~InsetText()
 }
 
 
-Inset * InsetText::Clone() const
+void InsetText::clear()
+{
+    // delete all instances of LyXText before deleting the paragraps used
+    // by it.
+    for (Cache::iterator cit = cache.begin(); cit != cache.end(); ++cit){
+       delete (*cit).second;
+       (*cit).second = 0;
+    }
+    LyXParagraph * p = par->next;
+    delete par;
+    while(p) {
+       par = p;
+       p = p->next;
+       delete par;
+    }
+    par = new LyXParagraph();
+}
+
+
+Inset * InsetText::Clone(Buffer const &) const
 {
     InsetText * t = new InsetText(*this);
     return t;
@@ -139,16 +171,24 @@ void InsetText::WriteParagraphData(Buffer const * buf, ostream & os) const
 
 void InsetText::Read(Buffer const * buf, LyXLex & lex)
 {
-    string token, tmptok;
+    string token;
     int pos = 0;
     LyXParagraph * return_par = 0;
     char depth = 0; // signed or unsigned?
+#ifndef NEW_INSETS
     LyXParagraph::footnote_flag footnoteflag = LyXParagraph::NO_FOOTNOTE;
     LyXParagraph::footnote_kind footnotekind = LyXParagraph::FOOTNOTE;
+#endif
     LyXFont font(LyXFont::ALL_INHERIT);
 
-    LyXParagraph * p;
-    p = par->next;
+    // delete all instances of LyXText before deleting the paragraps used
+    // by it.
+    for (Cache::iterator cit = cache.begin(); cit != cache.end(); ++cit){
+       delete (*cit).second;
+       (*cit).second = 0;
+    }
+
+    LyXParagraph * p = par->next;
     delete par;
     while(p) {
        par = p;
@@ -163,10 +203,14 @@ void InsetText::Read(Buffer const * buf, LyXLex & lex)
             continue;
        if (token == "\\end_inset")
            break;
-       if (const_cast<Buffer*>(buf)->parseSingleLyXformat2Token(lex, par, return_par,
-                                           token, pos, depth,
-                                           font, footnoteflag,
-                                           footnotekind)) {
+       if (const_cast<Buffer*>(buf)->
+           parseSingleLyXformat2Token(lex, par, return_par,token, pos, depth,
+                                      font
+#ifndef NEW_INSETS
+                                      , footnoteflag, footnotekind
+#endif
+                                      ))
+       {
            // the_end read this should NEVER happen
            lex.printError("\\the_end read in inset! Error in document!");
            return;
@@ -188,26 +232,37 @@ void InsetText::Read(Buffer const * buf, LyXLex & lex)
 }
 
 
-int InsetText::ascent(Painter &, LyXFont const &) const
+int InsetText::ascent(BufferView * bv, LyXFont const &) const
 {
+    int y_temp = 0;
+    Row * row = TEXT(bv)->GetRowNearY(y_temp);
+    insetAscent = row->ascent_of_text() + TEXT_TO_INSET_OFFSET;
     return insetAscent;
 }
 
 
-int InsetText::descent(Painter &, LyXFont const &) const
+int InsetText::descent(BufferView * bv, LyXFont const &) const
 {
+    int y_temp = 0;
+    Row * row = TEXT(bv)->GetRowNearY(y_temp);
+    insetDescent = TEXT(bv)->height - row->ascent_of_text() +
+       TEXT_TO_INSET_OFFSET;
     return insetDescent;
 }
 
 
-int InsetText::width(Painter &, LyXFont const &) const
+int InsetText::width(BufferView * bv, LyXFont const &) const
 {
+    insetWidth = max(textWidth(bv->painter()),
+                    (int)TEXT(bv)->width + (2 * TEXT_TO_INSET_OFFSET));
     return insetWidth;
 }
 
+
 int InsetText::textWidth(Painter & pain) const
 {
-    return getMaxTextWidth(pain, this) - drawTextXOffset;
+    int w = getMaxWidth(pain, this);
+    return w;
 }
 
 
@@ -216,91 +271,209 @@ void InsetText::draw(BufferView * bv, LyXFont const & f,
 {
     Painter & pain = bv->painter();
 
-    xpos = x;
-    UpdatableInset::draw(bv, f, baseline, x);
-    if (!cleared && locked && ((need_update==FULL) || (top_x!=int(x)) ||
-                  (top_baseline!=baseline))) {
-       need_update = NONE;
+    // no draw is necessary !!!
+    if ((drawFrame == LOCKED) && !locked && !par->size()) {
+       if (!cleared && (need_update == CLEAR_FRAME)) {
+           pain.rectangle(top_x + 1, baseline - insetAscent + 1,
+                          width(bv, f) - 1,
+                          insetAscent + insetDescent - 1,
+                          LColor::background);
+       }
        top_x = int(x);
        top_baseline = baseline;
-       locked = false;
-       bv->updateInset(const_cast<InsetText *>(this), false);
-       locked = true;
-       if (drawLockedFrame)
-               pain.rectangle(top_x, baseline - ascent(pain, f),
-                              width(pain, f), ascent(pain,f)+descent(pain, f),
-                              frame_color);
+       x += width(bv, f);
+       need_update = NONE;
        return;
     }
+
+    xpos = x;
+    UpdatableInset::draw(bv, f, baseline, x, cleared);
+
+    // if top_x differs we have a rule down and we don't have to clear anything
+    if (!cleared && (top_x == int(x)) &&
+       ((need_update==FULL) || (top_baseline!=baseline)))
+    {
+       int w =  insetWidth;
+       int h = insetAscent + insetDescent;
+       int ty = baseline - insetAscent;
+       
+       if (ty < 0) {
+           h += ty;
+           ty = 0;
+       }
+       if ((ty + h) > pain.paperHeight())
+           h = pain.paperHeight();
+       if ((top_x + drawTextXOffset + w) > pain.paperWidth())
+           w = pain.paperWidth();
+       pain.fillRectangle(top_x+drawTextXOffset, ty, w, h);
+       cleared = true;
+       need_update = FULL;
+    }
+    if (!cleared && (need_update == NONE))
+       return;
+
+    if (top_x != int(x)) {
+//     printf("InsetText::draw1 -> INIT(%d)\n",insetWidth);
+       need_update = INIT;
+       top_x = int(x);
+       bv->text->status = LyXText::CHANGED_IN_DRAW;
+       return;
+    }
+
     top_baseline = baseline;
-    top_x = int(x);
+    top_y = baseline - ascent(bv, f);
+    last_width = width(bv, f);
+    last_height = ascent(bv, f) + descent(bv, f);
 
-    if (the_locking_inset && (cpos(bv) == inset_pos)) {
+    if (the_locking_inset && (cpar(bv) == inset_par) && (cpos(bv) == inset_pos)) {
        inset_x = cx(bv) - top_x + drawTextXOffset;
        inset_y = cy(bv) + drawTextYOffset;
     }
-    if (need_update == CURSOR) {
-       x += width(pain, f);
+    if (!cleared && (need_update == CURSOR) && !TEXT(bv)->selection) {
+       x += width(bv, f);
        need_update = NONE;
        return;
     }
-    x += TEXT_TO_INSET_OFFSET; // place for border
-    long int y = 0;
-    Row * row = TEXT(bv)->GetRowNearY(y);
-    y += baseline - row->ascent_of_text() + 1;
-    if (cleared || !locked || (need_update == FULL)) {
-       while (row != 0) {
-           TEXT(bv)->GetVisibleRow(bv, y, x, row, y);
+    x += TEXT_TO_INSET_OFFSET;
+    {
+       int y = 0;
+       Row * row = TEXT(bv)->GetRowNearY(y);
+       int y_offset = baseline - row->ascent_of_text();
+       int ph = pain.paperHeight();
+       int first = 0;
+       y = y_offset;
+       while ((row != 0) && ((y+row->height()) <= 0)) {
            y += row->height();
+           first += row->height();
            row = row->next();
        }
-    } else if (need_update == SELECTION) {
-       bv->screen()->ToggleToggle(getLyXText(bv), y, x);
-    } else {
-       locked = false;
-       bv->screen()->Update(TEXT(bv), y, x);
-       locked = true;
+       if (y_offset < 0)
+           y_offset = y;
+       TEXT(bv)->first = first;
+       if (cleared || !locked || (need_update==FULL) || (need_update==INIT)) {
+           int yf = y_offset;
+           y = 0;
+           while ((row != 0) && (yf < ph)) {
+                   TEXT(bv)->GetVisibleRow(bv, y+y_offset, int(x), row,
+                                           y+first, cleared);
+               y += row->height();
+               yf += row->height();
+               row = row->next();
+           }
+       } else if (need_update == SELECTION) {
+           bv->screen()->ToggleToggle(TEXT(bv), bv, y_offset, int(x));
+       } else {
+           locked = false;
+           if (need_update == CURSOR) {
+               bv->screen()->ToggleSelection(TEXT(bv), bv, true, y_offset,int(x));
+               TEXT(bv)->ClearSelection();
+               TEXT(bv)->sel_cursor = TEXT(bv)->cursor;
+           }
+           bv->screen()->Update(TEXT(bv), bv, y_offset, int(x));
+           locked = true;
+       }
     }
     TEXT(bv)->refresh_y = 0;
     TEXT(bv)->status = LyXText::UNCHANGED;
-    if (drawLockedFrame && locked) {
-           pain.rectangle(top_x, baseline - ascent(pain, f), width(pain, f),
-                          ascent(pain,f) + descent(pain, f), frame_color);
-    } else {
-           pain.rectangle(top_x, baseline - ascent(pain, f), width(pain, f),
-                          ascent(pain,f) + descent(pain, f),
+    if ((need_update != CURSOR_PAR) &&
+       ((drawFrame == ALWAYS) || ((drawFrame == LOCKED) && locked)))
+    {
+           pain.rectangle(top_x + 1, baseline - insetAscent + 1,
+                          width(bv, f) - 1, insetAscent + insetDescent - 1,
+                          frame_color);
+    } else if (need_update == CLEAR_FRAME) {
+           pain.rectangle(top_x + 1, baseline - insetAscent + 1,
+                          width(bv, f) - 1, insetAscent + insetDescent - 1,
                           LColor::background);
     }
-    x += width(pain, f) - TEXT_TO_INSET_OFFSET;
-    need_update = NONE;
+    x += width(bv, f) - TEXT_TO_INSET_OFFSET;
+    if (bv->text->status==LyXText::CHANGED_IN_DRAW)
+    {
+       need_update = INIT;
+//     printf("InsetText::draw2 -> INIT(%d)\n",insetWidth);
+    }
+    else if (need_update != INIT)
+       need_update = NONE;
 }
 
 
-void InsetText::update(BufferView * bv, LyXFont const & font, bool dodraw)
+void InsetText::update(BufferView * bv, LyXFont const & font, bool reinit)
 {
-    if (the_locking_inset)
-       the_locking_inset->update(bv, font, dodraw);
+    if (reinit) {  // && (need_update != CURSOR)) {
+       need_update = INIT;
+       resizeLyXText(bv);
+       if (owner())
+           owner()->update(bv, font, true);
+       return;
+    }
+    if (the_locking_inset) {
+       inset_x = cx(bv) - top_x + drawTextXOffset;
+       inset_y = cy(bv) + drawTextYOffset;
+       the_locking_inset->update(bv, font, reinit);
+    }
     if (need_update == INIT) {
-       deleteLyXText(bv);
+       resizeLyXText(bv);
        need_update = FULL;
     }
-    if (dodraw && (need_update != CURSOR))
-           need_update = FULL;
+    int oldw = insetWidth;
+#if 1
+    insetWidth = TEXT(bv)->width + (2 * TEXT_TO_INSET_OFFSET);
+    // max(textWidth(bv->painter()),
+    // static_cast<int>(TEXT(bv)->width) + drawTextXOffset) +
+    // (2 * TEXT_TO_INSET_OFFSET);
+#else
+    insetWidth = textWidth(bv->painter());
+    if (insetWidth < 0)
+           insetWidth = static_cast<int>(TEXT(bv)->width);
+#endif
+    if (oldw != insetWidth) {
+//         printf("TW(%p): %d-%d-%d-%d\n",this,insetWidth, oldw,
+//                textWidth(bv->painter()),static_cast<int>(TEXT(bv)->width));
+       resizeLyXText(bv);
+       need_update = FULL;
+       update(bv, font, reinit);
+       return;
+    }
+    if ((need_update==CURSOR_PAR) && (TEXT(bv)->status==LyXText::UNCHANGED) &&
+       the_locking_inset)
+    {
+       TEXT(bv)->UpdateInset(bv, the_locking_inset);
+    }
 
-    TEXT(bv)->FullRebreak(bv);
+    if (TEXT(bv)->status == LyXText::NEED_MORE_REFRESH)
+       need_update = FULL;
 
-    long int y_temp = 0;
+    int y_temp = 0;
     Row * row = TEXT(bv)->GetRowNearY(y_temp);
     insetAscent = row->ascent_of_text() + TEXT_TO_INSET_OFFSET;
     insetDescent = TEXT(bv)->height - row->ascent_of_text() +
        TEXT_TO_INSET_OFFSET;
-    insetWidth = max(textWidth(bv->painter()), TEXT(bv)->width) +
-       (2 * TEXT_TO_INSET_OFFSET);
 }
 
 
-char const * InsetText::EditMessage() const
+void InsetText::UpdateLocal(BufferView * bv, UpdateCodes what, bool mark_dirty)
+{
+//    if (what == INIT)
+//     printf("InsetText::UpdateLocal -> INIT(%d)\n",insetWidth);
+    TEXT(bv)->FullRebreak(bv);
+    if (need_update != INIT) {
+       if (TEXT(bv)->status == LyXText::NEED_MORE_REFRESH)
+           need_update = FULL;
+       else if (!the_locking_inset || (what != CURSOR))
+           need_update = what;
+    }
+    if ((need_update != CURSOR) || (TEXT(bv)->status != LyXText::UNCHANGED) ||
+       TEXT(bv)->selection)
+           bv->updateInset(this, mark_dirty);
+    bv->owner()->showState();
+    if (old_par != cpar(bv)) {
+           bv->owner()->setLayout(cpar(bv)->GetLayout());
+           old_par = cpar(bv);
+    }
+}
+
+
+string const InsetText::EditMessage() const
 {
     return _("Opened Text Inset");
 }
@@ -318,14 +491,24 @@ void InsetText::Edit(BufferView * bv, int x, int y, unsigned int button)
     locked = true;
     the_locking_inset = 0;
     inset_pos = inset_x = inset_y = 0;
-#warning Fix cursor setting here!!! (Jug)
-    TEXT(bv)->SetCursor(bv, par, 0);
-//    setPos(bv->painter(), x, y);
-    checkAndActivateInset(bv, x, y, button);
-//    selection_start_cursor = selection_end_cursor = cursor;
+    inset_boundary = false;
+    inset_par = 0;
+    old_par = 0;
+    if (!checkAndActivateInset(bv, x, y, button))
+       TEXT(bv)->SetCursorFromCoordinates(bv, x-drawTextXOffset,
+                                          y+insetAscent);
     TEXT(bv)->sel_cursor = TEXT(bv)->cursor;
     bv->text->FinishUndo();
+    ShowInsetCursor(bv);
     UpdateLocal(bv, FULL, false);
+
+    // If the inset is empty set the language of the current font to the
+    // language to the surronding text.
+    if (par->Last() == 0 && !par->next) {
+       LyXFont font(LyXFont::ALL_IGNORE);
+       font.setLanguage(bv->getParentLanguage(this));
+       SetFont(bv, font, false);
+    }
 }
 
 
@@ -336,13 +519,15 @@ void InsetText::InsetUnlock(BufferView * bv)
        the_locking_inset = 0;
     }
     HideInsetCursor(bv);
-    lyxerr[Debug::INSETS] << "InsetText::InsetUnlock(" << this <<
-           ")" << endl;
     no_selection = false;
     locked = false;
     TEXT(bv)->selection = 0;
-    UpdateLocal(bv, FULL, false);
-    bv->owner()->getToolbar()->combox->select(bv->text->cursor.par()->GetLayout()+1);
+    UpdateLocal(bv, CLEAR_FRAME, false);
+    if (owner())
+           bv->owner()->setLayout(owner()->getLyXText(bv)
+                                   ->cursor.par()->GetLayout());
+    else
+           bv->owner()->setLayout(bv->text->cursor.par()->GetLayout());
 }
 
 
@@ -354,15 +539,16 @@ bool InsetText::LockInsetInInset(BufferView * bv, UpdatableInset * inset)
     if (inset == cpar(bv)->GetInset(cpos(bv))) {
        lyxerr[Debug::INSETS] << "OK" << endl;
        the_locking_inset = inset;
-//     resetPos(bv->painter());
        inset_x = cx(bv) - top_x + drawTextXOffset;
        inset_y = cy(bv) + drawTextYOffset;
        inset_pos = cpos(bv);
+       inset_par = cpar(bv);
+       inset_boundary = cboundary(bv);
+       TEXT(bv)->UpdateInset(bv, the_locking_inset);
        return true;
     } else if (the_locking_inset && (the_locking_inset == inset)) {
-       if (cpos(bv) == inset_pos) {
+       if (cpar(bv) == inset_par && cpos(bv) == inset_pos) {
            lyxerr[Debug::INSETS] << "OK" << endl;
-//         resetPos(bv->painter());
            inset_x = cx(bv) - top_x + drawTextXOffset;
            inset_y = cy(bv) + drawTextYOffset;
        } else {
@@ -384,9 +570,12 @@ bool InsetText::UnlockInsetInInset(BufferView * bv, UpdatableInset * inset,
         return false;
     if (the_locking_inset == inset) {
         the_locking_inset->InsetUnlock(bv);
+       TEXT(bv)->UpdateInset(bv, inset);
         the_locking_inset = 0;
         if (lr)
             moveRight(bv, false);
+       old_par = 0; // force layout setting
+       UpdateLocal(bv, CURSOR_PAR, false);
         return true;
     }
     return the_locking_inset->UnlockInsetInInset(bv, inset, lr);
@@ -397,12 +586,15 @@ bool InsetText::UpdateInsetInInset(BufferView * bv, Inset * inset)
 {
     if (!the_locking_inset)
         return false;
-    if (the_locking_inset != inset)
+    if (the_locking_inset != inset) {
+       TEXT(bv)->UpdateInset(bv, the_locking_inset);
+       need_update = CURSOR_PAR;
         return the_locking_inset->UpdateInsetInInset(bv, inset);
-    lyxerr[Debug::INSETS] << "InsetText::UpdateInsetInInset(" << inset <<
-           ")" << endl;
-    UpdateLocal(bv, FULL, false);
-    if (cpos(bv) == inset_pos) {
+    }
+//    UpdateLocal(bv, FULL, false);
+    if (TEXT(bv)->UpdateInset(bv, inset))
+       UpdateLocal(bv, CURSOR_PAR, false);
+    if (cpar(bv) == inset_par && cpos(bv) == inset_pos) {
        inset_x = cx(bv) - top_x + drawTextXOffset;
        inset_y = cy(bv) + drawTextYOffset;
     }
@@ -412,16 +604,14 @@ bool InsetText::UpdateInsetInInset(BufferView * bv, Inset * inset)
 
 void InsetText::InsetButtonPress(BufferView * bv, int x, int y, int button)
 {
-    if (TEXT(bv)->selection) {
-       TEXT(bv)->selection = 0;
-       UpdateLocal(bv, FULL, false);
-    }
     no_selection = false;
-    TEXT(bv)->SetCursorFromCoordinates(bv, x, y+TEXT(bv)->first);
+
+    int tmp_x = x - drawTextXOffset;
+    int tmp_y = y + insetAscent - TEXT(bv)->first;
+    Inset * inset = bv->checkInsetHit(TEXT(bv), tmp_x, tmp_y, button);
+
+    HideInsetCursor(bv);
     if (the_locking_inset) {
-       UpdatableInset * inset = 0;
-       if (cpar(bv)->GetChar(cpos(bv)) == LyXParagraph::META_INSET)
-           inset = static_cast<UpdatableInset*>(cpar(bv)->GetInset(cpos(bv)));
        if (the_locking_inset == inset) {
            the_locking_inset->InsetButtonPress(bv,x-inset_x,y-inset_y,button);
            return;
@@ -430,29 +620,59 @@ 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<UpdatableInset*>(inset);
            inset->InsetButtonPress(bv, x - inset_x, y - inset_y, button);
            inset->Edit(bv, x - inset_x, y - inset_y, button);
-           UpdateLocal(bv, FULL, false);
+           if (the_locking_inset) {
+               UpdateLocal(bv, CURSOR_PAR, false);
+           }
            return;
        }
        // otherwise only unlock the_locking_inset
        the_locking_inset->InsetUnlock(bv);
        the_locking_inset = 0;
     }
-    if (bv->the_locking_inset) {
-       if ((cpar(bv)->GetChar(cpos(bv)) == LyXParagraph::META_INSET) &&
-           cpar(bv)->GetInset(cpos(bv)) &&
-           (cpar(bv)->GetInset(cpos(bv))->Editable() == Inset::HIGHLY_EDITABLE)) {
-           UpdatableInset * inset =
-               static_cast<UpdatableInset*>(cpar(bv)->GetInset(cpos(bv)));
+    if (bv->theLockingInset()) {
+       if (inset && inset->Editable() == Inset::HIGHLY_EDITABLE) {
+           UpdatableInset * uinset = static_cast<UpdatableInset*>(inset);
            inset_x = cx(bv) - top_x + drawTextXOffset;
            inset_y = cy(bv) + drawTextYOffset;
-           inset->InsetButtonPress(bv, x - inset_x, y - inset_y, button);
-           inset->Edit(bv, x - inset_x, y - inset_y, 0);
-           UpdateLocal(bv, FULL, false);
+           inset_pos = cpos(bv);
+           inset_par = cpar(bv);
+           inset_boundary = cboundary(bv);
+           the_locking_inset = uinset;
+           uinset->InsetButtonPress(bv, x - inset_x, y - inset_y, button);
+           uinset->Edit(bv, x - inset_x, y - inset_y, 0);
+//         TEXT(bv)->ClearSelection();
+           if (the_locking_inset) {
+               UpdateLocal(bv, CURSOR_PAR, false);
+           }
+           return;
        }
     }
-//    selection_start_cursor = selection_end_cursor = cursor;
+    if (!inset) {
+       bool paste_internally = false;
+       if ((button == 2) && TEXT(bv)->selection) {
+           LocalDispatch(bv, LFUN_COPY, "");
+           paste_internally = true;
+       }
+       TEXT(bv)->SetCursorFromCoordinates(bv, x-drawTextXOffset,
+                                          y + insetAscent);
+       TEXT(bv)->sel_cursor = TEXT(bv)->cursor;
+       UpdateLocal(bv, CURSOR, false);
+       bv->owner()->setLayout(cpar(bv)->GetLayout());
+       old_par = cpar(bv);
+       // Insert primary selection with middle mouse
+       // if there is a local selection in the current buffer,
+       // insert this
+       if (button == 2) {
+           if (paste_internally)
+               LocalDispatch(bv, LFUN_PASTE, "");
+           else
+               LocalDispatch(bv, LFUN_PASTESELECTION, "paragraph");
+       }
+    }
+    ShowInsetCursor(bv);
 }
 
 
@@ -461,7 +681,9 @@ void InsetText::InsetButtonRelease(BufferView * bv, int x, int y, int button)
     UpdatableInset * inset = 0;
 
     if (the_locking_inset) {
-           the_locking_inset->InsetButtonRelease(bv, x-inset_x, y-inset_y,button);
+           the_locking_inset->InsetButtonRelease(bv,
+                                                 x - inset_x, y - inset_y,
+                                                 button);
     } else {
        if (cpar(bv)->GetChar(cpos(bv)) == LyXParagraph::META_INSET) {
            inset = static_cast<UpdatableInset*>(cpar(bv)->GetInset(cpos(bv)));
@@ -473,6 +695,7 @@ void InsetText::InsetButtonRelease(BufferView * bv, int x, int y, int button)
                inset->InsetButtonRelease(bv, x - inset_x, y - inset_y,button);
                inset->Edit(bv, x - inset_x, y - inset_y, button);
            }
+           UpdateLocal(bv, CURSOR_PAR, false);
        }
     }
     no_selection = false;
@@ -486,14 +709,14 @@ void InsetText::InsetMotionNotify(BufferView * bv, int x, int y, int state)
                                             y - inset_y,state);
         return;
     }
-#warning REDO this (Jug)
     if (!no_selection) {
-//     LyXCursor old = selection_end_cursor;
        HideInsetCursor(bv);
-//     setPos(bv->painter(), x, y);
-//     selection_end_cursor = cursor;
-//     if (old != selection_end_cursor)
-//         UpdateLocal(bv, false, false);
+       TEXT(bv)->SetCursorFromCoordinates(bv, x-drawTextXOffset,
+                                          y+insetAscent);
+       TEXT(bv)->SetSelection();
+       if (TEXT(bv)->toggle_cursor.par()!=TEXT(bv)->toggle_end_cursor.par() ||
+           TEXT(bv)->toggle_cursor.pos()!=TEXT(bv)->toggle_end_cursor.pos())
+           UpdateLocal(bv, SELECTION, false);
        ShowInsetCursor(bv);
     }
     no_selection = false;
@@ -517,7 +740,6 @@ InsetText::LocalDispatch(BufferView * bv,
     UpdatableInset::RESULT
         result= UpdatableInset::LocalDispatch(bv, action, arg);
     if (result != UNDISPATCHED) {
-//     resetPos(bv->painter());
        return DISPATCHED;
     }
 
@@ -530,30 +752,36 @@ InsetText::LocalDispatch(BufferView * bv,
        if (result == DISPATCHED_NOUPDATE)
            return result;
        else if (result == DISPATCHED) {
-           the_locking_inset->ToggleInsetCursor(bv);
-           UpdateLocal(bv, FULL, false);
-           the_locking_inset->ToggleInsetCursor(bv);
+           UpdateLocal(bv, CURSOR_PAR, false);
             return result;
         } else if (result == FINISHED) {
-           switch(action) {
-           case -1:
+           bool dispatched = false;
+           switch (action) {
+           case LFUN_UNKNOWN_ACTION:
+           case LFUN_BREAKPARAGRAPH:
+           case LFUN_BREAKLINE:
+              moveRightIntern(bv, false, false);
+              break;
            case LFUN_RIGHT:
-               moveRight(bv);
-//             TEXT(bv)->cursor.pos(inset_pos + 1);
-//             resetPos(bv->painter());
+               if (!TEXT(bv)->cursor.par()->isRightToLeftPar(bv->buffer()->params))
+                   moveRightIntern(bv, false, false);
+               dispatched = true;
                break;
-           case LFUN_DOWN:
-               moveDown(bv);
+           case LFUN_LEFT:
+               if (TEXT(bv)->cursor.par()->isRightToLeftPar(bv->buffer()->params))
+                   moveRightIntern(bv, false, false);
+               dispatched = true;
                break;
            }
            the_locking_inset = 0;
-           return DISPATCHED;
+           if (dispatched)
+               return DISPATCHED;
        }
     }
     HideInsetCursor(bv);
     switch (action) {
        // Normal chars
-    case -1:
+    case LFUN_UNKNOWN_ACTION:
        if (bv->buffer()->isReadonly()) {
            LyXBell();
 //         setErrorMessage(N_("Document is read only"));
@@ -566,9 +794,16 @@ InsetText::LocalDispatch(BufferView * bv,
             * "auto_region_delete", which defaults to
             * true (on). */
 
-           bv->text->SetUndo(bv->buffer(), Undo::INSERT, 
+           bv->text->SetUndo(bv->buffer(), Undo::INSERT,
+#ifndef NEW_INSETS
                              bv->text->cursor.par()->ParFromPos(bv->text->cursor.pos())->previous,
-                             bv->text->cursor.par()->ParFromPos(bv->text->cursor.pos())->next);
+                             bv->text->cursor.par()->ParFromPos(bv->text->cursor.pos())->next
+#else
+                             bv->text->cursor.par()->previous,
+                             bv->text->cursor.par()->next
+#endif
+                   );
+           bv->setState();
            if (lyxrc.auto_region_delete) {
                if (TEXT(bv)->selection){
                    TEXT(bv)->CutSelection(bv, false);
@@ -576,35 +811,51 @@ InsetText::LocalDispatch(BufferView * bv,
            }
            TEXT(bv)->ClearSelection();
            for (string::size_type i = 0; i < arg.length(); ++i) {
-               bv->owner()->getIntl()->getTrans()->TranslateAndInsert(arg[i], TEXT(bv));
+               if (greek_kb_flag) {
+                   if (!math_insert_greek(bv, arg[i])) {
+#if 0
+                       bv->owner()->getIntl()->getTrans()->TranslateAndInsert(arg[i], TEXT(bv));
+#else
+                       bv->owner()->getIntl()->getTrans().TranslateAndInsert(arg[i], TEXT(bv));
+#endif
+                   } else if (!the_locking_inset) {
+                       (void)moveRight(bv, false);
+                   }
+               } else {
+#if 0
+                   bv->owner()->getIntl()->getTrans()->TranslateAndInsert(arg[i], TEXT(bv));
+#else
+                   bv->owner()->getIntl()->getTrans().TranslateAndInsert(arg[i], TEXT(bv));
+#endif
+               }
            }
        }
        UpdateLocal(bv, CURSOR_PAR, true);
+       result=DISPATCHED_NOUPDATE;
        break;
         // --- Cursor Movements ---------------------------------------------
     case LFUN_RIGHTSEL:
        bv->text->FinishUndo();
-       moveRight(bv, false);
+       moveRight(bv, false, true);
        TEXT(bv)->SetSelection();
        UpdateLocal(bv, SELECTION, false);
        break;
     case LFUN_RIGHT:
-       bv->text->FinishUndo();
        result = moveRight(bv);
-       TEXT(bv)->selection = 0;
-       TEXT(bv)->sel_cursor = TEXT(bv)->cursor;
+       bv->text->FinishUndo();
+       TEXT(bv)->ClearSelection();
        UpdateLocal(bv, CURSOR, false);
        break;
     case LFUN_LEFTSEL:
        bv->text->FinishUndo();
-       moveLeft(bv, false);
+       moveLeft(bv, false, true);
        TEXT(bv)->SetSelection();
        UpdateLocal(bv, SELECTION, false);
        break;
     case LFUN_LEFT:
        bv->text->FinishUndo();
-       result= moveLeft(bv);
-       TEXT(bv)->selection = 0;
+       result = moveLeft(bv);
+       TEXT(bv)->ClearSelection();
        TEXT(bv)->sel_cursor = TEXT(bv)->cursor;
        UpdateLocal(bv, CURSOR, false);
        break;
@@ -617,7 +868,7 @@ InsetText::LocalDispatch(BufferView * bv,
     case LFUN_DOWN:
        bv->text->FinishUndo();
        result = moveDown(bv);
-       TEXT(bv)->selection = 0;
+       TEXT(bv)->ClearSelection();
        TEXT(bv)->sel_cursor = TEXT(bv)->cursor;
        UpdateLocal(bv, CURSOR, false);
        break;
@@ -630,41 +881,65 @@ InsetText::LocalDispatch(BufferView * bv,
     case LFUN_UP:
        bv->text->FinishUndo();
        result = moveUp(bv);
-       TEXT(bv)->selection = 0;
+       TEXT(bv)->ClearSelection();
        TEXT(bv)->sel_cursor = TEXT(bv)->cursor;
        UpdateLocal(bv, CURSOR, false);
        break;
     case LFUN_HOME:
        bv->text->FinishUndo();
        TEXT(bv)->CursorHome(bv);
-       TEXT(bv)->selection = 0;
+       TEXT(bv)->ClearSelection();
        TEXT(bv)->sel_cursor = TEXT(bv)->cursor;
        UpdateLocal(bv, CURSOR, false);
        break;
     case LFUN_END:
        TEXT(bv)->CursorEnd(bv);
-       TEXT(bv)->selection = 0;
+       TEXT(bv)->ClearSelection();
        TEXT(bv)->sel_cursor = TEXT(bv)->cursor;
        UpdateLocal(bv, CURSOR, false);
        break;
     case LFUN_BACKSPACE:
-       bv->text->SetUndo(bv->buffer(), Undo::DELETE, 
+       bv->text->SetUndo(bv->buffer(), Undo::DELETE,
+#ifndef NEW_INSETS
          bv->text->cursor.par()->ParFromPos(bv->text->cursor.pos())->previous,
-         bv->text->cursor.par()->ParFromPos(bv->text->cursor.pos())->next);
-       TEXT(bv)->Backspace(bv);
+         bv->text->cursor.par()->ParFromPos(bv->text->cursor.pos())->next
+#else
+         bv->text->cursor.par()->previous,
+         bv->text->cursor.par()->next
+#endif
+               );
+       if (TEXT(bv)->selection)
+           TEXT(bv)->CutSelection(bv);
+       else
+           TEXT(bv)->Backspace(bv);
        UpdateLocal(bv, CURSOR_PAR, true);
        break;
     case LFUN_DELETE:
-       bv->text->SetUndo(bv->buffer(), Undo::DELETE, 
+       bv->text->SetUndo(bv->buffer(), Undo::DELETE,
+#ifndef NEW_INSETS
          bv->text->cursor.par()->ParFromPos(bv->text->cursor.pos())->previous,
-         bv->text->cursor.par()->ParFromPos(bv->text->cursor.pos())->next);
-       TEXT(bv)->Delete(bv);
+         bv->text->cursor.par()->ParFromPos(bv->text->cursor.pos())->next
+#else
+         bv->text->cursor.par()->previous,
+         bv->text->cursor.par()->next
+#endif
+               );
+       if (TEXT(bv)->selection)
+           TEXT(bv)->CutSelection(bv);
+       else
+           TEXT(bv)->Delete(bv);
        UpdateLocal(bv, CURSOR_PAR, true);
        break;
     case LFUN_CUT:
-       bv->text->SetUndo(bv->buffer(), Undo::DELETE, 
+       bv->text->SetUndo(bv->buffer(), Undo::DELETE,
+#ifndef NEW_INSETS
          bv->text->cursor.par()->ParFromPos(bv->text->cursor.pos())->previous,
-         bv->text->cursor.par()->ParFromPos(bv->text->cursor.pos())->next);
+         bv->text->cursor.par()->ParFromPos(bv->text->cursor.pos())->next
+#else
+         bv->text->cursor.par()->previous,
+         bv->text->cursor.par()->next
+#endif
+               );
        TEXT(bv)->CutSelection(bv);
        UpdateLocal(bv, CURSOR_PAR, true);
        break;
@@ -673,10 +948,40 @@ InsetText::LocalDispatch(BufferView * bv,
        TEXT(bv)->CopySelection(bv);
        UpdateLocal(bv, CURSOR_PAR, false);
        break;
+    case LFUN_PASTESELECTION:
+    {
+       string clip(bv->workarea()->getClipboard());
+       
+       if (clip.empty())
+           break;
+       if (arg == "paragraph") {
+               TEXT(bv)->InsertStringB(bv, clip);
+       } else {
+               TEXT(bv)->InsertStringA(bv, clip);
+       }
+       UpdateLocal(bv, CURSOR_PAR, true);
+       break;
+    }
     case LFUN_PASTE:
-       bv->text->SetUndo(bv->buffer(), Undo::INSERT, 
+       if (!autoBreakRows) {
+           CutAndPaste cap;
+
+           if (cap.nrOfParagraphs() > 1) {
+               WriteAlert(_("Impossible operation"),
+                          _("Cannot include more than one paragraph!"),
+                          _("Sorry."));
+               break;
+           }
+       }
+       bv->text->SetUndo(bv->buffer(), Undo::INSERT,
+#ifndef NEW_INSETS
          bv->text->cursor.par()->ParFromPos(bv->text->cursor.pos())->previous,
-         bv->text->cursor.par()->ParFromPos(bv->text->cursor.pos())->next);
+         bv->text->cursor.par()->ParFromPos(bv->text->cursor.pos())->next
+#else
+         bv->text->cursor.par()->previous,
+         bv->text->cursor.par()->next
+#endif
+               );
        TEXT(bv)->PasteSelection(bv);
        UpdateLocal(bv, CURSOR_PAR, true);
        break;
@@ -684,52 +989,116 @@ InsetText::LocalDispatch(BufferView * bv,
        if (!autoBreakRows)
            return DISPATCHED;
        TEXT(bv)->BreakParagraph(bv, 0);
-       UpdateLocal(bv, CURSOR_PAR, true);
+       UpdateLocal(bv, FULL, true);
+       break;
+    case LFUN_BREAKPARAGRAPHKEEPLAYOUT:
+       if (!autoBreakRows)
+           return DISPATCHED;
+       TEXT(bv)->BreakParagraph(bv, 1);
+       UpdateLocal(bv, FULL, true);
        break;
     case LFUN_BREAKLINE:
        if (!autoBreakRows)
            return DISPATCHED;
-       bv->text->SetUndo(bv->buffer(), Undo::INSERT, 
+       bv->text->SetUndo(bv->buffer(), Undo::INSERT,
+#ifndef NEW_INSETS
            bv->text->cursor.par()->ParFromPos(bv->text->cursor.pos())->previous,
-           bv->text->cursor.par()->ParFromPos(bv->text->cursor.pos())->next);
+           bv->text->cursor.par()->ParFromPos(bv->text->cursor.pos())->next
+#else
+           bv->text->cursor.par()->previous,
+           bv->text->cursor.par()->next
+#endif
+               );
        TEXT(bv)->InsertChar(bv, LyXParagraph::META_NEWLINE);
        UpdateLocal(bv, CURSOR_PAR, true);
        break;
     case LFUN_LAYOUT:
-    {
-      static LyXTextClass::size_type cur_layout = cpar(bv)->layout;
+       // do not set layouts on non breakable textinsets
+       if (autoBreakRows) {
+           LyXTextClass::size_type cur_layout = cpar(bv)->layout;
       
-       // Derive layout number from given argument (string)
-       // and current buffer's textclass (number). */    
-       LyXTextClassList::ClassList::size_type tclass =
-           bv->buffer()->params.textclass;
-       std::pair <bool, LyXTextClass::size_type> layout = 
-           textclasslist.NumberOfLayout(tclass, arg);
-
-       // If the entry is obsolete, use the new one instead.
-       if (layout.first) {
-           string obs = textclasslist.Style(tclass,layout.second).
-               obsoleted_by();
-           if (!obs.empty()) 
-               layout = textclasslist.NumberOfLayout(tclass, obs);
-       }
+           // Derive layout number from given argument (string)
+           // and current buffer's textclass (number). */    
+           LyXTextClassList::ClassList::size_type tclass =
+               bv->buffer()->params.textclass;
+           std::pair <bool, LyXTextClass::size_type> layout = 
+               textclasslist.NumberOfLayout(tclass, arg);
+
+           // If the entry is obsolete, use the new one instead.
+           if (layout.first) {
+               string obs = textclasslist.Style(tclass,layout.second).
+                   obsoleted_by();
+               if (!obs.empty()) 
+                   layout = textclasslist.NumberOfLayout(tclass, obs);
+           }
 
-       // see if we found the layout number:
-       if (!layout.first) {
-           string msg = string(N_("Layout ")) + arg + N_(" not known");
+           // see if we found the layout number:
+           if (!layout.first) {
+               string msg = string(N_("Layout ")) + arg + N_(" not known");
 
-           bv->owner()->getMiniBuffer()->Set(msg);
-           break;
-       }
+               bv->owner()->getMiniBuffer()->Set(msg);
+               break;
+           }
 
-       if (cur_layout != layout.second) {
-           cur_layout = layout.second;
-           TEXT(bv)->SetLayout(bv, layout.second);
-           bv->owner()->getToolbar()->combox->select(cpar(bv)->GetLayout()+1);
-           UpdateLocal(bv, CURSOR_PAR, true);
+           if (cur_layout != layout.second) {
+               cur_layout = layout.second;
+               TEXT(bv)->SetLayout(bv, layout.second);
+               bv->owner()->setLayout(cpar(bv)->GetLayout());
+               UpdateLocal(bv, CURSOR_PAR, true);
+           }
+       } else {
+           // reset the layout box
+           bv->owner()->setLayout(cpar(bv)->GetLayout());
        }
+       break;
+    case LFUN_PARAGRAPH_SPACING:
+           // This one is absolutely not working. When fiddling with this
+           // it also seems to me that the paragraphs inside the insettext
+           // inherit bufferparams/paragraphparams in a strange way. (Lgb)
+    {
+           LyXParagraph * par = TEXT(bv)->cursor.par();
+           Spacing::Space cur_spacing = par->spacing.getSpace();
+           float cur_value = 1.0;
+           if (cur_spacing == Spacing::Other) {
+                   cur_value = par->spacing.getValue();
+           }
+                       
+           std::istringstream istr(arg.c_str());
+           string tmp;
+           istr >> tmp;
+           Spacing::Space new_spacing = cur_spacing;
+           float new_value = cur_value;
+           if (tmp.empty()) {
+                   lyxerr << "Missing argument to `paragraph-spacing'"
+                          << endl;
+           } else if (tmp == "single") {
+                   new_spacing = Spacing::Single;
+           } else if (tmp == "onehalf") {
+                   new_spacing = Spacing::Onehalf;
+           } else if (tmp == "double") {
+                   new_spacing = Spacing::Double;
+           } else if (tmp == "other") {
+                   new_spacing = Spacing::Other;
+                   float tmpval = 0.0;
+                   istr >> tmpval;
+                   lyxerr << "new_value = " << tmpval << endl;
+                   if (tmpval != 0.0)
+                           new_value = tmpval;
+           } else if (tmp == "default") {
+                   new_spacing = Spacing::Default;
+           } else {
+                   lyxerr << _("Unknown spacing argument: ")
+                          << arg << endl;
+           }
+           if (cur_spacing != new_spacing || cur_value != new_value) {
+                   par->spacing.set(new_spacing, new_value);
+                   //TEXT(bv)->RedoParagraph(owner->view());
+                   UpdateLocal(bv, CURSOR_PAR, true);
+                   //bv->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
+           }
     }
     break;
+       
     default:
        result = UNDISPATCHED;
        break;
@@ -750,6 +1119,38 @@ int InsetText::Latex(Buffer const * buf, ostream & os, bool, bool) const
 }
 
 
+int InsetText::Ascii(Buffer const * buf, ostream & os, int linelen) const
+{
+    LyXParagraph * p = par;
+    unsigned int lines = 0;
+    
+    string tmp;
+    while (p) {
+       tmp = buf->asciiParagraph(p, linelen);
+       lines += countChar(tmp, '\n');
+       os << tmp;
+       p = p->next;
+    }
+    return lines;
+}
+
+
+int InsetText::DocBook(Buffer const * buf, ostream & os) const
+{
+    LyXParagraph * p = par;
+    unsigned int lines = 0;
+    int desc=0;
+    
+    string tmp;
+    while (p) {
+       buf->SimpleDocBookOnePar(os,tmp,p,desc,0);
+       p = p->next;
+    }
+    
+    return lines;
+}
+
+
 void InsetText::Validate(LaTeXFeatures & features) const
 {
     LyXParagraph * p = par;
@@ -770,14 +1171,15 @@ int InsetText::BeginningOfMainBody(Buffer const * buf, LyXParagraph * p) const
 }
 
 
-void InsetText::GetCursorPos(BufferView * bv, int & x, int & y) const
+void InsetText::GetCursorPos(BufferView * bv,
+                            int & x, int & y) const
 {
     x = cx(bv);
     y = cy(bv);
 }
 
 
-int InsetText::InsetInInsetY()
+unsigned int InsetText::InsetInInsetY()
 {
     if (!the_locking_inset)
        return 0;
@@ -801,13 +1203,12 @@ void InsetText::ToggleInsetCursor(BufferView * bv)
     if (cursor_visible)
         bv->hideLockedInsetCursor();
     else
-        bv->showLockedInsetCursor(cx(bv), cy(bv),
-                                 asc, desc);
+        bv->showLockedInsetCursor(cx(bv), cy(bv), asc, desc);
     cursor_visible = !cursor_visible;
 }
 
 
-void InsetText::ShowInsetCursor(BufferView * bv)
+void InsetText::ShowInsetCursor(BufferView * bv, bool show)
 {
     if (the_locking_inset) {
        the_locking_inset->ShowInsetCursor(bv);
@@ -820,7 +1221,8 @@ void InsetText::ShowInsetCursor(BufferView * bv)
        int desc = lyxfont::maxDescent(font);
 
        bv->fitLockedInsetCursor(cx(bv), cy(bv), asc, desc);
-       bv->showLockedInsetCursor(cx(bv), cy(bv), asc, desc);
+       if (show)
+           bv->showLockedInsetCursor(cx(bv), cy(bv), asc, desc);
        cursor_visible = true;
     }
 }
@@ -838,28 +1240,46 @@ void InsetText::HideInsetCursor(BufferView * bv)
 
 
 UpdatableInset::RESULT
-InsetText::moveRight(BufferView * bv, bool activate_inset)
+InsetText::moveRight(BufferView * bv, bool activate_inset, bool selecting)
+{
+    if (TEXT(bv)->cursor.par()->isRightToLeftPar(bv->buffer()->params))
+       return moveLeftIntern(bv, false, activate_inset, selecting);
+    else
+       return moveRightIntern(bv, false, activate_inset, selecting);
+}
+
+UpdatableInset::RESULT
+InsetText::moveLeft(BufferView * bv, bool activate_inset, bool selecting)
+{
+    if (TEXT(bv)->cursor.par()->isRightToLeftPar(bv->buffer()->params))
+       return moveRightIntern(bv, true, activate_inset, selecting);
+    else
+       return moveLeftIntern(bv, true, activate_inset, selecting);
+}
+
+
+UpdatableInset::RESULT
+InsetText::moveRightIntern(BufferView * bv, bool behind, 
+                          bool activate_inset, bool selecting)
 {
     if (!cpar(bv)->next && (cpos(bv) >= cpar(bv)->Last()))
        return FINISHED;
-    if (activate_inset && checkAndActivateInset(bv)) {
+    if (activate_inset && checkAndActivateInset(bv, behind))
        return DISPATCHED;
-    }
-    TEXT(bv)->CursorRight(bv);
-//    real_current_font = current_font = GetFont(bv->buffer(), cpar(bv), cpos(bv));
+    TEXT(bv)->CursorRight(bv, selecting);
     return DISPATCHED_NOUPDATE;
 }
 
 
 UpdatableInset::RESULT
-InsetText::moveLeft(BufferView * bv, bool activate_inset)
+InsetText::moveLeftIntern(BufferView * bv, bool behind,
+                         bool activate_inset, bool selecting)
 {
     if (!cpar(bv)->previous && (cpos(bv) <= 0))
        return FINISHED;
-    TEXT(bv)->CursorLeft(bv);
-    if (activate_inset)
-       if (checkAndActivateInset(bv, -1, -1))
-           return DISPATCHED;
+    TEXT(bv)->CursorLeft(bv, selecting);
+    if (activate_inset && checkAndActivateInset(bv, behind))
+       return DISPATCHED;
     return DISPATCHED_NOUPDATE;
 }
 
@@ -891,18 +1311,25 @@ bool InsetText::InsertInset(BufferView * bv, Inset * inset)
            return the_locking_inset->InsertInset(bv, inset);
        return false;
     }
-    bv->text->SetUndo(bv->buffer(), Undo::INSERT, 
+    bv->text->SetUndo(bv->buffer(), Undo::INSERT,
+#ifndef NEW_INSETS
              bv->text->cursor.par()->ParFromPos(bv->text->cursor.pos())->previous,
-             bv->text->cursor.par()->ParFromPos(bv->text->cursor.pos())->next);
-    if (inset->Editable() == Inset::IS_EDITABLE) {
-       UpdatableInset * i = static_cast<UpdatableInset *>(inset);
-       i->setOwner(static_cast<UpdatableInset *>(this));
-    }
-    cpar(bv)->InsertChar(cpos(bv), LyXParagraph::META_INSET);
-    cpar(bv)->InsertInset(cpos(bv), inset);
+             bv->text->cursor.par()->ParFromPos(bv->text->cursor.pos())->next
+#else
+             bv->text->cursor.par()->previous,
+             bv->text->cursor.par()->next
+#endif
+           );
+    inset->setOwner(this);
+    HideInsetCursor(bv);
+    TEXT(bv)->InsertInset(bv, inset);
+    if ((cpar(bv)->GetChar(cpos(bv)) != LyXParagraph::META_INSET) ||
+       (cpar(bv)->GetInset(cpos(bv)) != inset))
+       TEXT(bv)->CursorLeft(bv);
     TEXT(bv)->selection = 0;
+    bv->fitCursor(TEXT(bv));
     UpdateLocal(bv, CURSOR_PAR, true);
-    static_cast<UpdatableInset*>(inset)->Edit(bv, 0, 0, 0);
+    ShowInsetCursor(bv);
     return true;
 }
 
@@ -925,36 +1352,63 @@ UpdatableInset * InsetText::GetFirstLockingInsetOfType(Inset::Code c)
 
 void InsetText::SetFont(BufferView * bv, LyXFont const & font, bool toggleall)
 {
+    bv->text->SetUndo(bv->buffer(), Undo::EDIT,
+#ifndef NEW_INSETS
+             bv->text->cursor.par()->ParFromPos(bv->text->cursor.pos())->previous,
+             bv->text->cursor.par()->ParFromPos(bv->text->cursor.pos())->next
+#else
+             bv->text->cursor.par()->previous,
+             bv->text->cursor.par()->next
+#endif
+           );
     TEXT(bv)->SetFont(bv, font, toggleall);
+    bv->fitCursor(TEXT(bv));
+    UpdateLocal(bv, CURSOR_PAR, true);
 }
 
 
-void InsetText::UpdateLocal(BufferView * bv, UpdateCodes what, bool mark_dirty)
+bool InsetText::checkAndActivateInset(BufferView * bv, bool behind)
 {
-    if (TEXT(bv)->status == LyXText::NEED_MORE_REFRESH)
-       need_update = FULL;
-    else
-       need_update = what;
-    if ((need_update != CURSOR) || (TEXT(bv)->status != LyXText::UNCHANGED))
-           bv->updateInset(this, mark_dirty);
-    if (old_par != cpar(bv)) {
-           bv->owner()->getToolbar()->combox->select(cpar(bv)->GetLayout()+1);
-           old_par = cpar(bv);
+    if (cpar(bv)->GetChar(cpos(bv)) == LyXParagraph::META_INSET) {
+       unsigned int x;
+       unsigned int y;
+       Inset * inset =
+           static_cast<UpdatableInset*>(cpar(bv)->GetInset(cpos(bv)));
+       if (!inset || inset->Editable() != Inset::HIGHLY_EDITABLE)
+           return false;
+       LyXFont const font =
+               TEXT(bv)->GetFont(bv->buffer(), cpar(bv), cpos(bv));
+       if (behind) {
+           x = inset->width(bv, font);
+           y = font.isRightToLeft() ? 0 : inset->descent(bv, font);
+       } else {
+           x = 0;
+           y = font.isRightToLeft() ? inset->descent(bv, font) : 0;
+       }
+       //inset_x = cx(bv) - top_x + drawTextXOffset;
+       //inset_y = cy(bv) + drawTextYOffset;
+       inset->Edit(bv, x, y, 0);
+       if (!the_locking_inset)
+           return false;
+       UpdateLocal(bv, CURSOR_PAR, false);
+       return true;
     }
+    return false;
 }
 
 
 bool InsetText::checkAndActivateInset(BufferView * bv, int x, int y,
                                      int button)
 {
-    if (cpar(bv)->GetChar(cpos(bv)) == LyXParagraph::META_INSET) {
-       UpdatableInset * inset =
-           static_cast<UpdatableInset*>(cpar(bv)->GetInset(cpos(bv)));
-       LyXFont font = TEXT(bv)->GetFont(bv->buffer(), cpar(bv), cpos(bv));
+    x = x - drawTextXOffset;
+    y = y + insetAscent;
+    Inset * inset = bv->checkInsetHit(TEXT(bv), x, y, button);
+
+    if (inset) {
        if (x < 0)
-           x = inset->width(bv->painter(), font);
+           x = insetWidth;
        if (y < 0)
-           y = inset->descent(bv->painter(), font);
+           y = insetDescent;
        inset_x = cx(bv) - top_x + drawTextXOffset;
        inset_y = cy(bv) + drawTextYOffset;
        inset->Edit(bv, x - inset_x, y - inset_y, button);
@@ -967,15 +1421,32 @@ bool InsetText::checkAndActivateInset(BufferView * bv, int x, int y,
 }
 
 
-int InsetText::getMaxTextWidth(Painter & pain, UpdatableInset const * inset) const
+int InsetText::getMaxWidth(Painter & pain, UpdatableInset const * inset) const
 {
-    return getMaxWidth(pain, inset) - 4; // 2+2 width of eventual border
+    int w = UpdatableInset::getMaxWidth(pain, inset);
+    if (w < 0) {
+       return w;
+    }
+    if (owner()) {
+       w = w - top_x + owner()->x();
+       return w;
+    }
+    w -= (2 * TEXT_TO_INSET_OFFSET);
+    return w - top_x;
+//    return  w - (2*TEXT_TO_INSET_OFFSET);
 }
 
+
 void InsetText::SetParagraphData(LyXParagraph *p)
 {
-    LyXParagraph * np;
+    // delete all instances of LyXText before deleting the paragraps used
+    // by it.
+    for (Cache::iterator cit = cache.begin(); cit != cache.end(); ++cit){
+       delete (*cit).second;
+       (*cit).second = 0;
+    }
 
+    LyXParagraph * np;
     if (par) {
        np = par->next;
        delete par;
@@ -998,69 +1469,208 @@ void InsetText::SetParagraphData(LyXParagraph *p)
     need_update = INIT;
 }
 
+
+void InsetText::SetText(string const & data)
+{
+    clear();
+    LyXFont font(LyXFont::ALL_SANE);
+    for(unsigned int i=0; i < data.length(); ++i)
+       par->InsertChar(i, data[i], font);
+}
+
+
 void InsetText::SetAutoBreakRows(bool flag)
 {
     if (flag != autoBreakRows) {
        autoBreakRows = flag;
        need_update = FULL;
+       if (!flag)
+           removeNewlines();
     }
 }
 
-void InsetText::SetDrawLockedFrame(bool flag)
+
+void InsetText::SetDrawFrame(BufferView * bv, DrawFrame how)
 {
-    if (flag != drawLockedFrame)
-       drawLockedFrame = flag;
+    if (how != drawFrame) {
+       drawFrame = how;
+       if (bv)
+           UpdateLocal(bv, DRAW_FRAME, false);
+    }
 }
 
-void InsetText::SetFrameColor(LColor::color col)
+
+void InsetText::SetFrameColor(BufferView * bv, LColor::color col)
 {
-    if (frame_color != col)
+    if (frame_color != col) {
        frame_color = col;
+       if (bv)
+           UpdateLocal(bv, DRAW_FRAME, false);
+    }
 }
 
+#if 0
 LyXFont InsetText::GetDrawFont(BufferView * bv, LyXParagraph * p, int pos) const
 {
     return TEXT(bv)->GetFont(bv->buffer(), p, pos);
 }
+#endif
+
 
 int InsetText::cx(BufferView * bv) const
 {
-    return TEXT(bv)->cursor.x() + top_x + 1;
+       LyXText * text = TEXT(bv);
+       int x = text->cursor.x() + top_x + TEXT_TO_INSET_OFFSET;
+       if (the_locking_inset) {
+               LyXFont font = text->GetFont(bv->buffer(),
+                                    text->cursor.par(), text->cursor.pos());
+               if (font.isVisibleRightToLeft())
+                       x -= the_locking_inset->width(bv, font);
+       }
+       return x;
 }
 
+
 int InsetText::cy(BufferView * bv) const
 {
-    long int y_dummy = 0;
-    Row * tmprow = TEXT(bv)->GetRowNearY(y_dummy);
-    return TEXT(bv)->cursor.y() - tmprow->baseline();
+    LyXFont font;
+    return TEXT(bv)->cursor.y() - ascent(bv, font) + TEXT_TO_INSET_OFFSET;
 }
 
-int InsetText::cpos(BufferView * bv) const
+
+LyXParagraph::size_type InsetText::cpos(BufferView * bv) const
 {
     return TEXT(bv)->cursor.pos();
 }
 
+
 LyXParagraph * InsetText::cpar(BufferView * bv) const
 {
     return TEXT(bv)->cursor.par();
 }
 
+bool InsetText::cboundary(BufferView * bv) const
+{
+    return TEXT(bv)->cursor.boundary();
+}
+
+
 Row * InsetText::crow(BufferView * bv) const
 {
     return TEXT(bv)->cursor.row();
 }
 
-LyXText * InsetText::getLyXText(BufferView * bv) const
+
+LyXText * InsetText::getLyXText(BufferView const * lbv) const
 {
-    if (cache.find(bv) != cache.end())
+    // Super UGLY! (Lgb)
+    BufferView * bv = const_cast<BufferView *>(lbv);
+       
+    if ((cache.find(bv) != cache.end()) && cache[bv])
        return cache[bv];
-    LyXText *lt = new LyXText(const_cast<InsetText *>(this));
+    LyXText * lt = new LyXText(const_cast<InsetText *>(this));
     lt->init(bv);
     cache[bv] = lt;
+    if (the_locking_inset) {
+       lt->SetCursor(bv, inset_par, inset_pos, true, inset_boundary);
+    }
     return lt;
 }
 
-void InsetText::deleteLyXText(BufferView * bv)
+
+void InsetText::deleteLyXText(BufferView * bv, bool recursive) const
 {
+    if ((cache.find(bv) == cache.end()) || !cache[bv])
+       return;
+    delete cache[bv];
     cache.erase(bv);
+    if (recursive) {
+       /// then remove all LyXText in text-insets
+       LyXParagraph * p = par;
+       for (;p;p = p->next) {
+           p->deleteInsetsLyXText(bv);
+       }
+    }
+}
+
+
+void InsetText::resizeLyXText(BufferView * bv) const
+{
+    if (!par->next && !par->size()) // resize not neccessary!
+       return;
+    if ((cache.find(bv) == cache.end()) || !cache[bv])
+       return;
+
+    LyXParagraph * lpar = 0;
+    LyXParagraph * selstartpar = 0;
+    LyXParagraph * selendpar = 0;
+    LyXParagraph::size_type pos = 0;
+    LyXParagraph::size_type selstartpos = 0;
+    LyXParagraph::size_type selendpos = 0;
+    bool boundary = false;
+    bool selstartboundary = false;
+    bool selendboundary = false;
+    int selection = 0;
+    int mark_set = 0;
+
+//    ProhibitInput(bv);
+
+    if (locked) {
+       lpar = TEXT(bv)->cursor.par();
+       pos = TEXT(bv)->cursor.pos();
+       boundary = TEXT(bv)->cursor.boundary();
+       selstartpar = TEXT(bv)->sel_start_cursor.par();
+       selstartpos = TEXT(bv)->sel_start_cursor.pos();
+       selstartboundary = TEXT(bv)->sel_start_cursor.boundary();
+       selendpar = TEXT(bv)->sel_end_cursor.par();
+       selendpos = TEXT(bv)->sel_end_cursor.pos();
+       selendboundary = TEXT(bv)->sel_end_cursor.boundary();
+       selection = TEXT(bv)->selection;
+       mark_set = TEXT(bv)->mark_set;
+    }
+    deleteLyXText(bv, (the_locking_inset == 0));
+
+    if (lpar) {
+       TEXT(bv)->selection = true;
+       /* at this point just to avoid the Delete-Empty-Paragraph
+        * Mechanism when setting the cursor */
+       TEXT(bv)->mark_set = mark_set;
+       if (selection) {
+           TEXT(bv)->SetCursor(bv, selstartpar, selstartpos,true, 
+                               selstartboundary);
+           TEXT(bv)->sel_cursor = TEXT(bv)->cursor;
+           TEXT(bv)->SetCursor(bv, selendpar, selendpos, true, selendboundary);
+           TEXT(bv)->SetSelection();
+           TEXT(bv)->SetCursor(bv, lpar, pos);
+       } else {
+           TEXT(bv)->SetCursor(bv, lpar, pos, true, boundary);
+           TEXT(bv)->sel_cursor = TEXT(bv)->cursor;
+           TEXT(bv)->selection = false;
+       }
+    }
+    if (bv->screen())
+           TEXT(bv)->first = bv->screen()->TopCursorVisible(TEXT(bv));
+    // this will scroll the screen such that the cursor becomes visible 
+    bv->updateScrollbar();
+//    AllowInput(bv);
+    if (the_locking_inset) {
+       /// then resize all LyXText in text-insets
+       inset_x = cx(bv) - top_x + drawTextXOffset;
+       inset_y = cy(bv) + drawTextYOffset;
+       for (LyXParagraph * p = par; p; p = p->next) {
+           p->resizeInsetsLyXText(bv);
+       }
+    }
+    need_update = FULL;
+}
+
+
+void InsetText::removeNewlines()
+{
+    for (LyXParagraph * p = par; p; p = p->next) {
+       for (int i = 0; i < p->Last(); ++i) {
+           if (p->GetChar(i) == LyXParagraph::META_NEWLINE)
+               p->Erase(i);
+       }
+    }
 }