IU of drawing phase one without 'semantic changes' as requested by John

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

diff --git a/src/mathed/math_inset.C b/src/mathed/math_inset.C
index 40193c8f4a1b7d36d9fd4d196964fc56c61f96f7..675126d418dd2e94535451991e1b165fafd5e1eb 100644 (file)
--- a/src/mathed/math_inset.C
+++ b/src/mathed/math_inset.C
@@ -15,18 +15,12 @@
  *   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 "math_scriptinset.h"
 #include "math_mathmlstream.h"
 #include "math_cursor.h"
-#include "math_parser.h"
 #include "debug.h"
 
 #include "frontends/LyXView.h"
@@ -34,22 +28,12 @@
 #include "BufferView.h"
 #include "formulabase.h"
 
-
 using std::ostream;
-using std::vector;
 
 
-int MathInset::height() const
+BufferView * MathInset::view() const
 {
-       return ascent() + descent();
-}
-
-
-ostream & operator<<(ostream & os, MathAtom const & at)
-{
-       WriteStream wi(os, false, false);
-       at->write(wi);
-       return os;
+       return mathcursor ? mathcursor->formula()->view() : 0;
 }
 
 
@@ -59,13 +43,6 @@ MathInset::size_type MathInset::nargs() const
 }
 
 
-Dimension MathInset::dimensions() const
-{
-       lyxerr << "call MathInset::dimensions()\n";
-       return Dimension(width(), ascent(), descent());
-}
-
-
 MathArray dummyCell;
 
 MathArray & MathInset::cell(idx_type)
@@ -125,6 +102,12 @@ bool MathInset::idxUpDown(idx_type &, pos_type &, bool, int) const
 }
 
 
+bool MathInset::idxUpDown2(idx_type &, pos_type &, bool, int) const
+{
+       return false;
+}
+
+
 bool MathInset::idxFirst(idx_type &, pos_type &) const
 {
        return false;
@@ -171,26 +154,14 @@ bool MathInset::idxBetween(idx_type idx, idx_type from, idx_type to) const
 }
 
 
-void MathInset::metrics(MathMetricsInfo &) const
-{
-       lyxerr << "MathInset::metrics() called directly!\n";
-}
-
-
-void MathInset::draw(MathPainterInfo &, int, int) const
-{
-       lyxerr << "MathInset::draw() called directly!\n";
-}
-
-
-void MathInset::drawSelection(MathPainterInfo &,
+void MathInset::drawSelection(PainterInfo &,
        idx_type, pos_type, idx_type, pos_type) const
 {
        lyxerr << "MathInset::drawSelection() called directly!\n";
 }
 
 
-void MathInset::metricsT(TextMetricsInfo const &) const
+void MathInset::metricsT(TextMetricsInfo const &, Dimension &) const
 {
 #ifdef WITH_WARNINGS
        lyxerr << "MathInset::metricsT(Text) called directly!\n";
@@ -220,21 +191,28 @@ void MathInset::normalize(NormalStream & os) const
 }
 
 
-void MathInset::octavize(OctaveStream & os) const
+void MathInset::octave(OctaveStream & os) const
 {
        NormalStream ns(os.os());
        normalize(ns);
 }
 
 
-void MathInset::maplize(MapleStream & os) const
+void MathInset::maple(MapleStream & os) const
 {
        NormalStream ns(os.os());
        normalize(ns);
 }
 
 
-void MathInset::mathematicize(MathematicaStream & 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);
@@ -266,16 +244,9 @@ int MathInset::docbook(std::ostream &, bool) const
 }
 
 
-MathInset::result_type
-       MathInset::dispatch(FuncRequest const &, idx_type &, pos_type &) 
-{
-       return UNDISPATCHED;
-}
-
-
 string const & MathInset::getType() const
 {
-       static string t("none");
+       static string const t("none");
        return t;
 }
 
@@ -286,24 +257,15 @@ string MathInset::name() const
 }
 
 
-string asString(MathArray const & ar)
-{
-       std::ostringstream os;
-       WriteStream ws(os);
-       ws << ar;
-       return os.str();
-}
-
-
-MathArray asArray(string const & str)
+ostream & operator<<(ostream & os, MathAtom const & at)
 {
-       MathArray ar;
-       mathed_parse_cell(ar, str);
-       return ar;
+       WriteStream wi(os, false, false);
+       at->write(wi);
+       return os;
 }
 
 
-Dialogs & getDialogs()
+string MathInset::fileInsetLabel() const
 {
-       return mathcursor->formula()->view()->owner()->getDialogs();
+       return "Formula";
 }