]> git.lyx.org Git - features.git/blobdiff - src/insets/insettabular.C
read the Changelog
[features.git] / src / insets / insettabular.C
index faa3f38552e7e59263073a0b0a72530c1983cde6..6e6aeac44ae78069c5e5f7bd1cb0a2a333b67e63 100644 (file)
@@ -5,7 +5,7 @@
  *
  *           Copyright 2000 The LyX Team.
  *
- *======================================================
+ * ======================================================
  */
 
 #include <config.h>
 #include "LaTeXFeatures.h"
 #include "Painter.h"
 #include "font.h"
+#include "lyxtext.h"
+#include "lyx_gui_misc.h"
+#include "LyXView.h"
+#include "lyxfunc.h"
 #include "insets/insettext.h"
+#include "frontends/Dialogs.h"
 
 const int ADD_TO_HEIGHT = 2;
 const int ADD_TO_TABULAR_WIDTH = 2;
@@ -35,7 +40,9 @@ using std::ostream;
 using std::ifstream;
 using std::max;
 using std::endl;
+using std::swap;
 
+#define cellstart(p) ((p % 2) == 0)
 
 InsetTabular::InsetTabular(Buffer * buf, int rows, int columns)
 {
@@ -43,117 +50,254 @@ InsetTabular::InsetTabular(Buffer * buf, int rows, int columns)
         rows = 1;
     if (columns <= 0)
         columns = 1;
-    tabular = new LyXTabular(rows,columns,buf);
+    buffer = buf; // set this first!!!
+    tabular = new LyXTabular(this, rows,columns);
     // for now make it always display as display() inset
     // just for test!!!
-    tabular->SetLongTabular(true);
     the_locking_inset = 0;
-    buffer = buf;
-    cursor_visible = false;
-    cursor.x_fix = -1;
-    sel_pos_start = sel_pos_end = 0;
-    no_selection = false;
-    init = true;
+    locked = no_selection = cursor_visible = false;
+    cursor.x_fix(-1);
+    oldcell = -1;
+    actcell = 0;
+    cursor.pos(0);
+    sel_pos_start = sel_pos_end = sel_cell_start = sel_cell_end = 0;
+    dialogs_ = 0;
+    need_update = INIT;
 }
 
 
 InsetTabular::InsetTabular(InsetTabular const & tab, Buffer * buf)
 {
-    tabular = new LyXTabular(*(tab.tabular), buf);
+    buffer = buf; // set this first
+    tabular = new LyXTabular(this, *(tab.tabular));
     the_locking_inset = 0;
-    buffer = buf;
-    cursor_visible = false;
-    cursor.x_fix = -1;
-    sel_pos_start = sel_pos_end = 0;
-    no_selection = false;
-    init = true;
+    locked = no_selection = cursor_visible = false;
+    cursor.x_fix(-1);
+    oldcell = -1;
+    actcell = 0;
+    cursor.pos(0);
+    sel_pos_start = sel_pos_end = sel_cell_start = sel_cell_end = 0;
+    dialogs_ = 0;
+    need_update = INIT;
 }
 
 
 InsetTabular::~InsetTabular()
 {
-        delete tabular;
+    delete tabular;
+    if (dialogs_)
+       dialogs_->hideTabular(this);
 }
 
 
-InsetTabular * InsetTabular::Clone() const
+Inset * InsetTabular::Clone() const
 {
     InsetTabular * t = new InsetTabular(*this, buffer);
+    delete t->tabular;
+    t->tabular = tabular->Clone(t);
     return t;
 }
 
 
-void InsetTabular::Write(ostream & os) const
+void InsetTabular::Write(Buffer const * buf, ostream & os) const
 {
-    os << "\\begin_inset Tabular\n";
-    tabular->Write(os,false);
-    os << "\\end_inset\n";
+    os << " Tabular" << endl;
+    tabular->Write(buf, os);
 }
 
 
-void InsetTabular::Read(LyXLex & lex)
+void InsetTabular::Read(Buffer const * buf, LyXLex & lex)
 {
+    bool old_format = (lex.GetString() == "\\LyXTable");
+    string token;
+
+    if (tabular)
        delete tabular;
+    tabular = new LyXTabular(buf, this, lex);
+
+    need_update = INIT;
 
-//    bool old_format = (lex.GetString() == "\\LyXTabular");
-    tabular = new LyXTabular(lex, buffer);
-    init = true;
+    if (old_format)
+       return;
+
+    lex.nextToken();
+    token = lex.GetString();
+    while (lex.IsOK() && (token != "\\end_inset")) {
+       lex.nextToken();
+       token = lex.GetString();
+    }
+    if (token != "\\end_inset") {
+        lex.printError("Missing \\end_inset at this point. "
+                       "Read: `$$Token'");
+    }
 }
 
 
-int InsetTabular::ascent(Painter & pain, LyXFont const & font) const
+int InsetTabular::ascent(BufferView *, LyXFont const &) const
 {
-    if (init) {
-       calculate_width_of_cells(pain, font);
-       init = false;
-    }
-    return tabular->AscentOfRow(0);
+    return tabular->GetAscentOfRow(0);
 }
 
 
-int InsetTabular::descent(Painter & pain, LyXFont const & font) const
+int InsetTabular::descent(BufferView *, LyXFont const &) const
 {
-    if (init) {
-       calculate_width_of_cells(pain, font);
-       init = false;
-    }
-    return tabular->HeightOfTabular() - tabular->AscentOfRow(0);
+    return tabular->GetHeightOfTabular() - tabular->GetAscentOfRow(0) + 1;
 }
 
 
-int InsetTabular::width(Painter & pain, LyXFont const & font) const
+int InsetTabular::width(BufferView *, LyXFont const &) const
 {
-    if (init) {
-       calculate_width_of_cells(pain, font);
-       init = false;
-    }
-    return tabular->WidthOfTabular() + (2 * ADD_TO_TABULAR_WIDTH);
+    return tabular->GetWidthOfTabular() + (2 * ADD_TO_TABULAR_WIDTH);
 }
 
 
