introduce namespace lyx::support

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

diff --git a/src/mathed/formulamacro.C b/src/mathed/formulamacro.C
index 5135bdfe61c7f287397176d4351c8ada1c24271e..da8943bacf13f298adc8d319b81fd0868df95099 100644 (file)
--- a/src/mathed/formulamacro.C
+++ b/src/mathed/formulamacro.C
@@ -13,7 +13,6 @@
 
 #include <config.h>
 
-
 #include "formulamacro.h"
 #include "lfuns.h"
 #include "math_cursor.h"
@@ -26,18 +25,18 @@
 #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 "support/BoostFormat.h"
+using namespace lyx::support;
 
 using std::ostream;
 
@@ -65,7 +64,7 @@ InsetFormulaMacro::InsetFormulaMacro(string const & s)
 }
 
 
-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;
 }
@@ -119,36 +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 boost::io::str(boost::format(_(" Macro: %s: ")) % getInsetName());
-#else
-       return _(" Macro: ") + getInsetName() + ": ";
-#endif
-}
-
-
-int InsetFormulaMacro::ascent(BufferView *, LyXFont const &) const
-{
-       return par()->ascent() + 5;
-}
-
-
-int InsetFormulaMacro::descent(BufferView *, LyXFont const &) const
-{
-       return par()->descent() + 5;
+       return bformat(_(" Macro: %s: "), getInsetName());
 }
 
 
-int InsetFormulaMacro::width(BufferView * bv, LyXFont const & f) const
+void InsetFormulaMacro::metrics(MetricsInfo & mi, Dimension & dim) 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_;
 }
 
 
@@ -170,21 +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 = PainterInfo(bv->painter());
+       PainterInfo pi(p.base.bv);
        pi.base.style = LM_ST_TEXT;
        pi.base.font  = font;
 
-       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;
+       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);
@@ -197,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;
 }