remove unneeded member

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

diff --git a/src/mathed/math_macro.C b/src/mathed/math_macro.C
index 3cf76db27b4908c164e563e8cd0d792c05b77fd0..9983cf5f78b523af9c7425a1a17867bf75460d45 100644 (file)
--- a/src/mathed/math_macro.C
+++ b/src/mathed/math_macro.C
@@ -24,10 +24,10 @@
 #include "math_macrotable.h"
 #include "math_macrotemplate.h"
 #include "math_mathmlstream.h"
+#include "math_streamstr.h"
 #include "support/lstrings.h"
 #include "support/LAssert.h"
 #include "debug.h"
-#include "Painter.h"
 #include "LaTeXFeatures.h"
 
 
@@ -53,9 +53,9 @@ MathInset * MathMacro::clone() const
 }
 
 
-const char * MathMacro::name() const
+string const & MathMacro::name() const
 {
-       return tmplate_->asMacroTemplate()->name().c_str();
+       return tmplate_->asMacroTemplate()->name();
 }
 
 
@@ -72,9 +72,9 @@ void MathMacro::expand() const
 }
 
 
-void MathMacro::metrics(MathMetricsInfo const & mi) const
+void MathMacro::metrics(MathMetricsInfo & mi) const
 {
-       whichFont(font_, LM_TC_TEX, mi);
+       augmentFont(font_, "lyxtex");
        mi_ = mi;
 
        if (defining()) {
@@ -107,7 +107,7 @@ void MathMacro::metrics(MathMetricsInfo const & mi) const
        }
 
        expand();
-       expanded_.data_.substitute(*this);
+       expanded_.data().substitute(*this);
        expanded_.metrics(mi_);
        width_   = expanded_.width();
        ascent_  = expanded_.ascent();
@@ -115,24 +115,24 @@ void MathMacro::metrics(MathMetricsInfo const & mi) const
 }
 
 
-void MathMacro::draw(Painter & pain, int x, int y) const
+void MathMacro::draw(MathPainterInfo & pi, int x, int y) const
 {
        metrics(mi_);
 
        LyXFont texfont;
-       whichFont(texfont, LM_TC_TEX, mi_);
+       augmentFont(texfont, "lyxtex");
 
        if (defining()) {
-               drawStr(pain, texfont, x, y, name());
+               drawStr(pi, texfont, x, y, name());
                return;
        }
 
        if (editing()) {
                int h = y - ascent() + 2 + expanded_.ascent();
-               drawStr(pain, font_, x + 3, h, name());
+               drawStr(pi, font_, x + 3, h, name());
 
                int const w = mathed_string_width(font_, name());
-               expanded_.draw(pain, x + w + 12, h);
+               expanded_.draw(pi, x + w + 12, h);
                h += expanded_.descent();
 
                int lasc;
@@ -143,16 +143,16 @@ void MathMacro::draw(Painter & pain, int x, int y) const
                for (idx_type i = 0; i < nargs(); ++i) {
                        MathXArray const & c = xcell(i);
                        h += max(c.ascent(), lasc) + 5;
-                       c.draw(pain, x + lwid, h);
+                       c.draw(pi, x + lwid, h);
                        char str[] = "#1:";
                        str[1] += static_cast<char>(i);
-                       drawStr(pain, texfont, x + 3, h, str);
+                       drawStr(pi, texfont, x + 3, h, str);
                        h += max(c.descent(), ldes) + 5;
                }
                return;
        }
 
-       expanded_.draw(pain, x, y);
+       expanded_.draw(pi, x, y);
 }
 
 
@@ -190,8 +190,8 @@ bool MathMacro::idxRight(idx_type &, pos_type &) const
 
 void MathMacro::validate(LaTeXFeatures & features) const
 {
-       if (name() == "binom")
-               features.require("binom");
+       if (name() == "binom" || name() == "mathcircumflex")
+               features.require(name());
        //MathInset::validate(features);
 }
 
@@ -199,21 +199,21 @@ void MathMacro::validate(LaTeXFeatures & features) const
 void MathMacro::maplize(MapleStream & os) const
 {
        updateExpansion();
-       ::maplize(expanded_.data_, os);
+       ::maplize(expanded_.data(), os);
 }
 
 
 void MathMacro::mathmlize(MathMLStream & os) const
 {
        updateExpansion();
-       ::mathmlize(expanded_.data_, os);
+       ::mathmlize(expanded_.data(), os);
 }
 
 
 void MathMacro::octavize(OctaveStream & os) const
 {
        updateExpansion();
-       ::octavize(expanded_.data_, os);
+       ::octavize(expanded_.data(), os);
 }
 
 
@@ -239,5 +239,5 @@ void MathMacro::write(WriteStream & os) const
 void MathMacro::updateExpansion() const
 {
        expand();
-       expanded_.data_.substitute(*this);
+       expanded_.data().substitute(*this);
 }