introduce namespace lyx::support

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

diff --git a/src/mathed/formulamacro.C b/src/mathed/formulamacro.C
index d75a398617f296fa8448ac09b7ab6a55f52d9209..da8943bacf13f298adc8d319b81fd0868df95099 100644 (file)
--- a/src/mathed/formulamacro.C
+++ b/src/mathed/formulamacro.C
@@ -29,15 +29,14 @@
 #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 "support/BoostFormat.h"
+using namespace lyx::support;
 
 using std::ostream;
 
@@ -65,18 +64,12 @@ InsetFormulaMacro::InsetFormulaMacro(string const & s)
 }
 
 
-Inset * InsetFormulaMacro::clone(Buffer const &) const
+Inset * InsetFormulaMacro::clone() const
 {
        return new InsetFormulaMacro(*this);
 }
 
 
-// Inset * InsetFormulaMacro::clone(Buffer const &, bool) const
-// {
-//     return new InsetFormulaMacro(*this);
-// }
-
-
 void InsetFormulaMacro::write(Buffer const *, ostream & os) const
 {
        os << "FormulaMacro ";
@@ -125,31 +118,23 @@ void InsetFormulaMacro::read(std::istream & is)
        MathMacroTemplate * p = new MathMacroTemplate(is);
        setInsetName(p->name());
        MathMacroTable::create(MathAtom(p));
-       metrics();
+       //metrics();
 }
 
 
 string InsetFormulaMacro::prefix() const
 {
-#if USE_BOOST_FORMAT
-       return STRCONV(boost::io::str(boost::format(_(" Macro: %s: ")) %
-               STRCONV(getInsetName())));
-#else
-       return _(" Macro: ") + getInsetName() + ": ";
-#endif
+       return bformat(_(" Macro: %s: "), getInsetName());
 }
 
 
-void InsetFormulaMacro::dimension(BufferView * bv, LyXFont const & font,
-       Dimension & dim) const
+void InsetFormulaMacro::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       MetricsInfo mi;
-       mi.base.bv = bv;
-       mi.base.font = font;
-       dim = par()->metrics(mi);
-       dim.asc += 5;
-       dim.des += 5;
-       dim.wid += 10 + font_metrics::width(prefix(), font);
+       par()->metrics(mi, dim_);
+       dim_.asc += 5;
+       dim_.des += 5;
+       dim_.wid += 10 + font_metrics::width(prefix(), mi.base.font);
+       dim = dim_;
 }
 
 
@@ -171,23 +156,19 @@ Inset::Code InsetFormulaMacro::lyxCode() const
 }
 
 
-void InsetFormulaMacro::draw(BufferView * bv, LyXFont const & f,
-                            int y, float & xx) const
+void InsetFormulaMacro::draw(PainterInfo & p, int x, int y) const
 {
        // label
-       LyXFont font(f);
+       LyXFont font = p.base.font;
        font.setColor(LColor::math);
 
-       PainterInfo pi(bv);
+       PainterInfo pi(p.base.bv);
        pi.base.style = LM_ST_TEXT;
        pi.base.font  = font;
 
-       Dimension dim;
-       dimension(bv, font, dim);
-       int const x = int(xx);
-       int const a = y - dim.asc + 1;
-       int const w = dim.wid - 2;
-       int const h = dim.height() - 2;
+       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
        pi.pain.fillRectangle(x, a, w, h, LColor::mathmacrobg);
@@ -200,8 +181,7 @@ void InsetFormulaMacro::draw(BufferView * bv, LyXFont const & f,
        pi.pain.text(x + 2, y, prefix(), font);
 
        // formula
-       par()->draw(pi, 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;
 }