X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_inset.C;h=1a9b26d3e5d3924af921f8105d1240eea70ff8fd;hb=f1ff990de782f1a4c3ae14902f5242bdb012b264;hp=f075e4654c53bc689ec2c13e3344ede477e99765;hpb=a9e93befaa4c5ff47c5d31786bf790914b13b31d;p=lyx.git

diff --git a/src/mathed/math_inset.C b/src/mathed/math_inset.C
index f075e4654c..1a9b26d3e5 100644
--- 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,13 @@
 #include "BufferView.h"
 #include "formulabase.h"
 
-
 using std::ostream;
-using std::vector;
-
-
-int MathInset::height() const
-{
-	return ascent() + descent();
-}
+using std::endl;
 
 
-ostream & operator<<(ostream & os, MathAtom const & at)
+BufferView * MathInset::view() const
 {
-	WriteStream wi(os, false, false);
-	at->write(wi);
-	return os;
+	return mathcursor ? mathcursor->formula()->view() : 0;
 }
 
 
@@ -59,25 +44,18 @@ 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)
 {
-	lyxerr << "I don't have a cell 1\n";
+	lyxerr << "I don't have a cell 1" << endl;
 	return dummyCell;
 }
 
 
 MathArray const & MathInset::cell(idx_type) const
 {
-	lyxerr << "I don't have a cell 2\n";
+	lyxerr << "I don't have a cell 2" << endl;
 	return dummyCell;
 }
 
@@ -85,9 +63,9 @@ MathArray const & MathInset::cell(idx_type) const
 MathInset::idx_type MathInset::index(row_type row, col_type col) const
 {
 	if (row != 0)
-		lyxerr << "illegal row: " << row << "\n";
+		lyxerr << "illegal row: " << row << endl;
 	if (col != 0)
-		lyxerr << "illegal col: " << col << "\n";
+		lyxerr << "illegal col: " << col << endl;
 	return 0;
 }
 
@@ -125,6 +103,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;
@@ -151,17 +135,17 @@ bool MathInset::idxEnd(idx_type &, pos_type &) const
 
 void MathInset::getPos(idx_type, pos_type, int & x, int & y) const
 {
-	lyxerr << "MathInset::getPos() called directly!\n";
+	lyxerr << "MathInset::getPos() called directly!" << endl;
 	x = y = 0;
 }
 
 
 void MathInset::dump() const
 {
-	lyxerr << "---------------------------------------------\n";
+	lyxerr << "---------------------------------------------" << endl;
 	WriteStream wi(lyxerr, false, true);
 	write(wi);
-	lyxerr << "\n---------------------------------------------\n";
+	lyxerr << "\n---------------------------------------------" << endl;
 }
 
 
@@ -171,29 +155,17 @@ 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";
+	lyxerr << "MathInset::drawSelection() called directly!" << endl;
 }
 
 
-void MathInset::metricsT(TextMetricsInfo const &) const
+void MathInset::metricsT(TextMetricsInfo const &, Dimension &) const
 {
 #ifdef WITH_WARNINGS
-	lyxerr << "MathInset::metricsT(Text) called directly!\n";
+	lyxerr << "MathInset::metricsT(Text) called directly!" << endl;
 #endif
 }
 
@@ -201,7 +173,7 @@ void MathInset::metricsT(TextMetricsInfo const &) const
 void MathInset::drawT(TextPainter &, int, int) const
 {
 #ifdef WITH_WARNINGS
-	lyxerr << "MathInset::drawT(Text) called directly!\n";
+	lyxerr << "MathInset::drawT(Text) called directly!" << endl;
 #endif
 }
 
@@ -209,7 +181,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);
 }
 
 
@@ -219,21 +192,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);
@@ -265,15 +245,9 @@ int MathInset::docbook(std::ostream &, bool) const
 }
 
 
-int MathInset::dispatch(FuncRequest const &, idx_type, pos_type) 
-{
-	return 0; // undispatched
-}
-
-
 string const & MathInset::getType() const
 {
-	static string t("none");
+	static string const t("none");
 	return t;
 }
 
@@ -284,30 +258,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)
-{
-	MathArray ar;
-	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()
+string MathInset::fileInsetLabel() const
 {
-	return mathcursor->formula()->view()->owner()->getLyXFunc();
+	return "Formula";
 }