bug + spped fixes + small stuff

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

diff --git a/src/mathed/math_macro.C b/src/mathed/math_macro.C
index 7ec87a11fcdb6e285c359119b1821b7f305c88e6..eba161e677a7545d587b2433ea7610b7553b0d2e 100644 (file)
--- a/src/mathed/math_macro.C
+++ b/src/mathed/math_macro.C
@@ -1,19 +1,15 @@
-/*
- *  File:        math_macro.C
- *  Purpose:     Implementation of macro class for mathed
- *  Author:      Alejandro Aguilar Sierra <asierra@servidor.unam.mx>
- *  Created:     November 1996
- *  Description: WYSIWYG math macros
+/**
+ * \file math_macro.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *  Dependencies: Math
+ * \author Alejandro Aguilar Sierra
+ * \author André Pönitz
  *
- *  Copyright: 1996, 1997 Alejandro Aguilar Sierra
- *
- *  Version: 0.2, Math & Lyx project.
- *
- *  This code is under the GNU General Public Licence version 2 or later.
+ * Full author contact details are available in file CREDITS.
  */
 
+#include <config.h>
 
 #include "math_macro.h"
 #include "math_support.h"
@@ -21,14 +17,15 @@
 #include "math_macrotable.h"
 #include "math_macrotemplate.h"
 #include "math_mathmlstream.h"
-#include "math_streamstr.h"
-#include "support/lstrings.h"
-#include "support/LAssert.h"
+#include "cursor.h"
 #include "debug.h"
 #include "LaTeXFeatures.h"
 
 
+using std::string;
 using std::max;
+using std::auto_ptr;
+using std::endl;
 
 
 MathMacro::MathMacro(string const & name)
@@ -44,9 +41,9 @@ MathMacro::MathMacro(MathMacro const & m)
 
 
 
-InsetBase * MathMacro::clone() const
+auto_ptr<InsetBase> MathMacro::clone() const
 {
-       return new MathMacro(*this);
+       return auto_ptr<InsetBase>(new MathMacro(*this));
 }
 
 
@@ -76,35 +73,35 @@ void MathMacro::metrics(MetricsInfo & mi, Dimension & dim) const
 
        if (defining()) {
 
-               mathed_string_dim(font_, name(), dim_);
+               mathed_string_dim(font_, name(), dim);
 
-       } else if (editing()) {
+       } else if (editing(mi.base.bv)) {
 
                expand();
-               expanded_.metrics(mi_, dim_);
-               metricsMarkers();
+               expanded_.metrics(mi_, dim);
+               metricsMarkers(dim);
 
-               dim_.wid +=  mathed_string_width(font_, name()) + 10;
+               dim.wid += mathed_string_width(font_, name()) + 10;
 
                int ww = mathed_string_width(font_, "#1: ");
 
                for (idx_type i = 0; i < nargs(); ++i) {
                        MathArray const & c = cell(i);
                        c.metrics(mi_);
-                       dim_.wid  = max(dim_.wid, c.width() + ww);
-                       dim_.des += max(c.ascent(),  dim_.asc) + 5;
-                       dim_.des += max(c.descent(), dim_.des) + 5;
+                       dim.wid  = max(dim.wid, c.width() + ww);
+                       dim.des += max(c.ascent(),  dim.asc) + 5;
+                       dim.des += max(c.descent(), dim.des) + 5;
                }
 
        } else {
 
                expand();
                expanded_.substitute(*this);
-               expanded_.metrics(mi_, dim_);
+               expanded_.metrics(mi_, dim);
 
        }
 
-       dim = dim_;
+       dim_ = dim;
 }
 
 
@@ -120,7 +117,7 @@ void MathMacro::draw(PainterInfo & pi, int x, int y) const
                return;
        }
 
-       if (editing()) {
+       if (editing(pi.base.bv)) {
                int h = y - dim_.ascent() + 2 + expanded_.ascent();
                drawStr(pi, font_, x + 3, h, name());
 
@@ -150,39 +147,36 @@ void MathMacro::draw(PainterInfo & pi, int x, int y) const
 void MathMacro::dump() const
 {
        MathMacroTable::dump();
-       lyxerr << "\n macro: '" << this << "'\n";
-       lyxerr << " name: '" << name() << "'\n";
-       lyxerr << " template: '";
+       lyxerr << "\n macro: '" << this << "'\n"
+              << " name: '" << name() << "'\n"
+              << " template: '";
        WriteStream wi(lyxerr);
        tmplate_->write(wi);
-       lyxerr << "'\n";
+       lyxerr << "'" << endl;
 }
 
 
-bool MathMacro::idxUpDown(idx_type & idx, pos_type &, bool up, int x) const
+bool MathMacro::idxUpDown(LCursor & cur, bool up) const
 {
-       pos_type pos;
        if (up) {
-               if (!MathNestInset::idxLeft(idx, pos))
+               if (!MathNestInset::idxLeft(cur))
                        return false;
-               pos = cell(idx).x2pos(x);
-               return true;
        } else {
-               if (!MathNestInset::idxRight(idx, pos))
+               if (!MathNestInset::idxRight(cur))
                        return false;
-               pos = cell(idx).x2pos(x);
-               return true;
        }
+       cur.pos() = cur.cell().x2pos(cur.x_target());
+       return true;
 }
 
 
-bool MathMacro::idxLeft(idx_type &, pos_type &) const
+bool MathMacro::idxLeft(LCursor &) const
 {
        return false;
 }
 
 
-bool MathMacro::idxRight(idx_type &, pos_type &) const
+bool MathMacro::idxRight(LCursor &) const
 {
        return false;
 }