make \newcommand{\bb}[1]{\mathbf{#1}} work for read/write/display.

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

diff --git a/src/mathed/formulamacro.C b/src/mathed/formulamacro.C
index b0188770d3f9e68a99085877f71b190e4da2b00a..bd5d342a197f3217ae879767ea710a6e7c3d8918 100644 (file)
--- a/src/mathed/formulamacro.C
+++ b/src/mathed/formulamacro.C
@@ -1,7 +1,7 @@
 /*
  *  File:        formulamacro.C
  *  Purpose:     Implementation of the formula macro LyX inset
- *  Author:      André Pönitz
+ *  Author:      André Pönitz, based on ideas of Alejandro Aguilar Sierra
  *  Created:     March 2001
  *  Description: Allows the edition of math macros inside Lyx. 
  *
@@ -22,17 +22,14 @@
 #include "math_cursor.h"
 #include "math_parser.h"
 #include "math_macro.h"
-#include "math_macroarg.h"
 #include "math_macrotable.h"
-#include "math_macrotemplate.h"
-#include "math_matrixinset.h"
-#include "lyx_main.h"
+#include "math_support.h"
+#include "math_mathmlstream.h"
 #include "BufferView.h"
 #include "gettext.h"
 #include "Painter.h"
 #include "font.h"
 #include "support/lyxlib.h"
-#include "mathed/support.h"
 #include "support/LOstream.h"
 #include "debug.h"
 #include "lyxlex.h"
@@ -61,10 +58,6 @@ InsetFormulaMacro::InsetFormulaMacro(string const & s)
 {
        string name = mathed_parse_macro(s);
        setInsetName(name);
-#ifdef WITH_WARNINGS
-#warning "metrics disabled"
-#endif
-       //metrics();
 }
 
 
@@ -74,26 +67,26 @@ Inset * InsetFormulaMacro::clone(Buffer const &, bool) const
 }
 
 
-void InsetFormulaMacro::write(Buffer const * buf, ostream & os) const
+void InsetFormulaMacro::write(Buffer const *, ostream & os) const
 {
        os << "FormulaMacro ";
-       MathWriteInfo wi(buf, os, false);
+       WriteStream wi(os, false);
        par()->write(wi);
 }
 
 
-int InsetFormulaMacro::latex(Buffer const * buf, ostream & os, bool fragile, 
+int InsetFormulaMacro::latex(Buffer const *, ostream & os, bool fragile, 
                             bool /*free_spacing*/) const
 {
-       MathWriteInfo wi(buf, os, fragile);
+       WriteStream wi(os, fragile);
        par()->write(wi);
        return 2;
 }
 
 
-int InsetFormulaMacro::ascii(Buffer const * buf, ostream & os, int) const
+int InsetFormulaMacro::ascii(Buffer const *, ostream & os, int) const
 {
-       MathWriteInfo wi(buf, os, false);
+       WriteStream wi(os, false);
        par()->write(wi);
        return 0;
 }
@@ -115,7 +108,7 @@ void InsetFormulaMacro::read(Buffer const *, LyXLex & lex)
 {
        string name = mathed_parse_macro(lex);
        setInsetName(name);
-       lyxerr << "metrics disabled";
+       //lyxerr << "metrics disabled";
        metrics();
 }
 
@@ -140,7 +133,7 @@ int InsetFormulaMacro::descent(BufferView *, LyXFont const &) const
 
 int InsetFormulaMacro::width(BufferView * bv, LyXFont const & f) const
 {
-       metrics(bv, &f);
+       metrics(bv, f);
        return 10 + lyxfont::width(prefix(), f) + par()->width();
 }
 
@@ -202,7 +195,7 @@ MathInsetTypes InsetFormulaMacro::getType() const
 
 
 void InsetFormulaMacro::draw(BufferView * bv, LyXFont const & f,
-                            int baseline, float & x, bool /*cleared*/) const
+                            int y, float & x, bool /*cleared*/) const
 {
        Painter & pain = bv->painter();
        LyXFont font(f);
@@ -210,24 +203,24 @@ void InsetFormulaMacro::draw(BufferView * bv, LyXFont const & f,
        // label
        font.setColor(LColor::math);
        
-       int const y = baseline - ascent(bv, font) + 1;
+       int const a = y - ascent(bv, font) + 1;
        int const w = width(bv, font) - 2;
        int const h = ascent(bv, font) + descent(bv, font) - 2;
 
        // LColor::mathbg used to be "AntiqueWhite" but is "linen" now, too
-       pain.fillRectangle(int(x), y , w, h, LColor::mathmacrobg);
-       pain.rectangle(int(x), y, w, h, LColor::mathframe);
+       pain.fillRectangle(int(x), a , w, h, LColor::mathmacrobg);
+       pain.rectangle(int(x), a, w, h, LColor::mathframe);
 
-       if (mathcursor && mathcursor->formula() == this)
+       if (mathcursor &&
+                       const_cast<InsetFormulaBase const *>(mathcursor->formula()) == this)
                mathcursor->drawSelection(pain);
 
-       pain.text(int(x + 2), baseline, prefix(), font);
+       pain.text(int(x + 2), y, prefix(), font);
        x += width(bv, font);
 
        // formula
-       float t = par()->width() + 5;
-       x -= t;
-       par()->draw(pain, int(x), baseline);
-       x += t;
+       xo_ = int(x) - par()->width() - 5;
+       yo_ = y;
+       par()->draw(pain, xo_, yo_);
 }