make \newcommand{\bb}[1]{\mathbf{#1}} work for read/write/display.

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

diff --git a/src/mathed/math_macro.C b/src/mathed/math_macro.C
index f65f7c551e395be5c38dcff7c1d57c63d05cf4a9..7ab5dc3490189beb68aff90bf7652f68cbaf2341 100644 (file)
--- a/src/mathed/math_macro.C
+++ b/src/mathed/math_macro.C
@@ -19,14 +19,15 @@
 #endif
 
 #include "math_macro.h"
-#include "array.h"
-#include "support/lstrings.h"
-#include "support/LAssert.h"
-#include "debug.h"
-#include "support.h"
+#include "math_support.h"
 #include "math_cursor.h"
+#include "math_extern.h"
 #include "math_macrotable.h"
 #include "math_macrotemplate.h"
+#include "math_mathmlstream.h"
+#include "support/lstrings.h"
+#include "support/LAssert.h"
+#include "debug.h"
 #include "Painter.h"
 #include "LaTeXFeatures.h"
 
@@ -155,41 +156,22 @@ void MathMacro::dump() const
        lyxerr << "\n macro: '" << this << "'\n";
        lyxerr << " name: '" << name() << "'\n";
        lyxerr << " template: '";
-       MathWriteInfo wi(lyxerr);
+       WriteStream wi(lyxerr);
        tmplate_->write(wi);
        lyxerr << "'\n";
 }
 
 
-void MathMacro::write(MathWriteInfo & os) const
-{
-       os << '\\' << name();
-       for (idx_type i = 0; i < nargs(); ++i)
-               os << '{' << cell(i) << '}';
-       if (nargs() == 0) 
-               os << ' ';
-}
-
-
-void MathMacro::writeNormal(std::ostream & os) const
-{
-       os << "[macro " << name() << " ";
-       for (idx_type i = 0; i < nargs(); ++i) {
-               cell(i).writeNormal(os);
-               os << ' ';
-       }
-       os << "] ";
-}
-
-
-bool MathMacro::idxUp(idx_type & idx, pos_type & pos) const
+bool MathMacro::idxUp(idx_type & idx) const
 {
+       pos_type pos;
        return MathNestInset::idxLeft(idx, pos);
 }
 
 
-bool MathMacro::idxDown(idx_type & idx, pos_type & pos) const
+bool MathMacro::idxDown(idx_type & idx) const
 {
+       pos_type pos;
        return MathNestInset::idxRight(idx, pos);
 }
 
@@ -209,6 +191,53 @@ bool MathMacro::idxRight(idx_type &, pos_type &) const
 void MathMacro::validate(LaTeXFeatures & features) const
 {
        if (name() == "binom")
-               features.binom = true;
+               features.require("binom");
        //MathInset::validate(features);
 }
+
+
+void MathMacro::maplize(MapleStream & os) const
+{
+       updateExpansion();
+       ::maplize(expanded_.data_, os);
+}
+
+
+void MathMacro::mathmlize(MathMLStream & os) const
+{
+       updateExpansion();
+       ::mathmlize(expanded_.data_, os);
+}
+
+
+void MathMacro::octavize(OctaveStream & os) const
+{
+       updateExpansion();
+       ::octavize(expanded_.data_, os);
+}
+
+
+void MathMacro::normalize(NormalStream & os) const
+{
+       os << "[macro " << name() << " ";
+       for (idx_type i = 0; i < nargs(); ++i) 
+               os << cell(i) << ' ';
+       os << ']';
+}
+
+
+void MathMacro::write(WriteStream & os) const
+{
+       os << '\\' << name();
+       for (idx_type i = 0; i < nargs(); ++i)
+               os << '{' << cell(i) << '}';
+       if (nargs() == 0) 
+               os << ' ';
+}
+
+
+void MathMacro::updateExpansion() const
+{
+       expanded_ = tmplate_->xcell(0);
+       expanded_.data_.substitute(*this);
+}