small up/down tweaking

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

diff --git a/src/mathed/math_inset.C b/src/mathed/math_inset.C
index 6daf362e673b7c42e6136b5567808ff165856c22..48f644d71a13f4ec02b7f903a0ddcc08523cda80 100644 (file)
--- a/src/mathed/math_inset.C
+++ b/src/mathed/math_inset.C
@@ -15,14 +15,14 @@
  *   the GNU General Public Licence version 2 or later.
  */
 
+#include <config.h>
+
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
-#include <config.h>
-
-#include "Lsstream.h"
 #include "math_inset.h"
+#include "Lsstream.h"
 #include "math_scriptinset.h"
 #include "math_mathmlstream.h"
 #include "math_cursor.h"
@@ -34,9 +34,7 @@
 #include "BufferView.h"
 #include "formulabase.h"
 
-
 using std::ostream;
-using std::vector;
 
 
 int MathInset::height() const
@@ -45,24 +43,6 @@ int MathInset::height() const
 }
 
 
-ostream & operator<<(ostream & os, MathAtom const & at)
-{
-       if (at.nucleus())
-               os << *(at.nucleus());
-       else
-               os << "(nil)";
-       return os;
-}
-
-
-ostream & operator<<(ostream & os, MathInset const & inset)
-{
-       WriteStream wi(os, false, false);
-       inset.write(wi);
-       return os;
-}
-
-
 MathInset::size_type MathInset::nargs() const
 {
        return 0;
@@ -76,36 +56,22 @@ Dimension MathInset::dimensions() const
 }
 
 
-MathXArray dummyCell;
+MathArray dummyCell;
 
-MathXArray & MathInset::xcell(idx_type)
+MathArray & MathInset::cell(idx_type)
 {
        lyxerr << "I don't have a cell 1\n";
        return dummyCell;
 }
 
 
-MathXArray const & MathInset::xcell(idx_type) const
+MathArray const & MathInset::cell(idx_type) const
 {
        lyxerr << "I don't have a cell 2\n";
        return dummyCell;
 }
 
 
-MathArray & MathInset::cell(idx_type)
-{
-       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 4\n";
-       return dummyCell.data();
-}
-
-
 MathInset::idx_type MathInset::index(row_type row, col_type col) const
 {
        if (row != 0)
@@ -180,15 +146,6 @@ void MathInset::getPos(idx_type, pos_type, int & x, int & y) const
 }
 
 
-void MathInset::normalize(NormalStream & os) const
-{
-       os << "[unknown ";
-       WriteStream wi(os.os(), false, true);
-       write(wi);
-       os << "] ";
-}
-
-
 void MathInset::dump() const
 {
        lyxerr << "---------------------------------------------\n";
@@ -240,9 +197,16 @@ void MathInset::drawT(TextPainter &, int, int) const
 
 
 
-void MathInset::write(WriteStream &) const
+void MathInset::write(WriteStream & os) const
 {
-       lyxerr << "MathInset::write() called directly!\n";
+       os << '\\' << name().c_str();
+       os.pendingSpace(true);
+}
+
+
+void MathInset::normalize(NormalStream & os) const
+{
+       os << '[' << name().c_str() << "] ";
 }
 
 
@@ -260,6 +224,13 @@ void MathInset::maplize(MapleStream & os) const
 }
 
 
+void MathInset::maximize(MaximaStream & os) const
+{
+       MapleStream ns(os.os());
+       maplize(ns);
+}
+
+
 void MathInset::mathematicize(MathematicaStream & os) const
 {
        NormalStream ns(os.os());
@@ -292,9 +263,10 @@ int MathInset::docbook(std::ostream &, bool) const
 }
 
 
-int MathInset::dispatch(string const &, idx_type, pos_type) 
+MathInset::result_type
+       MathInset::dispatch(FuncRequest const &, idx_type &, pos_type &)
 {
-       return 0; // undispatched
+       return UNDISPATCHED;
 }
 
 
@@ -316,7 +288,7 @@ string asString(MathArray const & ar)
        std::ostringstream os;
        WriteStream ws(os);
        ws << ar;
-       return os.str();
+       return STRCONV(os.str());
 }
 
 
@@ -328,13 +300,15 @@ MathArray asArray(string const & str)
 }
 
 
-Dialogs * getDialogs()
+ostream & operator<<(ostream & os, MathAtom const & at)
 {
-       return mathcursor->formula()->view()->owner()->getDialogs();
+       WriteStream wi(os, false, false);
+       at->write(wi);
+       return os;
 }
 
 
-LyXFunc * getLyXFunc()
+Dialogs & getDialogs()
 {
-       return mathcursor->formula()->view()->owner()->getLyXFunc();
+       return mathcursor->formula()->view()->owner()->getDialogs();
 }