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

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

diff --git a/src/mathed/math_inset.C b/src/mathed/math_inset.C
index b4e340b5086c9cee2ede07458ca95a14fdce3924..7b1b8cfba162b1dcdcf732f8e718d3f4ac20d679 100644 (file)
--- a/src/mathed/math_inset.C
+++ b/src/mathed/math_inset.C
@@ -19,72 +19,29 @@
 #pragma implementation
 #endif
 
+#include <config.h>
+
+#include "Lsstream.h"
 #include "math_inset.h"
 #include "math_scriptinset.h"
+#include "math_mathmlstream.h"
 #include "debug.h"
 
 
-int MathInset::workwidth;
-
-
-MathInset::MathInset()
-       : size_(LM_ST_DISPLAY), xo_(0), yo_(0)
-{}
-
-
-MathInset::~MathInset()
-{}
-
-
 int MathInset::height() const
 {
        return ascent() + descent();
 }
 
 
-MathStyles MathInset::size() const
-{
-       return size_;
-}
-
-
-void MathInset::size(MathStyles s) const
-{
-       size_ = s;
-}
-
-
 std::ostream & operator<<(std::ostream & os, MathInset const & inset)
 {
-       inset.write(os, false);
+       WriteStream wi(os, false);
+       inset.write(wi);
        return os;
 }
 
 
-int MathInset::xo() const
-{
-       return xo_;
-}
-
-
-int MathInset::yo() const
-{
-       return yo_;
-}
-
-
-void MathInset::xo(int x) const
-{
-       xo_ = x;
-}
-
-
-void MathInset::yo(int y) const
-{
-       yo_ = y;
-}
-
-
 MathInset::size_type MathInset::nargs() const
 {
        return 0;
@@ -95,32 +52,41 @@ MathXArray dummyCell;
 
 MathXArray & MathInset::xcell(idx_type)
 {
-       lyxerr << "I don't have a cell\n";
+       lyxerr << "I don't have a cell 1\n";
        return dummyCell;
 }
 
 
 MathXArray const & MathInset::xcell(idx_type) const
 {
-       lyxerr << "I don't have a cell\n";
+       lyxerr << "I don't have a cell 2\n";
        return dummyCell;
 }
 
 
 MathArray & MathInset::cell(idx_type)
 {
-       lyxerr << "I don't have a cell\n";
+       lyxerr << "I don't have a cell 3\n";
        return dummyCell.data_;
 }
 
 
 MathArray const & MathInset::cell(idx_type) const
 {
-       lyxerr << "I don't have a cell\n";
+       lyxerr << "I don't have a cell 4\n";
        return dummyCell.data_;
 }
 
 
+MathInset::idx_type MathInset::index(row_type row, col_type col) const
+{
+       if (row != 0)
+               lyxerr << "illegal row: " << row << "\n";
+       if (col != 0)
+               lyxerr << "illegal col: " << col << "\n";
+       return 0;
+}
+
 void MathInset::substitute(MathMacro const &)
 {}
 
@@ -149,13 +115,13 @@ bool MathInset::idxLeft(idx_type &, pos_type &) const
 }
 
 
-bool MathInset::idxUp(idx_type &, pos_type &) const
+bool MathInset::idxUp(idx_type &) const
 {
        return false;
 }
 
 
-bool MathInset::idxDown(idx_type &, pos_type &) const
+bool MathInset::idxDown(idx_type &) const
 {
        return false;
 }
@@ -196,27 +162,11 @@ void MathInset::idxDeleteRange(idx_type, idx_type)
 {}
 
 
-void MathInset::getXY(int & x, int & y) const
-{
-   x = xo();
-   y = yo();
-}
-
-
-/*
-void MathInset::userSetSize(MathStyles sz)
-{
-       if (sz >= 0) {
-               size_ = sz;      
-               flag = flag & ~LMPF_FIXED_SIZE;
-       }
-}
-*/
-
-void MathInset::writeNormal(std::ostream & os) const
+void MathInset::normalize(NormalStream & os) const
 {
        os << "[unknown ";
-       write(os, false);
+       WriteStream wi(os.os(), false);
+       write(wi);
        os << "] ";
 }
 
@@ -224,35 +174,12 @@ void MathInset::writeNormal(std::ostream & os) const
 void MathInset::dump() const
 {
        lyxerr << "---------------------------------------------\n";
-       write(lyxerr, false);
+       WriteStream wi(lyxerr, false);
+       write(wi);
        lyxerr << "\n---------------------------------------------\n";
 }
 
 
-void MathInset::push_back(unsigned char, MathTextCodes)
-{
-       lyxerr << "can't push without a cell\n";
-}
-
-
-void MathInset::push_back(MathInset *)
-{
-       lyxerr << "can't push without a cell\n";
-}
-
-
-bool MathInset::covers(int x, int y) const
-{
-       //lyxerr << "cover? p: " << this << " x: " << x << " y: " <<  y
-       //      << " xo_: " << xo_ << " yo_: " << yo_  << endl;
-       return
-               x >= xo_ &&
-               x <= xo_ + width() &&
-               y >= yo_ - ascent() &&
-               y <= yo_ + descent();
-}
-
-
 void MathInset::validate(LaTeXFeatures &) const
 {}
 
@@ -267,10 +194,9 @@ std::vector<MathInset::idx_type>
 }
 
 
-void MathInset::metrics(MathStyles st) const
+void MathInset::metrics(MathMetricsInfo const &) const
 {
        lyxerr << "MathInset::metrics() called directly!\n";
-       size_ = st;
 }
 
 
@@ -280,7 +206,28 @@ void MathInset::draw(Painter &, int, int) const
 }
 
 
-void MathInset::write(std::ostream &, bool) const
+void MathInset::write(WriteStream &) const
 {
        lyxerr << "MathInset::write() called directly!\n";
 }
+
+
+void MathInset::octavize(OctaveStream & os) const
+{
+       NormalStream ns(os.os());
+       normalize(ns);
+}
+
+
+void MathInset::maplize(MapleStream & os) const
+{
+       NormalStream ns(os.os());
+       normalize(ns);
+}
+
+
+void MathInset::mathmlize(MathMLStream & os) const
+{
+       NormalStream ns(os.os());
+       normalize(ns);
+}