-void InsetTabular::draw(Painter & pain, const LyXFont & font, int baseline,
-                       float & x) const
+void InsetTabular::draw(BufferView * bv, LyXFont const & font, int baseline,
+                       float & x, bool cleared) const
 {
-    int i, j, cell=0;
+    Painter & pain = bv->painter();
+    int i, j, cell = 0;
     int nx;
-
-    UpdatableInset::draw(pain,font,baseline,x);
-    if (top_x != int(x)) {
-       int ox = top_x;
-       top_x = int(x);
-       setPos(pain, cursor.x - ox - 2, cursor.y);
+    float cx;
+
+    UpdatableInset::draw(bv,font,baseline,x,cleared);
+    if (!cleared && ((need_update == INIT) || (need_update == FULL) ||
+                    (top_x != int(x)) || (top_baseline != baseline))) {
+       int h = ascent(bv, font) + descent(bv, font);
+       int tx = display()||!owner()? 0:top_x;
+       int w =  tx? width(bv, font):pain.paperWidth();
+       int ty = baseline - ascent(bv, font);
+       
+       if (ty < 0)
+           ty = 0;
+       if ((ty + h) > pain.paperHeight())
+           h = pain.paperHeight();
+       if ((top_x + w) > pain.paperWidth())
+           w = pain.paperWidth();
+       pain.fillRectangle(tx, ty, w, h);
+       need_update = FULL;
+       cleared = true;
     }
+    top_x = int(x);
     top_baseline = baseline;
-    calculate_width_of_cells(pain, font);
-    for(i=0;i<tabular->rows();++i) {
-       nx = int(x);
-        for(j=0;j<tabular->columns();++j) {
-           DrawCellLines(pain, nx, baseline, i, cell);
-           nx += tabular->WidthOfColumn(cell);
-           ++cell;
+    bool dodraw;
+    x += ADD_TO_TABULAR_WIDTH;
+    if (cleared || (need_update == FULL) || (need_update == CELL)) {
+       for(i=0;i<tabular->rows();++i) {
+           nx = int(x);
+           dodraw = ((baseline+tabular->GetDescentOfRow(i)) > 0) &&
+                   (baseline-tabular->GetAscentOfRow(i)) < pain.paperHeight();
+           for(j=0;j<tabular->columns();++j) {
+               if (tabular->IsPartOfMultiColumn(i,j))
+                   continue;
+               cx = nx + tabular->GetBeginningOfTextInCell(cell);
+               if (hasSelection())
+                   DrawCellSelection(pain, nx, baseline, i, j, cell);
+               if (dodraw && !cleared && locked && the_locking_inset) {
+                   if (the_locking_inset == tabular->GetCellInset(cell))
+                       tabular->GetCellInset(cell)->draw(bv, font,
+                                                         baseline, cx,
+                                                         cleared);
+               } else if (dodraw) {
+                   tabular->GetCellInset(cell)->draw(bv, font, baseline, cx,
+                                                     cleared);
+                   DrawCellLines(pain, nx, baseline, i, cell);
+               }
+               nx += tabular->GetWidthOfColumn(cell);
+               ++cell;
+           }
+           baseline += tabular->GetDescentOfRow(i) +
+               tabular->GetAscentOfRow(i+1)+
+               tabular->GetAdditionalHeight(cell+1);
        }
-        baseline += tabular->DescentOfRow(i) + tabular->AscentOfRow(i+1)
-            + tabular->AdditionalHeight(cell+1);
+    }
+    x += width(bv, font);
+    need_update = NONE;
+}
+
+
+void InsetTabular::DrawCellLines(Painter & pain, int x, int baseline,
+                                 int row, int cell) const
+{
+    int  x2 = x + tabular->GetWidthOfColumn(cell);
+    bool on_off;
+
+    if (!tabular->TopAlreadyDrawed(cell)) {
+       on_off = !tabular->TopLine(cell);
+       pain.line(x, baseline - tabular->GetAscentOfRow(row),
+                 x2, baseline -  tabular->GetAscentOfRow(row),
+                 on_off ? LColor::tabularonoffline:LColor::tabularline,
+                 on_off ? Painter::line_onoffdash:Painter::line_solid);
+    }
+    on_off = !tabular->BottomLine(cell);
+    pain.line(x,baseline +  tabular->GetDescentOfRow(row),
+             x2, baseline +  tabular->GetDescentOfRow(row),
+             on_off ? LColor::tabularonoffline:LColor::tabularline,
+             on_off ? Painter::line_onoffdash:Painter::line_solid);
+    if (!tabular->LeftAlreadyDrawed(cell)) {
+       on_off = !tabular->LeftLine(cell);
+       pain.line(x, baseline -  tabular->GetAscentOfRow(row),
+                 x, baseline +  tabular->GetDescentOfRow(row),
+                 on_off ? LColor::tabularonoffline:LColor::tabularline,
+                 on_off ? Painter::line_onoffdash:Painter::line_solid);
+    }
+    on_off = !tabular->RightLine(cell);
+    pain.line(x2 - tabular->GetAdditionalWidth(cell),
+              baseline -  tabular->GetAscentOfRow(row),
+              x2 - tabular->GetAdditionalWidth(cell),
+              baseline +  tabular->GetDescentOfRow(row),
+             on_off ? LColor::tabularonoffline:LColor::tabularline,
+              on_off ? Painter::line_onoffdash:Painter::line_solid);
+}
+
+
+void InsetTabular::DrawCellSelection(Painter & pain, int x, int baseline,
+                                    int row, int column, int cell) const
+{
+    int cs = tabular->column_of_cell(sel_cell_start);
+    int ce = tabular->column_of_cell(sel_cell_end);
+    if (cs > ce) {
+       ce = cs;
+       cs = tabular->column_of_cell(sel_cell_end);
+    } else {
+       ce = tabular->right_column_of_cell(sel_cell_end);
+    }
+
+    int rs = tabular->row_of_cell(sel_cell_start);
+    int re = tabular->row_of_cell(sel_cell_end);
+    if (rs > re) swap(rs, re);
+
+    if ((column >= cs) && (column <= ce) && (row >= rs) && (row <= re)) {
+       int w = tabular->GetWidthOfColumn(cell);
+       int h = tabular->GetAscentOfRow(row) + tabular->GetDescentOfRow(row);
+       pain.fillRectangle(x, baseline - tabular->GetAscentOfRow(row),
+                          w, h, LColor::selection);
+    }
+}
+
+
+void InsetTabular::update(BufferView * bv, LyXFont const & font, bool reinit)
+{
+    if (reinit) {
+       need_update = INIT;
+       calculate_dimensions_of_cells(bv, font, true);
+       if (owner())
+           owner()->update(bv, font, true);
+       return;
+    }
+    if (the_locking_inset)
+       the_locking_inset->update(bv, font, reinit);
+    switch(need_update) {
+    case INIT:
+    case FULL:
+    case CELL:
+       if (calculate_dimensions_of_cells(bv, font, false))
+           need_update = INIT;
+       break;
+    case SELECTION:
+       need_update = INIT;
+       break;
+    default:
+       break;
     }
 }
 
@@ -172,57 +316,105 @@ void InsetTabular::Edit(BufferView * bv, int x, int y, unsigned int button)
        lyxerr[Debug::INSETS] << "InsetTabular::Cannot lock inset" << endl;
        return;
     }
+    locked = true;
     the_locking_inset = 0;
-    sel_pos_start = sel_pos_end = inset_pos = inset_x = inset_y = 0;
-    setPos(bv->painter(), x, y);
-    sel_pos_start = sel_pos_end = cursor.pos;
-//    bv->text->FinishUndo();
-    UpdateLocal(bv, true);
+    inset_pos = inset_x = inset_y = 0;
+    setPos(bv, x, y);
+    sel_pos_start = sel_pos_end = cursor.pos();
+    sel_cell_start = sel_cell_end = actcell;
+    bv->text->FinishUndo();
+    if (InsetHit(bv, x, y)) {
+       ActivateCellInset(bv, x, y, button);
+    }
+    UpdateLocal(bv, NONE, false);
 //    bv->getOwner()->getPopups().updateFormTabular();
 }
 
 
 void InsetTabular::InsetUnlock(BufferView * bv)
 {
-    if (the_locking_inset)
+    if (the_locking_inset) {
        the_locking_inset->InsetUnlock(bv);
+       the_locking_inset = 0;
+    }
     HideInsetCursor(bv);
-    the_locking_inset = 0;
-    if (hasCharSelection()) {
-       sel_pos_start = sel_pos_end = cursor.pos;
-       UpdateLocal(bv, false);
-    } else
-       sel_pos_start = sel_pos_end = cursor.pos;
+    if (hasSelection()) {
+       sel_pos_start = sel_pos_end = 0;
+       sel_cell_start = sel_cell_end = 0;
+       UpdateLocal(bv, FULL, false);
+    }
     no_selection = false;
+    oldcell = -1;
+    locked = false;
 }
 
 
-bool InsetTabular::LockInsetInInset(UpdatableInset *)
+void InsetTabular::UpdateLocal(BufferView * bv, UpdateCodes what,
+                              bool mark_dirty)
 {
-    return true;
+    need_update = what;
+    bv->updateInset(this, mark_dirty);
+    if (what != NONE)
+       resetPos(bv);
 }
 
 
-bool InsetTabular::UnlockInsetInInset(BufferView * bv, UpdatableInset * inset,
-                                     bool lr)
+bool InsetTabular::LockInsetInInset(BufferView * bv, UpdatableInset * inset)
 {
-    if (!the_locking_inset)
+    lyxerr[Debug::INSETS] << "InsetTabular::LockInsetInInset(" <<inset<< "): ";
+    if (!inset)
        return false;
-    if (the_locking_inset == inset) {
-       the_locking_inset->InsetUnlock(bv);
-       the_locking_inset = 0;
-       if (lr)
-           moveRight(bv);
+    oldcell = -1;
+    if (inset == tabular->GetCellInset(actcell)) {
+       lyxerr[Debug::INSETS] << "OK" << endl;
+       the_locking_inset = tabular->GetCellInset(actcell);
+       resetPos(bv);
+       inset_x = cursor.x() - top_x + tabular->GetBeginningOfTextInCell(actcell);
+       inset_y = cursor.y();
+       inset_pos = cursor.pos();
        return true;
+    } else if (the_locking_inset && (the_locking_inset == inset)) {
+       if (cursor.pos() == inset_pos) {
+           lyxerr[Debug::INSETS] << "OK" << endl;
+           resetPos(bv);
+           inset_x = cursor.x() - top_x + tabular->GetBeginningOfTextInCell(actcell);
+           inset_y = cursor.y();
+       } else {
+           lyxerr[Debug::INSETS] << "cursor.pos != inset_pos" << endl;
+       }
+    } else if (the_locking_inset) {
+       lyxerr[Debug::INSETS] << "MAYBE" << endl;
+       return the_locking_inset->LockInsetInInset(bv, inset);
     }
-    return the_locking_inset->UnlockInsetInInset(bv, inset, lr);
+    lyxerr[Debug::INSETS] << "NOT OK" << endl;
+    return false;
 }
 
 
-void InsetTabular::UpdateLocal(BufferView * bv, bool flag)
+bool InsetTabular::UnlockInsetInInset(BufferView * bv, UpdatableInset * inset,
+                                  bool lr)
 {
-//    resetPos();
-    bv->updateInset(this, flag);
+    if (!the_locking_inset)
+        return false;
+    if (the_locking_inset == inset) {
+        the_locking_inset->InsetUnlock(bv);
+        the_locking_inset = 0;
+        if (lr)
+            moveRight(bv, false);
+       UpdateLocal(bv, CELL, false);
+        return true;
+    }
+    if (the_locking_inset->UnlockInsetInInset(bv, inset, lr)) {
+       if ((inset->LyxCode() == TABULAR_CODE) &&
+           !the_locking_inset->GetFirstLockingInsetOfType(TABULAR_CODE))
+       {
+           dialogs_ = bv->owner()->getDialogs();
+           dialogs_->updateTabular(const_cast<InsetTabular *>(this));
+           oldcell = actcell;
+       }
+       return true;
+    }
+    return false;
 }
 
 
@@ -232,46 +424,98 @@ bool InsetTabular::UpdateInsetInInset(BufferView * bv, Inset * inset)
        return false;
     if (the_locking_inset != inset)
        return the_locking_inset->UpdateInsetInInset(bv, inset);
-    UpdateLocal(bv);
+    UpdateLocal(bv, CELL, false);
     return true;
 }
 
 
-void InsetTabular::InsetButtonRelease(BufferView * bv,
-                                     int x, int y, int button)
+int InsetTabular::InsetInInsetY()
 {
-    if (the_locking_inset) {
-        the_locking_inset->InsetButtonRelease(bv, x-inset_x,y-inset_y,button);
-        return;
-    }
-    no_selection = false;
+    if (!the_locking_inset)
+       return 0;
+
+    return (inset_y + the_locking_inset->InsetInInsetY());
 }
 
 
-void InsetTabular::InsetButtonPress(BufferView * bv, int x, int y, int)
+UpdatableInset * InsetTabular::GetLockingInset()
 {
-    if (hasCharSelection()) {
-       sel_pos_start = sel_pos_end = 0;
-       UpdateLocal(bv, false);
+    return the_locking_inset ? the_locking_inset->GetLockingInset() : this;
+}
+
+
+UpdatableInset * InsetTabular::GetFirstLockingInsetOfType(Inset::Code c)
+{
+    if (c == LyxCode())
+       return this;
+    if (the_locking_inset)
+       return the_locking_inset->GetFirstLockingInsetOfType(c);
+    return 0;
+}
+
+
+bool InsetTabular::InsertInset(BufferView * bv, Inset * inset)
+{
+    if (the_locking_inset)
+       return the_locking_inset->InsertInset(bv, inset);
+    return false;
+}
+
+
+void InsetTabular::InsetButtonPress(BufferView * bv, int x, int y, int button)
+{
+    if (hasSelection()) {
+       sel_pos_start = sel_pos_end = sel_cell_start = sel_cell_end = 0;
+       UpdateLocal(bv, SELECTION, false);
     }
     no_selection = false;
-    if (the_locking_inset) {
-       // otherwise only unlock the_locking_inset
+
+    int ocell = actcell;
+
+    setPos(bv, x, y);
+    sel_pos_start = sel_pos_end = cursor.pos();
+    sel_cell_start = sel_cell_end = actcell;
+
+    bool inset_hit = InsetHit(bv, x, y);
+
+    if ((ocell == actcell) && the_locking_inset && inset_hit) {
+        the_locking_inset->InsetButtonPress(bv, x-inset_x, y-inset_y, button);
+        return;
+    } else if (the_locking_inset) {
        the_locking_inset->InsetUnlock(bv);
     }
-#if 0
-    int oldcell = actcell;
-#endif
-    setPos(bv->painter(),x,y);
     the_locking_inset = 0;
-    sel_pos_start = sel_pos_end = cursor.pos;
-    sel_cell_start = sel_cell_end = actcell;
+    if (inset_hit && bv->the_locking_inset) {
+       ActivateCellInset(bv, x, y, button);
+       the_locking_inset->InsetButtonPress(bv, x-inset_x, y-inset_y, button);
+    }
+}
+
+
+void InsetTabular::InsetButtonRelease(BufferView * bv,
+                                     int x, int y, int button)
+{
+    if (button == 3) {
+       if (the_locking_inset) {
+           UpdatableInset * i;
+           if ((i=the_locking_inset->GetFirstLockingInsetOfType(TABULAR_CODE))) {
+               i->InsetButtonRelease(bv, x, y, button);
+               return;
+           }
+       }
+       dialogs_ = bv->owner()->getDialogs();
+        dialogs_->showTabular(this);
 #if 0
-    if (button == 3)
-        bview->getOwner()->getPopups().showFormTabular();
-    else if (oldcell != actcell)
-        bview->getOwner()->getPopups().updateFormTabular();
+       else if (ocell != actcell)
+               bview->getOwner()->getPopups().updateTabular();
 #endif
+       return;
+    }
+    if (the_locking_inset) {
+        the_locking_inset->InsetButtonRelease(bv, x-inset_x, y-inset_y,button);
+        return;
+    }
+    no_selection = false;
 }
 
 
@@ -283,16 +527,16 @@ void InsetTabular::InsetMotionNotify(BufferView * bv, int x, int y, int button)
         return;
     }
     if (!no_selection) {
-           // int oldcell = actcell,
+           // int ocell = actcell,
            int old = sel_pos_end;
 
-       setPos(bv->painter(), x, y);
-       sel_pos_end = cursor.pos;
+       setPos(bv, x, y);
+       sel_pos_end = cursor.pos();
        sel_cell_end = actcell;
        if (old != sel_pos_end)
-           UpdateLocal(bv, false);
+           UpdateLocal(bv, SELECTION, false);
 #if 0
-       if (oldcell != actcell)
+       if (ocell != actcell)
            bview->getOwner()->getPopups().updateFormTabular();
 #endif
     }
@@ -322,117 +566,162 @@ UpdatableInset::RESULT InsetTabular::LocalDispatch(BufferView * bv, int action,
        resetPos(bv);
        return result;
     }
-    result=DISPATCHED;
 
     if ((action < 0) && arg.empty())
         return FINISHED;
 
     if ((action != LFUN_DOWN) && (action != LFUN_UP) &&
         (action != LFUN_DOWNSEL) && (action != LFUN_UPSEL))
-        cursor.x_fix = -1;
+        cursor.x_fix(-1);
     if (the_locking_inset) {
         result=the_locking_inset->LocalDispatch(bv, action, arg);
        if (result == DISPATCHED_NOUPDATE)
            return result;
        else if (result == DISPATCHED) {
-            setWidthOfCell(cursor.pos,actcell,actrow);
            the_locking_inset->ToggleInsetCursor(bv);
-           UpdateLocal(bv, false);
+           UpdateLocal(bv, CELL, false);
            the_locking_inset->ToggleInsetCursor(bv);
             return result;
         } else if (result == FINISHED) {
            if ((action == LFUN_RIGHT) || (action == -1)) {
-               cursor.pos = inset_pos + 1;
+               cursor.pos(inset_pos + 1);
                resetPos(bv);
            }
+           sel_pos_start = sel_pos_end = cursor.pos();
+           sel_cell_start = sel_cell_end = actcell;
            the_locking_inset=0;
            result = DISPATCHED;
            return result;
        }
     }
 
+    bool hs = hasSelection();
     HideInsetCursor(bv);
+    result=DISPATCHED;
     switch (action) {
-      // Normal chars not handled here
-      case -1:
-         break;
-      // --- Cursor Movements ---------------------------------------------
-      case LFUN_RIGHTSEL:
-          moveRight(bv);
-         sel_pos_end = cursor.pos;
-         UpdateLocal(bv, false);
-         break;
-      case LFUN_RIGHT:
-          result = moveRight(bv);
-         if (hasCharSelection()) {
-             sel_pos_start = sel_pos_end = cursor.pos;
-             UpdateLocal(bv, false);
-         } else
-             sel_pos_start = sel_pos_end = cursor.pos;
-          break;
-      case LFUN_LEFTSEL:
-          moveLeft();
-         sel_pos_end = cursor.pos;
-         UpdateLocal(bv, false);
-         break;
-      case LFUN_LEFT:
-          result= moveLeft();
-         if (hasCharSelection()) {
-             sel_pos_start = sel_pos_end = cursor.pos;
-             UpdateLocal(bv, false);
-         } else
-             sel_pos_start = sel_pos_end = cursor.pos;
-          break;
-      case LFUN_DOWNSEL:
-          moveDown();
-         sel_pos_end = cursor.pos;
-         UpdateLocal(bv, false);
-         break;
-      case LFUN_DOWN:
-          result= moveDown();
-         if (hasCharSelection()) {
-             sel_pos_start = sel_pos_end = cursor.pos;
-             UpdateLocal(bv, false);
-         } else
-             sel_pos_start = sel_pos_end = cursor.pos;
-          break;
-      case LFUN_UPSEL:
-          moveUp();
-         sel_pos_end = cursor.pos;
-         UpdateLocal(bv, false);
-         break;
-      case LFUN_UP:
-          result= moveUp();
-         if (hasCharSelection()) {
-             sel_pos_start = sel_pos_end = cursor.pos;
-             UpdateLocal(bv, false);
-         } else
-             sel_pos_start = sel_pos_end = cursor.pos;
-          break;
-      case LFUN_BACKSPACE:
-         break;
-      case LFUN_DELETE:
-          break;
-      case LFUN_HOME:
-          break;
-      case LFUN_END:
-          break;
-      case LFUN_TAB:
-         if (hasCharSelection()) {
-             sel_pos_start = sel_pos_end = cursor.pos;
-             UpdateLocal(bv, false);
-         }
-         sel_pos_start = sel_pos_end = cursor.pos;
-          moveNextCell();
-          break;
-      default:
-          result = UNDISPATCHED;
-          break;
+       // Normal chars not handled here
+    case -1:
+       break;
+       // --- Cursor Movements ---------------------------------------------
+    case LFUN_RIGHTSEL:
+       if (tabular->IsLastCellInRow(actcell) && !cellstart(cursor.pos()))
+           break;
+       moveRight(bv, false);
+       sel_pos_end = cursor.pos();
+       if (!cellstart(cursor.pos())) {
+           if (tabular->right_column_of_cell(sel_cell_start) >
+               tabular->right_column_of_cell(actcell))
+               sel_cell_end = actcell+1;
+           else
+               sel_cell_end = actcell;
+       }
+       UpdateLocal(bv, SELECTION, false);
+       break;
+    case LFUN_RIGHT:
+       result = moveRight(bv);
+       sel_pos_start = sel_pos_end = cursor.pos();
+       sel_cell_start = sel_cell_end = actcell;
+       if (hs)
+           UpdateLocal(bv, SELECTION, false);
+       break;
+    case LFUN_LEFTSEL:
+       if (tabular->IsFirstCellInRow(actcell) && cellstart(cursor.pos()))
+           break;
+       moveLeft(bv, false);
+       sel_pos_end = cursor.pos();
+       if (cellstart(cursor.pos())) {
+           if (tabular->column_of_cell(sel_cell_start) >=
+               tabular->column_of_cell(actcell))
+               sel_cell_end = actcell;
+           else
+               sel_cell_end = actcell-1;
+       }
+       UpdateLocal(bv, SELECTION, false);
+       break;
+    case LFUN_LEFT:
+       result = moveLeft(bv);
+       sel_pos_start = sel_pos_end = cursor.pos();
+       sel_cell_start = sel_cell_end = actcell;
+       if (hs)
+           UpdateLocal(bv, SELECTION, false);
+       break;
+    case LFUN_DOWNSEL:
+    {
+       int ocell = actcell;
+       moveDown(bv);
+       sel_pos_end = cursor.pos();
+       if ((ocell == sel_cell_end) ||
+           (tabular->column_of_cell(ocell)>tabular->column_of_cell(actcell)))
+           sel_cell_end = tabular->GetCellBelow(sel_cell_end);
+       else
+           sel_cell_end = tabular->GetLastCellBelow(sel_cell_end);
+       UpdateLocal(bv, SELECTION, false);
+    }
+    break;
+    case LFUN_DOWN:
+       result= moveDown(bv);
+       sel_pos_start = sel_pos_end = cursor.pos();
+       sel_cell_start = sel_cell_end = actcell;
+       if (hs)
+           UpdateLocal(bv, SELECTION, false);
+       break;
+    case LFUN_UPSEL:
+    {
+       int ocell = actcell;
+       moveUp(bv);
+       sel_pos_end = cursor.pos();
+       if ((ocell == sel_cell_end) ||
+           (tabular->column_of_cell(ocell)>tabular->column_of_cell(actcell)))
+           sel_cell_end = tabular->GetCellAbove(sel_cell_end);
+       else
+           sel_cell_end = tabular->GetLastCellAbove(sel_cell_end);
+       UpdateLocal(bv, SELECTION, false);
+    }
+    break;
+    case LFUN_UP:
+       result= moveUp(bv);
+       sel_pos_start = sel_pos_end = cursor.pos();
+       sel_cell_start = sel_cell_end = actcell;
+       if (hs)
+           UpdateLocal(bv, SELECTION, false);
+       break;
+    case LFUN_BACKSPACE:
+       break;
+    case LFUN_DELETE:
+       break;
+    case LFUN_HOME:
+       break;
+    case LFUN_END:
+       break;
+    case LFUN_SHIFT_TAB:
+    case LFUN_TAB:
+       if (the_locking_inset) {
+           UnlockInsetInInset(bv, the_locking_inset);
+           the_locking_inset = 0;
+       }
+       if (action == LFUN_TAB)
+           moveNextCell(bv);
+       else
+           movePrevCell(bv);
+       sel_pos_start = sel_pos_end = cursor.pos();
+       sel_cell_start = sel_cell_end = actcell;
+       if (hs)
+           UpdateLocal(bv, SELECTION, false);
+       break;
+    case LFUN_LAYOUT_TABLE:
+    {
+       dialogs_ = bv->owner()->getDialogs();
+        dialogs_->showTabular(this);
+    }
+    break;
+    default:
+       result = UNDISPATCHED;
+       break;
     }
     if (result!=FINISHED) {
        if (!the_locking_inset) {
 #if 0      
-           if (oldcell != actcell)
+           if (ocell != actcell)
                bview->getOwner()->getPopups().updateFormTabular();
 #endif
            ShowInsetCursor(bv);
@@ -443,24 +732,26 @@ UpdatableInset::RESULT InsetTabular::LocalDispatch(BufferView * bv, int action,
 }
 
 
-int InsetTabular::Latex(ostream & os, bool, bool) const
+int InsetTabular::Latex(Buffer const * buf, ostream & os,
+                       bool fragile, bool fp) const
 {
-    return tabular->Latex(os);
+    return tabular->Latex(buf, os, fragile, fp);
 }
 
 
-int InsetTabular::Ascii(ostream &) const
+int InsetTabular::Ascii(Buffer const *, ostream &) const
 {
     return 0;
 }
 
-int InsetTabular::Linuxdoc(ostream &) const
+
+int InsetTabular::Linuxdoc(Buffer const *, ostream &) const
 {
     return 0;
 }
 
 
-int InsetTabular::DocBook(ostream &) const
+int InsetTabular::DocBook(Buffer const *, ostream &) const
 {
     return 0;
 }
@@ -468,74 +759,43 @@ int InsetTabular::DocBook(ostream &) const
 
 void InsetTabular::Validate(LaTeXFeatures & features) const
 {
-    if (tabular->IsLongTabular())
-        features.longtable = true;
+    tabular->Validate(features);
 }
 
 
-void InsetTabular::calculate_width_of_cells(Painter & pain,
-                                           LyXFont const & font) const
+bool InsetTabular::calculate_dimensions_of_cells(BufferView * bv,
+                                                LyXFont const & font,
+                                                bool reinit) const
 {
-       int cell = -1;
-        int maxAsc, maxDesc;
-       InsetText * inset;
+    int cell = -1;
+    int maxAsc, maxDesc;
+    InsetText * inset;
+    bool changed = false;
     
-       for(int i = 0; i < tabular->rows(); ++i) {
-               maxAsc = maxDesc = 0;
-               for(int j= 0; j < tabular->columns(); ++j) {
-                       if (tabular->IsPartOfMultiColumn(i,j))
-                               continue;
-                       ++cell;
-                       inset = tabular->GetCellInset(cell);
-                       maxAsc = max(maxAsc, inset->ascent(pain, font));
-                       maxDesc = max(maxDesc, inset->descent(pain, font));
-                       tabular->SetWidthOfCell(cell,
-                                               inset->width(pain, font));
-               }
-               tabular->SetAscentOfRow(i, maxAsc + ADD_TO_HEIGHT);
-               tabular->SetDescentOfRow(i, maxDesc + ADD_TO_HEIGHT);
+    for(int i = 0; i < tabular->rows(); ++i) {
+       maxAsc = maxDesc = 0;
+       for(int j= 0; j < tabular->columns(); ++j) {
+           if (tabular->IsPartOfMultiColumn(i,j))
+               continue;
+           ++cell;
+           inset = tabular->GetCellInset(cell);
+           if (!reinit)
+               inset->update(bv, font, false);
+           maxAsc = max(maxAsc, inset->ascent(bv, font));
+           maxDesc = max(maxDesc, inset->descent(bv, font));
+           changed = tabular->SetWidthOfCell(cell, inset->width(bv, font)) || changed;
        }
+       changed = tabular->SetAscentOfRow(i, maxAsc + ADD_TO_HEIGHT) || changed;
+       changed = tabular->SetDescentOfRow(i, maxDesc + ADD_TO_HEIGHT) || changed;
+    }
+    return changed;
 }
 
 
-void InsetTabular::DrawCellLines(Painter & pain, int x, int baseline,
-                                 int row, int cell) const
-{
-    // Juergen, have you thought about drawing the on-off lines in a
-    // different color (gray of some kind), especially since those
-    // lines will not be there on the hardcopy anyway. (Lgb)
-    int  x2 = x + tabular->WidthOfColumn(cell);
-    bool on_off = !tabular->TopLine(cell);
-
-    if (!tabular->TopAlreadyDrawed(cell))
-       pain.line(x, baseline - tabular->AscentOfRow(row),
-                 x2, baseline -  tabular->AscentOfRow(row),
-                 on_off ? LColor::tabularonoffline:LColor::tabularline,
-                 on_off ? Painter::line_onoffdash:Painter::line_solid);
-    on_off = !tabular->BottomLine(cell);
-    pain.line(x,baseline +  tabular->DescentOfRow(row),
-             x2, baseline +  tabular->DescentOfRow(row),
-             on_off ? LColor::tabularonoffline:LColor::tabularline,
-             on_off ? Painter::line_onoffdash:Painter::line_solid);
-    on_off = !tabular->LeftLine(cell);
-    pain.line(x, baseline -  tabular->AscentOfRow(row),
-              x, baseline +  tabular->DescentOfRow(row),
-             on_off ? LColor::tabularonoffline:LColor::tabularline,
-              on_off ? Painter::line_onoffdash:Painter::line_solid);
-    on_off = !tabular->RightLine(cell);
-    pain.line(x2 - tabular->AdditionalWidth(cell),
-              baseline -  tabular->AscentOfRow(row),
-              x2 - tabular->AdditionalWidth(cell),
-              baseline +  tabular->DescentOfRow(row),
-             on_off ? LColor::tabularonoffline:LColor::tabularline,
-              on_off ? Painter::line_onoffdash:Painter::line_solid);
-}
-
-
-void InsetTabular::GetCursorPos(int & x, int & y)
+void InsetTabular::GetCursorPos(BufferView *, int & x, int & y) const
 {
-    x = cursor.x-top_x;
-    y = cursor.y;
+    x = cursor.x() - top_x;
+    y = cursor.y();
 }
 
 
@@ -554,7 +814,7 @@ void InsetTabular::ToggleInsetCursor(BufferView * bv)
     if (cursor_visible)
         bv->hideLockedInsetCursor();
     else
-        bv->showLockedInsetCursor(cursor.x, cursor.y, asc, desc);
+        bv->showLockedInsetCursor(cursor.x(), cursor.y(), asc, desc);
     cursor_visible = !cursor_visible;
 }
 
@@ -566,8 +826,8 @@ void InsetTabular::ShowInsetCursor(BufferView * bv)
     
        int asc = lyxfont::maxAscent(font);
        int desc = lyxfont::maxDescent(font);
-       bv->fitLockedInsetCursor(cursor.x, cursor.y, asc, desc);
-       bv->showLockedInsetCursor(cursor.x, cursor.y, asc, desc);
+       bv->fitLockedInsetCursor(cursor.x(), cursor.y(), asc, desc);
+       bv->showLockedInsetCursor(cursor.x(), cursor.y(), asc, desc);
        cursor_visible = true;
     }
 }
@@ -580,105 +840,173 @@ void InsetTabular::HideInsetCursor(BufferView * bv)
 }
 
 
-void InsetTabular::setPos(Painter &, int x, int y) const
+void InsetTabular::setPos(BufferView * bv, int x, int y) const
 {
-    cursor.y = cursor.pos = actcell = actrow = actcol = 0;
-    int ly = tabular->DescentOfRow(actrow);
+       cursor.y(0);
+       cursor.pos(0);
+       
+       actcell = actrow = actcol = 0;
+    int ly = tabular->GetDescentOfRow(actrow);
 
     // first search the right row
     while((ly < y) && (actrow < tabular->rows())) {
-        cursor.y += tabular->DescentOfRow(actrow) +
-               tabular->AscentOfRow(actrow+1) +
-            tabular->AdditionalHeight(tabular->GetCellNumber(actcol,actrow+1));
+        cursor.y(cursor.y() + tabular->GetDescentOfRow(actrow) +
+           tabular->GetAscentOfRow(actrow+1) +
+            tabular->GetAdditionalHeight(tabular->GetCellNumber(actrow + 1,
+                                                               actcol)));
         ++actrow;
-        ly = cursor.y + tabular->DescentOfRow(actrow);
+        ly = cursor.y() + tabular->GetDescentOfRow(actrow);
     }
-    actcell = tabular->GetCellNumber(actcol, actrow);
+    actcell = tabular->GetCellNumber(actrow, actcol);
 
     // now search the right column
-    int lx = tabular->GetWidthOfCell(actcell);
-    for(;
-       !tabular->IsLastCellInRow(actcell) && (lx < x);
-       ++actcell,lx += tabular->GetWidthOfCell(actcell)) {}
-    cursor.x = lx - tabular->GetWidthOfCell(actcell) + top_x + 2;
+    int lx = tabular->GetWidthOfColumn(actcell) -
+       tabular->GetAdditionalWidth(actcell);
+    for(; !tabular->IsLastCellInRow(actcell) && (lx < x);
+       ++actcell,lx += tabular->GetWidthOfColumn(actcell) +
+           tabular->GetAdditionalWidth(actcell - 1));
+    cursor.pos(((actcell+1) * 2) - 1);
+    resetPos(bv);
+    if ((lx - (tabular->GetWidthOfColumn(actcell)/2)) < x) {
+       cursor.x(lx + top_x - 2);
+    } else {
+       cursor.pos(cursor.pos() - 1);
+       cursor.x(lx - tabular->GetWidthOfColumn(actcell) + top_x + 2);
+    }
+    resetPos(bv);
 }
 
 
-void InsetTabular::resetPos(BufferView * bv)
+int InsetTabular::getCellXPos(int cell) const
 {
-    actrow = cursor.y = actcol = 0;
+    int c;
+
+    for(c=cell;!tabular->IsFirstCellInRow(c);--c)
+       ;
+    int lx = tabular->GetWidthOfColumn(cell);
+    for(; (c < cell); ++c) {
+       lx += tabular->GetWidthOfColumn(c);
+    }
+    return (lx - tabular->GetWidthOfColumn(cell) + top_x +
+           ADD_TO_TABULAR_WIDTH);
+}
+
+
+void InsetTabular::resetPos(BufferView * bv) const
+{
+    if (!locked)
+       return;
+    actcol = tabular->column_of_cell(actcell);
 
     int cell = 0;
+    actrow = 0;
+    cursor.y(0);
     for(; (cell<actcell) && !tabular->IsLastRow(cell); ++cell) {
        if (tabular->IsLastCellInRow(cell)) {
-           cursor.y += tabular->DescentOfRow(actrow) +
-               tabular->AscentOfRow(actrow+1) +
-               tabular->AdditionalHeight(cell+1);
+           cursor.y(cursor.y() + tabular->GetDescentOfRow(actrow) +
+               tabular->GetAscentOfRow(actrow + 1) +
+               tabular->GetAdditionalHeight(cell + 1));
            ++actrow;
        }
     }
-    for(cell=actcell;!tabular->IsFirstCellInRow(cell);--cell)
-       ;
-    int lx = tabular->GetWidthOfCell(actcell);
-    for(; (cell < actcell); ++cell) {
-       lx += tabular->GetWidthOfCell(actcell);
-       ++actcol;
-    }
-    cursor.x = lx - tabular->GetWidthOfCell(actcell) + top_x + 2;
-    if (cursor.pos % 2) {
+    cursor.x(getCellXPos(actcell) + 2);
+    if (cursor.pos() % 2) {
        LyXFont font(LyXFont::ALL_SANE);
-       cursor.x += tabular->GetCellInset(actcell)->width(bv->painter(),font);
+       cursor.x(cursor.x() + tabular->GetCellInset(actcell)->width(bv,font) +
+               tabular->GetBeginningOfTextInCell(actcell));
+    }
+    if ((!the_locking_inset ||
+        !the_locking_inset->GetFirstLockingInsetOfType(TABULAR_CODE)) &&
+       (actcell != oldcell)) {
+       dialogs_ = bv->owner()->getDialogs();
+        dialogs_->updateTabular(const_cast<InsetTabular *>(this));
+       oldcell = actcell;
     }
 }
 
 
-void InsetTabular::setWidthOfCell(int, int, int)
-{
-}
-
-
-UpdatableInset::RESULT InsetTabular::moveRight(BufferView * bv)
+UpdatableInset::RESULT InsetTabular::moveRight(BufferView * bv, bool lock)
 {
-    if (cursor.pos % 2) { // behind the inset
-       ++actcell;
-       if (actcell >= tabular->GetNumberOfCells())
+    if (!cellstart(cursor.pos())) {
+       if (tabular->IsLastCell(actcell))
            return FINISHED;
-       ++cursor.pos;
+       ++actcell;
+       cursor.pos(cursor.pos() + 1);
+    } else if (lock) {
+       if (ActivateCellInset(bv))
+           return DISPATCHED;
     } else {              // before the inset
-       ++cursor.pos;
+       cursor.pos(cursor.pos() + 1);
     }
     resetPos(bv);
     return DISPATCHED_NOUPDATE;
 }
 
 
-UpdatableInset::RESULT InsetTabular::moveLeft()
+UpdatableInset::RESULT InsetTabular::moveLeft(BufferView * bv, bool lock)
 {
+    if (!cursor.pos()) {
+       if (!actcell)
+           return FINISHED;
+       cursor.pos(2);
+    }
+    cursor.pos(cursor.pos() - 1);
+    if (!cellstart(cursor.pos())) {
+       --actcell;
+    } else if (lock) {       // behind the inset
+       if (ActivateCellInset(bv, 0, 0, 0, true))
+           return DISPATCHED;
+    }
+    resetPos(bv);
     return DISPATCHED_NOUPDATE;
 }
 
 
-UpdatableInset::RESULT InsetTabular::moveUp()
+UpdatableInset::RESULT InsetTabular::moveUp(BufferView * bv)
 {
+    int ocell = actcell;
+    actcell = tabular->GetCellAbove(actcell);
+    if (actcell == ocell) // we moved out of the inset
+       return FINISHED;
+    resetPos(bv);
     return DISPATCHED_NOUPDATE;
 }
 
 
-UpdatableInset::RESULT InsetTabular::moveDown()
+UpdatableInset::RESULT InsetTabular::moveDown(BufferView * bv)
 {
+    int ocell = actcell;
+    actcell = tabular->GetCellBelow(actcell);
+    if (actcell == ocell) // we moved out of the inset
+       return FINISHED;
+    resetPos(bv);
     return DISPATCHED_NOUPDATE;
 }
 
 
-bool InsetTabular::moveNextCell()
+bool InsetTabular::moveNextCell(BufferView * bv)
 {
-    return false;
+    if (tabular->IsLastCell(actcell))
+       return false;
+    ++actcell;
+    cursor.pos(cursor.pos() + 1);
+    if (!cellstart(cursor.pos()))
+       cursor.pos(cursor.pos() + 1);
+    resetPos(bv);
+    return true;
 }
 
 
-bool InsetTabular::movePrevCell()
+bool InsetTabular::movePrevCell(BufferView * bv)
 {
-    return false;
+    if (!actcell) // first cell
+       return false;
+    --actcell;
+    cursor.pos(cursor.pos() - 1);
+    if (cellstart(cursor.pos()))
+       cursor.pos(cursor.pos() - 1);
+    resetPos(bv);
+    return true;
 }
 
 
@@ -688,18 +1016,21 @@ bool InsetTabular::Delete()
 }
 
 
-void  InsetTabular::SetFont(LyXFont const &)
+void InsetTabular::SetFont(BufferView * bv, LyXFont const & font, bool tall)
 {
+    if (the_locking_inset)
+       the_locking_inset->SetFont(bv, font, tall);
 }
 
 
-void InsetTabular::TabularFeatures(int, string)
+void InsetTabular::TabularFeatures(BufferView * bv, int feature, string val)
 {
-#if 0
     int
-       i,
-       sel_pos_start,
-       sel_pos_end,
+       i, j,
+       sel_col_start,
+       sel_col_end,
+       sel_row_start,
+       sel_row_end,
         setLines = 0,
         setAlign = LYX_ALIGN_LEFT,
         lineSet;
@@ -719,320 +1050,317 @@ void InsetTabular::TabularFeatures(int, string)
       default:
           break;
     }
-    if (hasCellSelection()) {
-       if (sel_cell_start > sel_cell_end) {
-           sel_pos_start = sel_cell_end;
-           sel_pos_end = sel_cell_start;
+    if (hasSelection()) {
+       int tmp;
+       sel_col_start = tabular->column_of_cell(sel_cell_start);
+       sel_col_end = tabular->column_of_cell(sel_cell_end);
+       if (sel_col_start > sel_col_end) {
+           sel_col_end = sel_col_start;
+           sel_col_start = tabular->column_of_cell(sel_cell_end);
        } else {
-           sel_pos_start = sel_cell_start;
-           sel_pos_end = sel_cell_end;
+           sel_col_end = tabular->right_column_of_cell(sel_cell_end);
        }
-    } else
-       sel_pos_start = sel_pos_end = actcell;
+       
+       sel_row_start = tabular->row_of_cell(sel_cell_start);
+       sel_row_end = tabular->row_of_cell(sel_cell_end);
+       if (sel_row_start > sel_row_end) {
+           tmp = sel_row_start;
+           sel_row_start = sel_row_end;
+           sel_row_end = tmp;
+       }
+    } else {
+       sel_col_start = sel_col_end = tabular->column_of_cell(actcell);
+       sel_row_start = sel_row_end = tabular->row_of_cell(actcell);
+    }
+    bv->text->SetUndo(bv->buffer(), Undo::FINISH, 
+             bv->text->cursor.par()->ParFromPos(bv->text->cursor.pos())->previous,
+             bv->text->cursor.par()->ParFromPos(bv->text->cursor.pos())->next);
+
+    int row = tabular->row_of_cell(actcell);
+    int column = tabular->column_of_cell(actcell);
+
     switch (feature) {
-      case LyXTabular::SET_PWIDTH:
-          tabular->SetPWidth(actcell,val);
-          break;
-      case LyXTabular::SET_SPECIAL_COLUMN:
-      case LyXTabular::SET_SPECIAL_MULTI:
-          tabular->SetAlignSpecial(actcell,val,feature);
-          break;
-      case LyXTabular::APPEND_ROW:
-      {
-         int
-              pos = cursor.pos,
-              cell_org = actcell,
-              cell = actcell;
-
-          // if there is a ContRow following this row I have to add
-          // the row after the ContRow's
-          if ((pos < par->last()) && tabular->RowHasContRow(cell_org)) {
-              while((pos < par->last()) && !tabular->IsContRow(cell)) {
-                  while (pos < par->last() && !par->IsNewline(pos))
-                      ++pos;
-                  if (pos < par->last())
-                      ++pos;
-                  ++cell;
-              }
-              while((pos < par->last()) && tabular->IsContRow(cell)) {
-                  while (pos < par->last() && !par->IsNewline(pos))
-                      ++pos;
-                  if (pos < par->last())
-                      ++pos;
-                  ++cell;
-              }
-              cell_org = --cell;
-              if (pos < par->last())
-                  --pos;
-          }
-          while ((pos < par->last()) && 
-                 ((cell == cell_org) || !tabular->IsFirstCell(cell))) {
-              while ((pos < par->last()) && !par->IsNewline(pos))
-                  ++pos;
-              if (pos < par->last())
-                  ++pos;
-              ++cell;
-          }
-          // insert the new cells
-          int number = tabular->NumberOfCellsInRow(cell_org);
-          for (i=0; i<number; ++i)
-              par->InsertChar(pos, LYX_META_NEWLINE);
-               
-          // append the row into the tabular
-          tabular->AppendRow(cell_org);
-          calculate_width_of_cells();
-          UpdateLocal();
-          return;
-      }
-      case LyXTabular::APPEND_CONT_ROW:
-      {
-         int
-              pos = cursor.pos,
-              cell_org = actcell,
-              cell = actcell;
-
-          // if there is already a controw but not for this cell
-          // the AppendContRow sets only the right values but does
-          // not actually add a row
-          if (tabular->RowHasContRow(cell_org) &&
-              (tabular->CellHasContRow(cell_org) < 0)) {
-              tabular->AppendContRow(cell_org);
-              calculate_width_of_cells();
-              UpdateLocal();
-              return;
-          }
-          while ((pos < par->last()) &&
-                 ((cell == cell_org) || !tabular->IsFirstCell(cell))) {
-              while (pos < par->last() && !par->IsNewline(pos))
-                  ++pos;
-              if (pos < par->last())
-                  ++pos;
-              ++cell;
-          }
-          // insert the new cells
-          int number = tabular->NumberOfCellsInRow(cell_org);
-          for (i=0; i<number; ++i)
-              par->InsertChar(pos, LYX_META_NEWLINE);
-          // append the row into the tabular
-          tabular->AppendContRow(cell_org);
-          calculate_width_of_cells();
-          UpdateLocal();
-          return;
-      }
-      case LyXTabular::APPEND_COLUMN:
-      { 
-         int
-              pos = 0,
-              cell_org = actcell,
-              cell = 0;
-          do {
-              if (pos && (par->IsNewline(pos-1))) {
-                  if (tabular->AppendCellAfterCell(cell_org, cell)) {
-                      par->InsertChar(pos, LYX_META_NEWLINE);
-                      if (pos <= cursor.pos)
-                          ++cursor.pos;
-                      ++pos;
-                  }
-                  ++cell;
-              }
-              ++pos;
-          } while (pos <= par->last());
-          // remember that the very last cell doesn't end with a newline.
-          // This saves one byte memory per tabular ;-)
-          if (tabular->AppendCellAfterCell(cell_org, cell))
-              par->InsertChar(par->last(), LYX_META_NEWLINE);
-          // append the column into the tabular
-          tabular->AppendColumn(cell_org);
-          calculate_width_of_cells();
-          UpdateLocal();
-          return;
-      }
-      case LyXTabular::DELETE_ROW:
-          RemoveTabularRow();
-          calculate_width_of_cells();
-          UpdateLocal();
-          return;
-      case LyXTabular::DELETE_COLUMN:
-      {
-          int pos = 0;
-          int cell = 0;
-          do {
-              if (!pos || (par->IsNewline(pos-1))){
-                  if (tabular->DeleteCellIfColumnIsDeleted(cell, actcell)) {
-                      // delete one cell
-                      while (pos < par->last() && !par->IsNewline(pos))
-                          par->Erase(pos);
-                      if (pos < par->last())
-                          par->Erase(pos);
-                      else 
-                          par->Erase(pos - 1); // the missing newline
-                                               // at the end of a tabular
-                      --pos; // because of ++pos below
-                  }
-                  ++cell;
-              }
-              ++pos;
-          } while (pos <= par->last());
-          /* delete the column from the tabular */ 
-          tabular->DeleteColumn(actcell);
-          calculate_width_of_cells();
-          UpdateLocal();
-          return;
-      }
-      case LyXTabular::TOGGLE_LINE_TOP:
-          lineSet = !tabular->TopLine(actcell);
-         for(i=sel_pos_start; i<=sel_pos_end; ++i)
-             tabular->SetTopLine(i,lineSet);
-          calculate_width_of_cells();
-          UpdateLocal();
-          return;
+    case LyXTabular::SET_PWIDTH:
+    {
+       bool update = (tabular->GetPWidth(actcell) != val);
+       tabular->SetPWidth(actcell,val);
+       if (update) {
+           for (int i=0; i < tabular->rows(); ++i) {
+               tabular->GetCellInset(tabular->GetCellNumber(i, column))->
+                   deleteLyXText(bv);
+           }
+           UpdateLocal(bv, INIT, true);
+       }
+    }
+    break;
+    case LyXTabular::SET_SPECIAL_COLUMN:
+    case LyXTabular::SET_SPECIAL_MULTI:
+       tabular->SetAlignSpecial(actcell,val,feature);
+       break;
+    case LyXTabular::APPEND_ROW:
+       // append the row into the tabular
+       UnlockInsetInInset(bv, the_locking_inset);
+       tabular->AppendRow(actcell);
+       UpdateLocal(bv, INIT, true);
+       break;
+    case LyXTabular::APPEND_COLUMN:
+       // append the column into the tabular
+       tabular->AppendColumn(actcell);
+       actcell = tabular->GetCellNumber(row, column);
+       UpdateLocal(bv, INIT, true);
+       break;
+    case LyXTabular::DELETE_ROW:
+       tabular->DeleteRow(tabular->row_of_cell(actcell));
+       if ((row+1) > tabular->rows())
+           --row;
+       actcell = tabular->GetCellNumber(row, column);
+       UpdateLocal(bv, INIT, true);
+       break;
+    case LyXTabular::DELETE_COLUMN:
+       tabular->DeleteColumn(tabular->column_of_cell(actcell));
+       if ((column+1) > tabular->columns())
+           --column;
+       actcell = tabular->GetCellNumber(row, column);
+       UpdateLocal(bv, INIT, true);
+       break;
+    case LyXTabular::TOGGLE_LINE_TOP:
+       lineSet = !tabular->TopLine(actcell);
+       for(i=sel_row_start; i<=sel_row_end; ++i)
+           for(j=sel_col_start; j<=sel_col_end; ++j)
+               tabular->SetTopLine(tabular->GetCellNumber(i,j),lineSet);
+       UpdateLocal(bv, INIT, true);
+       break;
     
-      case LyXTabular::TOGGLE_LINE_BOTTOM:
-          lineSet = !tabular->BottomLine(actcell); 
-         for(i=sel_pos_start; i<=sel_pos_end; ++i)
-             tabular->SetBottomLine(i,lineSet);
-          calculate_width_of_cells();
-          UpdateLocal();
-          return;
+    case LyXTabular::TOGGLE_LINE_BOTTOM:
+       lineSet = !tabular->BottomLine(actcell); 
+       for(i=sel_row_start; i<=sel_row_end; ++i)
+           for(j=sel_col_start; j<=sel_col_end; ++j)
+               tabular->SetBottomLine(tabular->GetCellNumber(i,j),lineSet);
+       UpdateLocal(bv, INIT, true);
+       break;
                
-      case LyXTabular::TOGGLE_LINE_LEFT:
-          lineSet = !tabular->LeftLine(actcell);
-         for(i=sel_pos_start; i<=sel_pos_end; ++i)
-             tabular->SetLeftLine(i,lineSet);
-          calculate_width_of_cells();
-          UpdateLocal();
-          return;
-
-      case LyXTabular::TOGGLE_LINE_RIGHT:
-          lineSet = !tabular->RightLine(actcell);
-         for(i=sel_pos_start; i<=sel_pos_end; ++i)
-             tabular->SetRightLine(i,lineSet);
-          calculate_width_of_cells();
-          UpdateLocal();
-          return;
-      case LyXTabular::ALIGN_LEFT:
-      case LyXTabular::ALIGN_RIGHT:
-      case LyXTabular::ALIGN_CENTER:
-         for(i=sel_pos_start; i<=sel_pos_end; ++i)
-             tabular->SetAlignment(i,setAlign);
-          UpdateLocal();
-          return;
-      case LyXTabular::MULTICOLUMN:
-      {
-         if (tabular->row_of_cell(sel_pos_start) !=
-             tabular->row_of_cell(sel_pos_end)) {
-             WriteAlert(_("Impossible Operation!"), 
-                        _("Multicolumns can only be horizontally."), 
-                        _("Sorry."));
-             return;
-         }
-         // just multicol for one Single Cell
-         if (!hasCellSelection()) {
-             // check wether we are completly in a multicol
-             if (tabular->IsMultiColumn(actcell)) {
-                 int
-                     newlines,
-                     pos = cursor.pos;
-                 if ((newlines=tabular->UnsetMultiColumn(actcell))) {
-                     while ((pos < par->last()) && !par->IsNewline(pos))
-                         ++pos;
-                     for (;newlines;--newlines)
-                         par->InsertChar(pos, LYX_META_NEWLINE);
-                 }
-                 calculate_width_of_cells();
-             } else {
-                 tabular->SetMultiColumn(actcell, 1);
-             }
-             UpdateLocal();
-             return;
-         }
-         // we have a selection so this means we just add all this
-         // cells to form a multicolumn cell
-         int
-             number = 1,
-             s_start, s_end;
-
-         if (sel_pos_start > sel_pos_end) {
-             s_start = sel_pos_end;
-             s_end = sel_pos_start;
-         } else {
-             s_start = sel_pos_start;
-             s_end = sel_pos_end;
-         }
-         for(i=s_start; i < s_end; ++i) {
-             if (par->IsNewline(i)) {
-                 par->Erase(i);
-                 // check for double-blanks
-                 if ((i && !par->IsLineSeparator(i-1)) &&
-                     (i < par->last()) && !par->IsLineSeparator(i))
-                     par->InsertChar(i, ' ');
-                 else
-                     --i;
-                 ++number;
-             }
-         }
-         tabular->SetMultiColumn(sel_pos_start,number);
-         cursor.pos = s_start;
-         sel_cell_end = sel_cell_start;
-         calculate_width_of_cells();
-         UpdateLocal();
-          return;
-      }
-      case LyXTabular::SET_ALL_LINES:
-          setLines = 1;
-      case LyXTabular::UNSET_ALL_LINES:
-         for(i=sel_pos_start; i<=sel_pos_end; ++i)
-             tabular->SetAllLines(i, setLines);
-          calculate_width_of_cells();
-          UpdateLocal();
-          return;
-      case LyXTabular::SET_LONGTABULAR:
-          tabular->SetLongTabular(true);
-         UpdateLocal(); // because this toggles displayed
-          return;
-      case LyXTabular::UNSET_LONGTABULAR:
-          tabular->SetLongTabular(false);
-         UpdateLocal(); // because this toggles displayed
-          return;
-      case LyXTabular::SET_ROTATE_TABULAR:
-          tabular->SetRotateTabular(true);
-          return;
-      case LyXTabular::UNSET_ROTATE_TABULAR:
-          tabular->SetRotateTabular(false);
-          return;
-      case LyXTabular::SET_ROTATE_CELL:
-         for(i=sel_pos_start; i<=sel_pos_end; ++i)
-             tabular->SetRotateCell(i,true);
-          return;
-      case LyXTabular::UNSET_ROTATE_CELL:
-         for(i=sel_pos_start; i<=sel_pos_end; ++i)
-             tabular->SetRotateCell(i,false);
-          return;
-      case LyXTabular::SET_LINEBREAKS:
-          what = !tabular->Linebreaks(tabular->FirstVirtualCell(actcell));
-         for(i=sel_pos_start; i<=sel_pos_end; ++i)
-             tabular->SetLinebreaks(i,what);
-          return;
-      case LyXTabular::SET_LTFIRSTHEAD:
-          tabular->SetLTHead(actcell,true);
-          return;
-      case LyXTabular::SET_LTHEAD:
-          tabular->SetLTHead(actcell,false);
-          return;
-      case LyXTabular::SET_LTFOOT:
-          tabular->SetLTFoot(actcell,false);
-          return;
-      case LyXTabular::SET_LTLASTFOOT:
-          tabular->SetLTFoot(actcell,true);
-          return;
-      case LyXTabular::SET_LTNEWPAGE:
-          what = !tabular->LTNewPage(actcell);
-          tabular->SetLTNewPage(actcell,what);
-          return;
+    case LyXTabular::TOGGLE_LINE_LEFT:
+       lineSet = !tabular->LeftLine(actcell);
+       for(i=sel_row_start; i<=sel_row_end; ++i)
+           for(j=sel_col_start; j<=sel_col_end; ++j)
+               tabular->SetLeftLine(tabular->GetCellNumber(i,j),lineSet);
+       UpdateLocal(bv, INIT, true);
+       break;
+
+    case LyXTabular::TOGGLE_LINE_RIGHT:
+       lineSet = !tabular->RightLine(actcell);
+       for(i=sel_row_start; i<=sel_row_end; ++i)
+           for(j=sel_col_start; j<=sel_col_end; ++j)
+               tabular->SetRightLine(tabular->GetCellNumber(i,j),lineSet);
+       UpdateLocal(bv, INIT, true);
+       break;
+    case LyXTabular::ALIGN_LEFT:
+    case LyXTabular::ALIGN_RIGHT:
+    case LyXTabular::ALIGN_CENTER:
+       for(i=sel_row_start; i<=sel_row_end; ++i)
+           for(j=sel_col_start; j<=sel_col_end; ++j)
+               tabular->SetAlignment(tabular->GetCellNumber(i,j),setAlign);
+       if (hasSelection())
+           UpdateLocal(bv, INIT, true);
+       else
+           UpdateLocal(bv, CELL, true);
+       break;
+    case LyXTabular::MULTICOLUMN:
+    {
+       if (sel_row_start != sel_row_end) {
+           WriteAlert(_("Impossible Operation!"), 
+                      _("Multicolumns can only be horizontally."), 
+                      _("Sorry."));
+           return;
+       }
+       // just multicol for one Single Cell
+       if (!hasSelection()) {
+           // check wether we are completly in a multicol
+           if (tabular->IsMultiColumn(actcell)) {
+               tabular->UnsetMultiColumn(actcell);
+               UpdateLocal(bv, INIT, true);
+           } else {
+               tabular->SetMultiColumn(actcell, 1);
+               UpdateLocal(bv, CELL, true);
+           }
+           return;
+       }
+       // we have a selection so this means we just add all this
+       // cells to form a multicolumn cell
+       int
+           s_start, s_end;
+
+       if (sel_cell_start > sel_cell_end) {
+           s_start = sel_cell_end;
+           s_end = sel_cell_start;
+       } else {
+           s_start = sel_cell_start;
+           s_end = sel_cell_end;
+       }
+       tabular->SetMultiColumn(s_start, s_end - s_start + 1);
+       actcell = s_start;
+       cursor.pos(0);
+       sel_cell_end = sel_cell_start;
+       sel_pos_end = sel_pos_start;
+       UpdateLocal(bv, INIT, true);
+       break;
+    }
+    case LyXTabular::SET_ALL_LINES:
+       setLines = 1;
+    case LyXTabular::UNSET_ALL_LINES:
+       for(i=sel_row_start; i<=sel_row_end; ++i)
+           for(j=sel_col_start; j<=sel_col_end; ++j)
+               tabular->SetAllLines(tabular->GetCellNumber(i,j), setLines);
+       UpdateLocal(bv, INIT, true);
+       break;
+    case LyXTabular::SET_LONGTABULAR:
+       tabular->SetLongTabular(true);
+       UpdateLocal(bv, INIT, true); // because this toggles displayed
+       break;
+    case LyXTabular::UNSET_LONGTABULAR:
+       tabular->SetLongTabular(false);
+       UpdateLocal(bv, INIT, true); // because this toggles displayed
+       break;
+    case LyXTabular::SET_ROTATE_TABULAR:
+       tabular->SetRotateTabular(true);
+       break;
+    case LyXTabular::UNSET_ROTATE_TABULAR:
+       tabular->SetRotateTabular(false);
+       break;
+    case LyXTabular::SET_ROTATE_CELL:
+       for(i=sel_row_start; i<=sel_row_end; ++i)
+           for(j=sel_col_start; j<=sel_col_end; ++j)
+               tabular->SetRotateCell(tabular->GetCellNumber(i,j),true);
+       break;
+    case LyXTabular::UNSET_ROTATE_CELL:
+       for(i=sel_row_start; i<=sel_row_end; ++i)
+           for(j=sel_col_start; j<=sel_col_end; ++j)
+               tabular->SetRotateCell(tabular->GetCellNumber(i,j),false);
+       break;
+    case LyXTabular::SET_LINEBREAKS:
+       what = !tabular->GetLinebreaks(actcell);
+       for(i=sel_row_start; i<=sel_row_end; ++i)
+           for(j=sel_col_start; j<=sel_col_end; ++j)
+               tabular->SetLinebreaks(tabular->GetCellNumber(i,j),what);
+       break;
+    case LyXTabular::SET_LTFIRSTHEAD:
+       tabular->SetLTHead(actcell,true);
+       break;
+    case LyXTabular::SET_LTHEAD:
+       tabular->SetLTHead(actcell,false);
+       break;
+    case LyXTabular::SET_LTFOOT:
+       tabular->SetLTFoot(actcell,false);
+       break;
+    case LyXTabular::SET_LTLASTFOOT:
+       tabular->SetLTFoot(actcell,true);
+       break;
+    case LyXTabular::SET_LTNEWPAGE:
+       what = !tabular->GetLTNewPage(actcell);
+       tabular->SetLTNewPage(actcell,what);
+       break;
     }
-#endif
 }
 
-void InsetTabular::RemoveTabularRow()
+
+bool InsetTabular::ActivateCellInset(BufferView * bv, int x, int y, int button,
+                                    bool behind)
+{
+    // the cursor.pos has to be before the inset so if it isn't now just
+    // reset the curor pos first!
+    if (cursor.pos() % 2) { // behind the inset
+       cursor.pos(cursor.pos() - 1);
+       resetPos(bv);
+    }
+    UpdatableInset * inset =
+       static_cast<UpdatableInset*>(tabular->GetCellInset(actcell));
+    LyXFont font(LyXFont::ALL_SANE);
+    if (behind) {
+       x = inset->x() + inset->width(bv, font);
+       y = inset->descent(bv, font);
+    }
+    inset_x = cursor.x() - top_x + tabular->GetBeginningOfTextInCell(actcell);
+    inset_y = cursor.y();
+    inset->Edit(bv, x - inset_x, y - inset_y, button);
+    if (!the_locking_inset)
+       return false;
+    UpdateLocal(bv, CELL, false);
+    return true;
+}
+
+
+bool InsetTabular::InsetHit(BufferView * bv, int x, int ) const
+{
+    InsetText * inset = tabular->GetCellInset(actcell);
+    int x1 = x + top_x;
+
+    if (cursor.pos() % 2) { // behind the inset
+       return (((x + top_x) < cursor.x()) &&
+               ((x + top_x) > (cursor.x() - inset->width(bv,
+                                                     LyXFont(LyXFont::ALL_SANE)))));
+    } else {
+       int x2 = cursor.x() + tabular->GetBeginningOfTextInCell(actcell);
+       return ((x1 > x2) &&
+               (x1 < (x2 + inset->width(bv, LyXFont(LyXFont::ALL_SANE)))));
+    }
+}
+
+
+// This returns paperWidth() if the cell-width is unlimited or the width
+// in pixels if we have a pwidth for this cell.
+int InsetTabular::GetMaxWidthOfCell(Painter &, int cell) const
+{
+    string s = tabular->GetPWidth(cell);
+
+    if (s.empty())
+       return -1;
+    return VSpace(s).inPixels( 0, 0);
+}
+
+
+int InsetTabular::getMaxWidth(Painter & pain,
+                             UpdatableInset const * inset) const
+{
+    int cell;
+    int n = tabular->GetNumberOfCells();
+    for(cell=0; cell < n; ++cell) {
+       if (tabular->GetCellInset(cell) == inset)
+           break;
+    }
+    if (cell >= n)
+       return -1;
+    int w = GetMaxWidthOfCell(pain, cell);
+    // this because text insets remove the xpos from the maxwidth because
+    // otherwise the would not break good!!!
+//    w += getCellXPos(cell) + tabular->GetBeginningOfTextInCell(cell);
+//    w += inset->x();
+    return w;
+}
+
+
+void InsetTabular::recomputeTextInsets(BufferView * bv,
+                                      LyXFont const & font) const
+{
+    InsetText * inset;
+    int cell;
+
+//    cx = top_x;
+    for(int j= 0; j < tabular->columns(); ++j) {
+       for(int i = 0; i < tabular->rows(); ++i) {
+           if (tabular->IsPartOfMultiColumn(i,j))
+               continue;
+           cell = tabular->GetCellNumber(i,j);
+           inset = tabular->GetCellInset(cell);
+           inset->update(bv, font);
+           tabular->SetWidthOfCell(cell, inset->width(bv, font));
+       }
+//     cell = tabular->GetCellNumber(0, j);
+//     cx += tabular->GetWidthOfColumn(cell);
+    }
+}
+
+
+void InsetTabular::resizeLyXText(BufferView *) const
 {
+    need_update = FULL;
 }