several smallish changes/bugfixes/left overs from Porto

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

diff --git a/src/mathed/formulamacro.C b/src/mathed/formulamacro.C
index bd5d342a197f3217ae879767ea710a6e7c3d8918..16f8c3c58b0448fc457991ed66dd19c1cc7231ee 100644 (file)
--- a/src/mathed/formulamacro.C
+++ b/src/mathed/formulamacro.C
@@ -3,7 +3,7 @@
  *  Purpose:     Implementation of the formula macro LyX inset
  *  Author:      André Pönitz, based on ideas of Alejandro Aguilar Sierra
  *  Created:     March 2001
- *  Description: Allows the edition of math macros inside Lyx. 
+ *  Description: Allows the edition of math macros inside Lyx.
  *
  *  Copyright: 2001  The LyX Project
  *
@@ -27,8 +27,8 @@
 #include "math_mathmlstream.h"
 #include "BufferView.h"
 #include "gettext.h"
-#include "Painter.h"
-#include "font.h"
+#include "frontends/Painter.h"
+#include "frontends/font_metrics.h"
 #include "support/lyxlib.h"
 #include "support/LOstream.h"
 #include "debug.h"
@@ -47,16 +47,17 @@ InsetFormulaMacro::InsetFormulaMacro()
 }
 
 
-InsetFormulaMacro::InsetFormulaMacro(string nm, int na)
+InsetFormulaMacro::InsetFormulaMacro(string const & name, int nargs)
 {
-       setInsetName(nm);
-       MathMacroTable::create(nm, na, string());
+       setInsetName(name);
+       MathMacroTable::create(name, nargs);
 }
 
 
 InsetFormulaMacro::InsetFormulaMacro(string const & s)
 {
-       string name = mathed_parse_macro(s);
+       string name;
+       mathed_parse_macro(name, s);
        setInsetName(name);
 }
 
@@ -70,15 +71,15 @@ Inset * InsetFormulaMacro::clone(Buffer const &, bool) const
 void InsetFormulaMacro::write(Buffer const *, ostream & os) const
 {
        os << "FormulaMacro ";
-       WriteStream wi(os, false);
+       WriteStream wi(os, false, false);
        par()->write(wi);
 }
 
 
-int InsetFormulaMacro::latex(Buffer const *, ostream & os, bool fragile, 
+int InsetFormulaMacro::latex(Buffer const *, ostream & os, bool fragile,
                             bool /*free_spacing*/) const
 {
-       WriteStream wi(os, fragile);
+       WriteStream wi(os, fragile, true);
        par()->write(wi);
        return 2;
 }
@@ -86,7 +87,7 @@ int InsetFormulaMacro::latex(Buffer const *, ostream & os, bool fragile,
 
 int InsetFormulaMacro::ascii(Buffer const *, ostream & os, int) const
 {
-       WriteStream wi(os, false);
+       WriteStream wi(os, false, true);
        par()->write(wi);
        return 0;
 }
@@ -98,7 +99,7 @@ int InsetFormulaMacro::linuxdoc(Buffer const * buf, ostream & os) const
 }
 
 
-int InsetFormulaMacro::docbook(Buffer const * buf, ostream & os) const
+int InsetFormulaMacro::docbook(Buffer const * buf, ostream & os, bool) const
 {
        return ascii(buf, os, 0);
 }
@@ -106,7 +107,8 @@ int InsetFormulaMacro::docbook(Buffer const * buf, ostream & os) const
 
 void InsetFormulaMacro::read(Buffer const *, LyXLex & lex)
 {
-       string name = mathed_parse_macro(lex);
+       string name;
+       mathed_parse_macro(name, lex);
        setInsetName(name);
        //lyxerr << "metrics disabled";
        metrics();
@@ -134,39 +136,7 @@ int InsetFormulaMacro::descent(BufferView *, LyXFont const &) const
 int InsetFormulaMacro::width(BufferView * bv, LyXFont const & f) const
 {
        metrics(bv, f);
-       return 10 + lyxfont::width(prefix(), f) + par()->width();
-}
-
-
-
-UpdatableInset::RESULT
-InsetFormulaMacro::localDispatch(BufferView * bv,
-                                kb_action action, string const & arg)
-{
-       RESULT result = DISPATCHED;
-       switch (action) {
-               case LFUN_MATH_MACROARG: {
-                       int const i = lyx::atoi(arg);
-                       lyxerr << "inserting macro arg " << i << "\n";
-                       //if (i > 0 && i <= par()->numargs()) {
-                               mathcursor->insert(MathAtom(new MathMacroArgument(i)));
-                               updateLocal(bv, true);
-                       //} else {
-                       //      lyxerr << "not in range 0.." << par()->numargs() << "\n";
-                       //}
-                       break;
-               }
-               
-               default: {
-                       result = InsetFormulaBase::localDispatch(bv, action, arg);
-                       // force redraw if anything happened
-                       if (result != UNDISPATCHED) {
-                               bv->text->status(bv, LyXText::NEED_MORE_REFRESH);
-                               bv->updateInset(this, false);
-                       }
-               }
-       }
-       return result;
+       return 10 + font_metrics::width(prefix(), f) + par()->width();
 }
 
 
@@ -195,32 +165,34 @@ MathInsetTypes InsetFormulaMacro::getType() const
 
 
 void InsetFormulaMacro::draw(BufferView * bv, LyXFont const & f,
-                            int y, float & x, bool /*cleared*/) const
+                            int y, float & xx, bool /*cleared*/) const
 {
-       Painter & pain = bv->painter();
+       MathPainterInfo pain = MathPainterInfo(bv->painter());
        LyXFont font(f);
 
        // label
        font.setColor(LColor::math);
-       
+
+       int const x = int(xx);
        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), a , w, h, LColor::mathmacrobg);
-       pain.rectangle(int(x), a, w, h, LColor::mathframe);
+       pain.pain.fillRectangle(x, a, w, h, LColor::mathmacrobg);
+       pain.pain.rectangle(x, a, w, h, LColor::mathframe);
 
        if (mathcursor &&
                        const_cast<InsetFormulaBase const *>(mathcursor->formula()) == this)
                mathcursor->drawSelection(pain);
 
-       pain.text(int(x + 2), y, prefix(), font);
-       x += width(bv, font);
+       pain.pain.text(x + 2, y, prefix(), font);
 
        // formula
-       xo_ = int(x) - par()->width() - 5;
+       par()->draw(pain, x + font_metrics::width(prefix(), f) + 5, y);
+       xx += w + 2;
+       xo_ = x;
        yo_ = y;
-       par()->draw(pain, xo_, yo_);
-}
 
+       setCursorVisible(false);
+}