Jean-Marc's fix for wrong descent

[lyx.git] / src / mathed / math_nestinset.C

diff --git a/src/mathed/math_nestinset.C b/src/mathed/math_nestinset.C
index 1744ae3262712ff5b725a018dd0f475e9cb7643f..890fe5c017bd9c53ed0c9fc062837fcfa1143ca5 100644 (file)
--- a/src/mathed/math_nestinset.C
+++ b/src/mathed/math_nestinset.C
@@ -1,16 +1,13 @@
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include "math_nestinset.h"
 #include "math_cursor.h"
 #include "math_mathmlstream.h"
-#include "formulabase.h"
+#include "math_parser.h"
+#include "funcrequest.h"
 #include "debug.h"
+#include "BufferView.h"
 #include "frontends/Painter.h"
 
-using std::vector;
-
 
 MathNestInset::MathNestInset(idx_type nargs)
        : MathDimInset(), cells_(nargs), lock_(false)
@@ -23,33 +20,21 @@ MathInset::idx_type MathNestInset::nargs() const
 }
 
 
-MathXArray & MathNestInset::xcell(idx_type i)
-{
-       return cells_[i];
-}
-
-
-MathXArray const & MathNestInset::xcell(idx_type i) const
-{
-       return cells_[i];
-}
-
-
 MathArray & MathNestInset::cell(idx_type i)
 {
-       return cells_[i].data();
+       return cells_[i];
 }
 
 
 MathArray const & MathNestInset::cell(idx_type i) const
 {
-       return cells_[i].data();
+       return cells_[i];
 }
 
 
 void MathNestInset::getPos(idx_type idx, pos_type pos, int & x, int & y) const
 {
-       MathXArray const & ar = xcell(idx);
+       MathArray const & ar = cell(idx);
        x = ar.xo() + ar.pos2x(pos);
        y = ar.yo();
        // move cursor visually into empty cells ("blue rectangles");
@@ -57,6 +42,7 @@ void MathNestInset::getPos(idx_type idx, pos_type pos, int & x, int & y) const
                x += 2;
 }
 
+
 void MathNestInset::substitute(MathMacro const & m)
 {
        for (idx_type i = 0; i < nargs(); ++i)
@@ -68,7 +54,7 @@ void MathNestInset::metrics(MathMetricsInfo const & mi) const
 {
        MathMetricsInfo m = mi;
        for (idx_type i = 0; i < nargs(); ++i)
-               xcell(i).metrics(m);
+               cell(i).metrics(m);
 }
 
 
@@ -185,7 +171,7 @@ void MathNestInset::drawSelection(MathPainterInfo & pi,
                idx_type idx1, pos_type pos1, idx_type idx2, pos_type pos2) const
 {
        if (idx1 == idx2) {
-               MathXArray const & c = xcell(idx1);
+               MathArray const & c = cell(idx1);
                int x1 = c.xo() + c.pos2x(pos1);
                int y1 = c.yo() - c.ascent();
                int x2 = c.xo() + c.pos2x(pos2);
@@ -194,7 +180,7 @@ void MathNestInset::drawSelection(MathPainterInfo & pi,
        } else {
                for (idx_type i = 0; i < nargs(); ++i) {
                        if (idxBetween(i, idx1, idx2)) {
-                               MathXArray const & c = xcell(i);
+                               MathArray const & c = cell(i);
                                int x1 = c.xo();
                                int y1 = c.yo() - c.ascent();
                                int x2 = c.xo() + c.width();
@@ -240,12 +226,12 @@ void MathNestInset::validate(LaTeXFeatures & features) const
 }
 
 
-bool MathNestInset::match(MathInset * p) const
+bool MathNestInset::match(MathAtom const & at) const
 {
-       if (nargs() != p->nargs())
+       if (nargs() != at->nargs())
                return false;
        for (idx_type i = 0; i < nargs(); ++i)
-               if (!cell(i).match(p->cell(i)))
+               if (!cell(i).match(at->cell(i)))
                        return false;
        return true;
 }
@@ -258,7 +244,7 @@ void MathNestInset::replace(ReplaceData & rep)
 }
 
 
-bool MathNestInset::contains(MathArray const & ar)
+bool MathNestInset::contains(MathArray const & ar) const
 {
        for (idx_type i = 0; i < nargs(); ++i)
                if (cell(i).contains(ar))
@@ -305,8 +291,12 @@ void MathNestInset::write(WriteStream & os) const
        os << '\\' << name().c_str();
        for (unsigned i = 0; i < nargs(); ++i)
                os << '{' << cell(i) << '}';
-       if (lock_ && !os.latex())
-               os << "\\lyxlock ";
+       if (nargs() == 0)
+               os.pendingSpace(true);
+       if (lock_ && !os.latex()) {
+               os << "\\lyxlock";
+               os.pendingSpace(true);
+       }
 }
 
 
@@ -319,5 +309,39 @@ void MathNestInset::normalize(NormalStream & os) const
 }
 
 
-void MathNestInset::notifyCursorLeaves()
-{}
+void MathNestInset::notifyCursorLeaves(idx_type idx)
+{
+       cell(idx).notifyCursorLeaves();
+}
+
+
+dispatch_result MathNestInset::dispatch
+       (FuncRequest const & cmd, idx_type & idx, pos_type & pos)
+{
+       BufferView * bv = cmd.view();
+
+       switch (cmd.action) {
+
+               case LFUN_PASTE: {
+                       MathArray ar;
+                       mathed_parse_cell(ar, cmd.argument);
+                       cell(idx).insert(pos, ar);
+                       pos += ar.size();
+                       return DISPATCHED;
+               }
+
+               case LFUN_PASTESELECTION:
+                       return
+                               dispatch(
+                                       FuncRequest(bv, LFUN_PASTE, bv->getClipboard()), idx, pos);
+
+               case LFUN_MOUSE_PRESS:
+                       if (cmd.button() == mouse_button::button2)
+                               return dispatch(FuncRequest(bv, LFUN_PASTESELECTION), idx, pos);
+                       return UNDISPATCHED;
+
+               default:
+                       return MathInset::dispatch(cmd, idx, pos);
+       }
+       return UNDISPATCHED;
+}