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 fb8e78baff01d742d5c96420cfdfadb6fc4022a3..48f644d71a13f4ec02b7f903a0ddcc08523cda80 100644 (file)
--- a/src/mathed/math_inset.C
+++ b/src/mathed/math_inset.C
@@ -15,18 +15,18 @@
  *   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_charinset.h"
 #include "math_mathmlstream.h"
 #include "math_cursor.h"
+#include "math_parser.h"
 #include "debug.h"
 
 #include "frontends/LyXView.h"
@@ -34,9 +34,7 @@
 #include "BufferView.h"
 #include "formulabase.h"
 
-
 using std::ostream;
-using std::vector;
 
 
 int MathInset::height() const
@@ -45,56 +43,32 @@ 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;
 }
 
 
-MathXArray dummyCell;
-
-MathXArray & MathInset::xcell(idx_type)
+Dimension MathInset::dimensions() const
 {
-       lyxerr << "I don't have a cell 1\n";
-       return dummyCell;
+       lyxerr << "call MathInset::dimensions()\n";
+       return Dimension(width(), ascent(), descent());
 }
 
 
-MathXArray const & MathInset::xcell(idx_type) const
-{
-       lyxerr << "I don't have a cell 2\n";
-       return dummyCell;
-}
-
+MathArray dummyCell;
 
 MathArray & MathInset::cell(idx_type)
 {
-       lyxerr << "I don't have a cell 3\n";
-       return dummyCell.data_;
+       lyxerr << "I don't have a cell 1\n";
+       return dummyCell;
 }
 
 
 MathArray const & MathInset::cell(idx_type) const
 {
-       lyxerr << "I don't have a cell 4\n";
-       return dummyCell.data_;
+       lyxerr << "I don't have a cell 2\n";
+       return dummyCell;
 }
 
 
@@ -135,7 +109,7 @@ bool MathInset::idxLeft(idx_type &, pos_type &) const
 }
 
 
-bool MathInset::idxUpDown(idx_type &, bool) const
+bool MathInset::idxUpDown(idx_type &, pos_type &, bool, int) const
 {
        return false;
 }
@@ -165,12 +139,10 @@ bool MathInset::idxEnd(idx_type &, pos_type &) const
 }
 
 
-void MathInset::normalize(NormalStream & os) const
+void MathInset::getPos(idx_type, pos_type, int & x, int & y) const
 {
-       os << "[unknown ";
-       WriteStream wi(os.os(), false, true);
-       write(wi);
-       os << "] ";
+       lyxerr << "MathInset::getPos() called directly!\n";
+       x = y = 0;
 }
 
 
@@ -183,17 +155,9 @@ void MathInset::dump() const
 }
 
 
-void MathInset::validate(LaTeXFeatures &) const
-{}
-
-
-vector<MathInset::idx_type>
-       MathInset::idxBetween(idx_type from, idx_type to) const
+bool MathInset::idxBetween(idx_type idx, idx_type from, idx_type to) const
 {
-       vector<idx_type> res;
-       for (idx_type i = from; i <= to; ++i)
-               res.push_back(i);
-       return res;
+       return from <= idx && idx <= to;
 }
 
 
@@ -209,6 +173,13 @@ void MathInset::draw(MathPainterInfo &, int, int) const
 }
 
 
+void MathInset::drawSelection(MathPainterInfo &,
+       idx_type, pos_type, idx_type, pos_type) const
+{
+       lyxerr << "MathInset::drawSelection() called directly!\n";
+}
+
+
 void MathInset::metricsT(TextMetricsInfo const &) const
 {
 #ifdef WITH_WARNINGS
@@ -226,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() << "] ";
 }
 
 
@@ -246,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());
@@ -278,51 +263,52 @@ 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;
 }
 
 
-std::vector<string> MathInset::getLabelList() const
+string const & MathInset::getType() const
 {
-       return std::vector<string>();
+       static string t("none");
+       return t;
 }
 
 
-string const & MathInset::getType() const
+string MathInset::name() const
 {
-       static string t("none");
-       return t;
+       return "unknown";
 }
 
 
 string asString(MathArray const & ar)
 {
-       string res;
-       for (MathArray::const_iterator it = ar.begin(); it != ar.end(); ++it)
-               if ((*it)->getChar())
-                       res += (*it)->getChar();
-       return res;
+       std::ostringstream os;
+       WriteStream ws(os);
+       ws << ar;
+       return STRCONV(os.str());
 }
 
 
 MathArray asArray(string const & str)
 {
        MathArray ar;
-       for (string::const_iterator it = str.begin(); it != str.end(); ++it)
-               ar.push_back(MathAtom(new MathCharInset(*it)));
+       mathed_parse_cell(ar, str);
        return ar;
 }
 
 
-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();
 }