use a single function dimension() instead of three.

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

diff --git a/src/mathed/math_inset.C b/src/mathed/math_inset.C
index cddb9f2437f62bd7c99dbfdc882b1e49db745db6..428a5297137a7db2bf08699341339bffa682d5ed 100644 (file)
--- a/src/mathed/math_inset.C
+++ b/src/mathed/math_inset.C
@@ -1,9 +1,9 @@
 /*
  *  File:        math_inset.C
  *  Purpose:     Implementation of insets for mathed
- *  Author:      Alejandro Aguilar Sierra <asierra@servidor.unam.mx> 
+ *  Author:      Alejandro Aguilar Sierra <asierra@servidor.unam.mx>
  *  Created:     January 1996
- *  Description: 
+ *  Description:
  *
  *  Dependencies: Xlib, XForms
  *
@@ -24,9 +24,16 @@
 #include "Lsstream.h"
 #include "math_inset.h"
 #include "math_scriptinset.h"
+#include "math_charinset.h"
 #include "math_mathmlstream.h"
+#include "math_cursor.h"
 #include "debug.h"
 
+#include "frontends/LyXView.h"
+#include "frontends/Dialogs.h"
+#include "BufferView.h"
+#include "formulabase.h"
+
 
 using std::ostream;
 using std::vector;
@@ -38,20 +45,37 @@ 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);
+       WriteStream wi(os, false, false);
        inset.write(wi);
        return os;
 }
 
-
 MathInset::size_type MathInset::nargs() const
 {
        return 0;
 }
 
 
+void MathInset::dimensions(int & w, int & a, int & d) const
+{
+       w = width();
+       a = ascent();
+       d = descent();
+}
+
+
 MathXArray dummyCell;
 
 MathXArray & MathInset::xcell(idx_type)
@@ -71,14 +95,14 @@ MathXArray const & MathInset::xcell(idx_type) const
 MathArray & MathInset::cell(idx_type)
 {
        lyxerr << "I don't have a cell 3\n";
-       return dummyCell.data_;
+       return dummyCell.data();
 }
 
 
 MathArray const & MathInset::cell(idx_type) const
 {
        lyxerr << "I don't have a cell 4\n";
-       return dummyCell.data_;
+       return dummyCell.data();
 }
 
 
@@ -119,13 +143,7 @@ bool MathInset::idxLeft(idx_type &, pos_type &) const
 }
 
 
-bool MathInset::idxUp(idx_type &) const
-{
-       return false;
-}
-
-
-bool MathInset::idxDown(idx_type &) const
+bool MathInset::idxUpDown(idx_type &, bool) const
 {
        return false;
 }
@@ -155,17 +173,10 @@ bool MathInset::idxEnd(idx_type &, pos_type &) const
 }
 
 
-void MathInset::idxDelete(idx_type &, bool & popit, bool & deleteit)
-{
-       popit    = false;
-       deleteit = false;
-}
-
-
 void MathInset::normalize(NormalStream & os) const
 {
        os << "[unknown ";
-       WriteStream wi(os.os(), false);
+       WriteStream wi(os.os(), false, true);
        write(wi);
        os << "] ";
 }
@@ -174,7 +185,7 @@ void MathInset::normalize(NormalStream & os) const
 void MathInset::dump() const
 {
        lyxerr << "---------------------------------------------\n";
-       WriteStream wi(lyxerr, false);
+       WriteStream wi(lyxerr, false, true);
        write(wi);
        lyxerr << "\n---------------------------------------------\n";
 }
@@ -194,13 +205,13 @@ vector<MathInset::idx_type>
 }
 
 
-void MathInset::metrics(MathMetricsInfo const &) const
+void MathInset::metrics(MathMetricsInfo &) const
 {
        lyxerr << "MathInset::metrics() called directly!\n";
 }
 
 
-void MathInset::draw(Painter &, int, int) const
+void MathInset::draw(MathPainterInfo &, int, int) const
 {
        lyxerr << "MathInset::draw() called directly!\n";
 }
@@ -208,13 +219,17 @@ void MathInset::draw(Painter &, int, int) const
 
 void MathInset::metricsT(TextMetricsInfo const &) const
 {
+#ifdef WITH_WARNINGS
        lyxerr << "MathInset::metricsT(Text) called directly!\n";
+#endif
 }
 
 
 void MathInset::drawT(TextPainter &, int, int) const
 {
+#ifdef WITH_WARNINGS
        lyxerr << "MathInset::drawT(Text) called directly!\n";
+#endif
 }
 
 
@@ -239,8 +254,83 @@ void MathInset::maplize(MapleStream & os) const
 }
 
 
+void MathInset::mathematicize(MathematicaStream & os) const
+{
+       NormalStream ns(os.os());
+       normalize(ns);
+}
+
+
 void MathInset::mathmlize(MathMLStream & os) const
 {
        NormalStream ns(os.os());
        normalize(ns);
 }
+
+
+int MathInset::ascii(std::ostream &, int) const
+{
+       return 0;
+}
+
+
+int MathInset::linuxdoc(std::ostream &) const
+{
+       return 0;
+}
+
+
+int MathInset::docbook(std::ostream &, bool) const
+{
+       return 0;
+}
+
+
+int MathInset::dispatch(string const &, idx_type, pos_type) 
+{
+       return 0; // undispatched
+}
+
+
+std::vector<string> MathInset::getLabelList() const
+{
+       return std::vector<string>();
+}
+
+
+string const & MathInset::getType() const
+{
+       static string t("none");
+       return t;
+}
+
+
+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;
+}
+
+
+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)));
+       return ar;
+}
+
+
+Dialogs * getDialogs()
+{
+       return mathcursor->formula()->view()->owner()->getDialogs();
+}
+
+
+LyXFunc * getLyXFunc()
+{
+       return mathcursor->formula()->view()->owner()->getLyXFunc();
+}