fix #1073

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

diff --git a/src/mathed/math_macro.C b/src/mathed/math_macro.C
index 657deb39ba0cab35691141ba117ca684cc034999..17c05dcbea93d90d9f010b42246412ee242949be 100644 (file)
--- a/src/mathed/math_macro.C
+++ b/src/mathed/math_macro.C
@@ -14,9 +14,6 @@
  *  This code is under the GNU General Public Licence version 2 or later.
  */
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include "math_macro.h"
 #include "math_support.h"
@@ -72,7 +69,7 @@ void MathMacro::expand() const
 }
 
 
-void MathMacro::metrics(MathMetricsInfo & mi) const
+void MathMacro::metrics(MetricsInfo & mi) const
 {
        augmentFont(font_, "lyxtex");
        mi_ = mi;
@@ -109,7 +106,7 @@ void MathMacro::metrics(MathMetricsInfo & mi) const
 }
 
 
-void MathMacro::draw(MathPainterInfo & pi, int x, int y) const
+void MathMacro::draw(PainterInfo & pi, int x, int y) const
 {
        metrics(mi_);
 
@@ -197,10 +194,10 @@ void MathMacro::validate(LaTeXFeatures & features) const
 }
 
 
-void MathMacro::maplize(MapleStream & os) const
+void MathMacro::maple(MapleStream & os) const
 {
        updateExpansion();
-       ::maplize(expanded_, os);
+       ::maple(expanded_, os);
 }
 
 
@@ -211,10 +208,10 @@ void MathMacro::mathmlize(MathMLStream & os) const
 }
 
 
-void MathMacro::octavize(OctaveStream & os) const
+void MathMacro::octave(OctaveStream & os) const
 {
        updateExpansion();
-       ::octavize(expanded_, os);
+       ::octave(expanded_, os);
 }
 
 
@@ -223,3 +220,15 @@ void MathMacro::updateExpansion() const
        expand();
        expanded_.substitute(*this);
 }
+
+
+void MathMacro::infoize(std::ostream & os) const
+{
+       os << "Macro: " << name();
+}
+
+
+void MathMacro::infoize2(std::ostream & os) const
+{
+       os << "Macro: " << name();
+}