introduce namespace lyx::support

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

diff --git a/src/mathed/formulamacro.C b/src/mathed/formulamacro.C
index d51ecea60e47c39b2cc96c06c9b4d3d9287ad673..da8943bacf13f298adc8d319b81fd0868df95099 100644 (file)
--- a/src/mathed/formulamacro.C
+++ b/src/mathed/formulamacro.C
@@ -13,31 +13,30 @@
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "formulamacro.h"
-#include "commandtags.h"
+#include "lfuns.h"
 #include "math_cursor.h"
 #include "math_parser.h"
 #include "math_macro.h"
 #include "math_macrotable.h"
 #include "math_macrotemplate.h"
+#include "metricsinfo.h"
 #include "math_support.h"
 #include "math_mathmlstream.h"
 #include "BufferView.h"
 #include "gettext.h"
+#include "latexrunparams.h"
 #include "frontends/Painter.h"
 #include "frontends/font_metrics.h"
 #include "support/lyxlib.h"
+#include "support/lstrings.h"
 #include "support/LOstream.h"
 #include "debug.h"
 #include "lyxlex.h"
 #include "lyxtext.h"
-#include "lyxfont.h"
+#include "Lsstream.h"
 
-#include <sstream>
+using namespace lyx::support;
 
 using std::ostream;
 
@@ -60,12 +59,12 @@ InsetFormulaMacro::InsetFormulaMacro(string const & name, int nargs)
 
 InsetFormulaMacro::InsetFormulaMacro(string const & s)
 {
-       std::istringstream is(s);
+       std::istringstream is(STRCONV(s));
        read(is);
 }
 
 
-Inset * InsetFormulaMacro::clone(Buffer const &, bool) const
+Inset * InsetFormulaMacro::clone() const
 {
        return new InsetFormulaMacro(*this);
 }
@@ -79,10 +78,10 @@ void InsetFormulaMacro::write(Buffer const *, ostream & os) const
 }
 
 
-int InsetFormulaMacro::latex(Buffer const *, ostream & os, bool fragile,
-                            bool /*free_spacing*/) const
+int InsetFormulaMacro::latex(Buffer const *, ostream & os,
+                            LatexRunParams const & runparams) const
 {
-       WriteStream wi(os, fragile, true);
+       WriteStream wi(os, runparams.moving_arg, true);
        par()->write(wi);
        return 2;
 }
@@ -117,34 +116,25 @@ void InsetFormulaMacro::read(Buffer const *, LyXLex & lex)
 void InsetFormulaMacro::read(std::istream & is)
 {
        MathMacroTemplate * p = new MathMacroTemplate(is);
-       MathMacroTable::create(MathAtom(p));
        setInsetName(p->name());
-       metrics();
+       MathMacroTable::create(MathAtom(p));
+       //metrics();
 }
 
 
 string InsetFormulaMacro::prefix() const
 {
-       return string(" ") + _("Macro: ") + getInsetName() + ": ";
-}
-
-
-int InsetFormulaMacro::ascent(BufferView *, LyXFont const &) const
-{
-       return par()->ascent() + 5;
+       return bformat(_(" Macro: %s: "), getInsetName());
 }
 
 
-int InsetFormulaMacro::descent(BufferView *, LyXFont const &) const
+void InsetFormulaMacro::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       return par()->descent() + 5;
-}
-
-
-int InsetFormulaMacro::width(BufferView * bv, LyXFont const & f) const
-{
-       metrics(bv, f);
-       return 10 + font_metrics::width(prefix(), f) + par()->width();
+       par()->metrics(mi, dim_);
+       dim_.asc += 5;
+       dim_.des += 5;
+       dim_.wid += 10 + font_metrics::width(prefix(), mi.base.font);
+       dim = dim_;
 }
 
 
@@ -166,35 +156,32 @@ Inset::Code InsetFormulaMacro::lyxCode() const
 }
 
 
-void InsetFormulaMacro::draw(BufferView * bv, LyXFont const & f,
-                            int y, float & xx, bool /*cleared*/) const
+void InsetFormulaMacro::draw(PainterInfo & p, int x, int y) const
 {
-       MathPainterInfo pain = MathPainterInfo(bv->painter());
-       LyXFont font(f);
-
        // label
+       LyXFont font = p.base.font;
        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;
+       PainterInfo pi(p.base.bv);
+       pi.base.style = LM_ST_TEXT;
+       pi.base.font  = font;
+
+       int const a = y - dim_.asc + 1;
+       int const w = dim_.wid - 2;
+       int const h = dim_.height() - 2;
 
        // LColor::mathbg used to be "AntiqueWhite" but is "linen" now, too
-       pain.pain.fillRectangle(x, a, w, h, LColor::mathmacrobg);
-       pain.pain.rectangle(x, a, w, h, LColor::mathframe);
+       pi.pain.fillRectangle(x, a, w, h, LColor::mathmacrobg);
+       pi.pain.rectangle(x, a, w, h, LColor::mathframe);
 
        if (mathcursor &&
                        const_cast<InsetFormulaBase const *>(mathcursor->formula()) == this)
-               mathcursor->drawSelection(pain);
+               mathcursor->drawSelection(pi);
 
-       pain.pain.text(x + 2, y, prefix(), font);
+       pi.pain.text(x + 2, y, prefix(), font);
 
        // formula
-       par()->draw(pain, x + font_metrics::width(prefix(), f) + 5, y);
-       xx += w + 2;
+       par()->draw(pi, x + font_metrics::width(prefix(), p.base.font) + 5, y);
        xo_ = x;
        yo_ = y;
-
-       setCursorVisible(false);
 }