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 7e17da748cd20b867aa2a422b9411043e194fa92..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"
 
@@ -69,32 +70,32 @@ bool MathMacro::editing() const
 }
 
 
-void MathMacro::metrics(MathMetricsInfo const & st) const
+void MathMacro::metrics(MathMetricsInfo const & mi) const
 {
+       mi_ = mi;
+
        if (defining()) {
-               size_ = st;
-               mathed_string_dim(LM_TC_TEX, size_.size, name(), ascent_, descent_, width_);
+               mathed_string_dim(LM_TC_TEX, mi_, name(), ascent_, descent_, width_);
                return;
        }
 
        if (editing()) {
                expanded_ = tmplate_->xcell(0);
-               expanded_.metrics(st);
-               size_    = st;
+               expanded_.metrics(mi_);
                width_   = expanded_.width()   + 4;
                ascent_  = expanded_.ascent()  + 2;
                descent_ = expanded_.descent() + 2;
 
-               width_ +=  mathed_string_width(LM_TC_TEXTRM, size_.size, name()) + 10;
+               width_ +=  mathed_string_width(LM_TC_TEXTRM, mi_, name()) + 10;
 
                int lasc;
                int ldes;
                int lwid;
-               mathed_string_dim(LM_TC_TEXTRM, size_.size, "#1: ", lasc, ldes, lwid);
+               mathed_string_dim(LM_TC_TEXTRM, mi_, "#1: ", lasc, ldes, lwid);
 
                for (idx_type i = 0; i < nargs(); ++i) {
                        MathXArray const & c = xcell(i);
-                       c.metrics(st);
+                       c.metrics(mi_);
                        width_    = std::max(width_, c.width() + lwid);
                        descent_ += std::max(c.ascent(),  lasc) + 5;
                        descent_ += std::max(c.descent(), ldes) + 5;
@@ -104,38 +105,34 @@ void MathMacro::metrics(MathMetricsInfo const & st) const
 
        expanded_ = tmplate_->xcell(0);
        expanded_.data_.substitute(*this);
-       expanded_.metrics(st);
-       size_    = st;
-       width_   = expanded_.width()   + 6;
-       ascent_  = expanded_.ascent()  + 3;
-       descent_ = expanded_.descent() + 3;
+       expanded_.metrics(mi_);
+       width_   = expanded_.width();
+       ascent_  = expanded_.ascent();
+       descent_ = expanded_.descent();
 }
 
 
 void MathMacro::draw(Painter & pain, int x, int y) const
 {
-       xo(x);
-       yo(y);
-
-       metrics(size_);
+       metrics(mi_);
 
        if (defining()) {
-               drawStr(pain, LM_TC_TEX, size_.size, x, y, name());
+               drawStr(pain, LM_TC_TEX, mi_, x, y, name());
                return;
        }
 
        if (editing()) {
                int h = y - ascent() + 2 + expanded_.ascent();
-               drawStr(pain, LM_TC_TEXTRM, size_.size, x + 3, h, name());
+               drawStr(pain, LM_TC_TEXTRM, mi_, x + 3, h, name());
 
-               int const w = mathed_string_width(LM_TC_TEXTRM, size_.size, name());
+               int const w = mathed_string_width(LM_TC_TEXTRM, mi_, name());
                expanded_.draw(pain, x + w + 12, h);
                h += expanded_.descent();
 
                int lasc;
                int ldes;
                int lwid;
-               mathed_string_dim(LM_TC_TEXTRM, size_.size, "#1: ", lasc, ldes, lwid);
+               mathed_string_dim(LM_TC_TEXTRM, mi_, "#1: ", lasc, ldes, lwid);
 
                for (idx_type i = 0; i < nargs(); ++i) {
                        MathXArray const & c = xcell(i);
@@ -143,13 +140,13 @@ void MathMacro::draw(Painter & pain, int x, int y) const
                        c.draw(pain, x + lwid, h);
                        char str[] = "#1:";
                        str[1] += static_cast<char>(i);
-                       drawStr(pain, LM_TC_TEX, size_.size, x + 3, h, str);
+                       drawStr(pain, LM_TC_TEX, mi_, x + 3, h, str);
                        h += std::max(c.descent(), ldes) + 5;
                }
                return;
        }
 
-       expanded_.draw(pain, x + 3, y);
+       expanded_.draw(pain, x, y);
 }
 
 
@@ -159,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);
 }
 
@@ -213,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);
+}