Jean-Marc's fix for wrong descent

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

diff --git a/src/mathed/math_inset.C b/src/mathed/math_inset.C
index 3210b3558fe4d6fd3ca9c3119cce704881cbe54d..065408881be4c724c456001a489c8c67b86bc039 100644 (file)
--- a/src/mathed/math_inset.C
+++ b/src/mathed/math_inset.C
@@ -15,21 +15,23 @@
  *   the GNU General Public Licence version 2 or later.
  */
 
-#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"
+#include "math_parser.h"
 #include "debug.h"
 
+#include "frontends/LyXView.h"
+#include "frontends/Dialogs.h"
+#include "BufferView.h"
+#include "formulabase.h"
 
 using std::ostream;
-using std::vector;
 
 
 int MathInset::height() const
@@ -38,56 +40,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;
 }
 
 
@@ -128,7 +106,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;
 }
@@ -158,12 +136,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;
 }
 
 
@@ -176,32 +152,31 @@ 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;
 }
 
 
-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";
 }
 
 
+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
@@ -219,20 +194,41 @@ void MathInset::drawT(TextPainter &, int, int) const
 
 
 
-void MathInset::write(WriteStream &) const
+void MathInset::write(WriteStream & os) const
+{
+       os << '\\' << name().c_str();
+       os.pendingSpace(true);
+}
+
+
+void MathInset::normalize(NormalStream & os) const
 {
-       lyxerr << "MathInset::write() called directly!\n";
+       os << '[' << name().c_str() << "] ";
+}
+
+
+void MathInset::octave(OctaveStream & os) const
+{
+       NormalStream ns(os.os());
+       normalize(ns);
 }
 
 
-void MathInset::octavize(OctaveStream & os) const
+void MathInset::maple(MapleStream & os) const
 {
        NormalStream ns(os.os());
        normalize(ns);
 }
 
 
-void MathInset::maplize(MapleStream & os) const
+void MathInset::maxima(MaximaStream & os) const
+{
+       MapleStream ns(os.os());
+       maple(ns);
+}
+
+
+void MathInset::mathematica(MathematicaStream & os) const
 {
        NormalStream ns(os.os());
        normalize(ns);
@@ -244,3 +240,65 @@ 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;
+}
+
+
+string const & MathInset::getType() const
+{
+       static string t("none");
+       return t;
+}
+
+
+string MathInset::name() const
+{
+       return "unknown";
+}
+
+
+string asString(MathArray const & ar)
+{
+       std::ostringstream os;
+       WriteStream ws(os);
+       ws << ar;
+       return STRCONV(os.str());
+}
+
+
+MathArray asArray(string const & str)
+{
+       MathArray ar;
+       mathed_parse_cell(ar, str);
+       return ar;
+}
+
+
+ostream & operator<<(ostream & os, MathAtom const & at)
+{
+       WriteStream wi(os, false, false);
+       at->write(wi);
+       return os;
+}
+
+
+Dialogs & getDialogs()
+{
+       return mathcursor->formula()->view()->owner()->getDialogs();
+}