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 f5a75c4bd39e2344ed39c112320bfb7898387b91..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,23 +22,19 @@
 #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"
 #include "lyxtext.h"
 #include "lyxfont.h"
-#include "math_mathmlstream.h"
 
 using std::ostream;
 
@@ -62,10 +58,6 @@ InsetFormulaMacro::InsetFormulaMacro(string const & s)
 {
        string name = mathed_parse_macro(s);
        setInsetName(name);
-#ifdef WITH_WARNINGS
-#warning "metrics disabled"
-#endif
-       //metrics();
 }
 
 
@@ -75,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;
 }
@@ -219,7 +211,8 @@ void InsetFormulaMacro::draw(BufferView * bv, LyXFont const & f,
        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), y, prefix(), font);