* src/frontends/controllers/Dialog.{cpp,h}:

[lyx.git] / src / mathed / MathMacro.cpp

diff --git a/src/mathed/MathMacro.cpp b/src/mathed/MathMacro.cpp
index ba1c34a37f5880e8e5c3a9daa026293740cc03fa..f68529c8e071a635919fc9cce8e0926bcdca9a17 100644 (file)
--- a/src/mathed/MathMacro.cpp
+++ b/src/mathed/MathMacro.cpp
@@ -33,18 +33,20 @@ using std::endl;
 using std::vector;
 
 
-/// This class is the value of a macro argument, technically 
+/// This class is the value of a macro argument, technically
 /// a wrapper of the cells of MathMacro.
 class MathMacroArgumentValue : public InsetMath {
 public:
        ///
-       MathMacroArgumentValue(MathMacro const & mathMacro, size_t idx) 
+       MathMacroArgumentValue(MathMacro const & mathMacro, size_t idx)
                : mathMacro_(mathMacro), idx_(idx) {}
        ///
        bool metrics(MetricsInfo & mi, Dimension & dim) const;
        ///
        void draw(PainterInfo &, int x, int y) const;
-       
+       ///
+       int kerning() const { return mathMacro_.cell(idx_).kerning(); }
+
 private:
        std::auto_ptr<Inset> doClone() const;
        MathMacro const & mathMacro_;
@@ -52,20 +54,19 @@ private:
 };
 
 
-auto_ptr<Inset> MathMacroArgumentValue::doClone() const 
+auto_ptr<Inset> MathMacroArgumentValue::doClone() const
 {
        return auto_ptr<Inset>(new MathMacroArgumentValue(*this));
 }
 
 
-bool MathMacroArgumentValue::metrics(MetricsInfo & mi, Dimension & dim) const 
+bool MathMacroArgumentValue::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        // unlock outer macro in arguments, and lock it again later
        MacroData const & macro = MacroTable::globalMacros().get(mathMacro_.name());
        macro.unlock();
        mathMacro_.cell(idx_).metrics(mi, dim);
        macro.lock();
-       metricsMarkers2(dim);
        if (dim_ == dim)
                return false;
        dim_ = dim;
@@ -73,7 +74,7 @@ bool MathMacroArgumentValue::metrics(MetricsInfo & mi, Dimension & dim) const
 }
 
 
-void MathMacroArgumentValue::draw(PainterInfo & pi, int x, int y) const 
+void MathMacroArgumentValue::draw(PainterInfo & pi, int x, int y) const
 {
        // unlock outer macro in arguments, and lock it again later
        MacroData const & macro = MacroTable::globalMacros().get(mathMacro_.name());
@@ -114,14 +115,15 @@ void MathMacro::cursorPos(BufferView const & bv,
 
 bool MathMacro::metrics(MetricsInfo & mi, Dimension & dim) const
 {
+       kerning_ = 0;
        if (!MacroTable::globalMacros().has(name())) {
                mathed_string_dim(mi.base.font, "Unknown: " + name(), dim);
        } else {
                MacroData const & macro = MacroTable::globalMacros().get(name());
-               
+
                if (macroBackup_ != macro)
                        updateExpansion();
-               
+
                if (macro.locked()) {
                        mathed_string_dim(mi.base.font, "Self reference: " + name(), dim);
                } else if (editing(mi.base.bv)) {
@@ -143,10 +145,10 @@ bool MathMacro::metrics(MetricsInfo & mi, Dimension & dim) const
                        macro.lock();
                        expanded_.metrics(mi, dim);
                        macro.unlock();
+                       kerning_ = expanded_.kerning();
                        editing_ = false;
                }
        }
-       metricsMarkers2(dim);
        if (dim_ == dim)
                return false;
        dim_ = dim;
@@ -161,11 +163,11 @@ void MathMacro::draw(PainterInfo & pi, int x, int y) const
                drawStrRed(pi, x, y, "Unknown: " + name());
        } else {
                MacroData const & macro = MacroTable::globalMacros().get(name());
-               
+
                // warm up cache
                for (size_t i = 0; i < nargs(); ++i)
                        cell(i).setXY(*pi.base.bv, x, y);
-               
+
                if (macro.locked()) {
                        // FIXME UNICODE
                        drawStrRed(pi, x, y, "Self reference: " + name());
@@ -194,12 +196,11 @@ void MathMacro::draw(PainterInfo & pi, int x, int y) const
                        expanded_.draw(pi, x, y);
                        macro.unlock();
                }
-               
-               // edit mode changed?   
+
+               // edit mode changed?
                if (editing_ != editing(pi.base.bv) || macroBackup_ != macro)
                        pi.base.bv->cursor().updateFlags(Update::Force);
        }
-       drawMarkers2(pi, x, y);
 }
 
 
@@ -240,20 +241,36 @@ Inset * MathMacro::editXY(Cursor & cur, int x, int y)
 }
 
 
-bool MathMacro::idxFirst(Cursor & cur) const 
+bool MathMacro::idxFirst(Cursor & cur) const
 {
        cur.updateFlags(Update::Force);
        return InsetMathNest::idxFirst(cur);
 }
 
 
-bool MathMacro::idxLast(Cursor & cur) const 
+bool MathMacro::idxLast(Cursor & cur) const
 {
        cur.updateFlags(Update::Force);
        return InsetMathNest::idxLast(cur);
 }
 
 
+bool MathMacro::idxUpDown(Cursor & cur, bool up) const
+{
+       if (up) {
+               if (cur.idx() == 0)
+                       return false;
+               --cur.idx();
+       } else {
+               if (cur.idx() + 1 >= nargs())
+                       return false;
+               ++cur.idx();
+       }
+       cur.pos() = cell(cur.idx()).x2pos(cur.x_target());
+       return true;
+}
+
+
 bool MathMacro::notifyCursorLeaves(Cursor & cur)
 {
        cur.updateFlags(Update::Force);
@@ -285,10 +302,10 @@ void MathMacro::octave(OctaveStream & os) const
 void MathMacro::updateExpansion() const
 {
        MacroData const & macro = MacroTable::globalMacros().get(name());
-       
+
        // create MathMacroArgumentValue object pointing to the cells of the macro
        vector<MathData> values(nargs());
-       for (size_t i = 0; i != nargs(); ++i) 
+       for (size_t i = 0; i != nargs(); ++i)
                                values[i].insert(0, MathAtom(new MathMacroArgumentValue(*this, i)));
        macro.expand(values, expanded_);
        asArray(macro.def(), tmpl_);