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 683bf3d99f22580f915cb4c91480df057ec1ddf1..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,14 +43,6 @@ int MathInset::height() const
 }
 
 
-ostream & operator<<(ostream & os, MathAtom const & at)
-{
-       WriteStream wi(os, false, false);
-       at->write(wi);
-       return os;
-}
-
-
 MathInset::size_type MathInset::nargs() const
 {
        return 0;
@@ -209,7 +199,8 @@ void MathInset::drawT(TextPainter &, int, int) const
 
 void MathInset::write(WriteStream & os) const
 {
-       os << '\\' << name().c_str() << ' ';
+       os << '\\' << name().c_str();
+       os.pendingSpace(true);
 }
 
 
@@ -233,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());
@@ -265,9 +263,10 @@ int MathInset::docbook(std::ostream &, bool) const
 }
 
 
-int MathInset::dispatch(FuncRequest const &, idx_type, pos_type) 
+MathInset::result_type
+       MathInset::dispatch(FuncRequest const &, idx_type &, pos_type &)
 {
-       return 0; // undispatched
+       return UNDISPATCHED;
 }
 
 
@@ -289,7 +288,7 @@ string asString(MathArray const & ar)
        std::ostringstream os;
        WriteStream ws(os);
        ws << ar;
-       return os.str();
+       return STRCONV(os.str());
 }
 
 
@@ -301,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();
 }