some (yet unfinished) up/down work

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

diff --git a/src/mathed/math_stringinset.C b/src/mathed/math_stringinset.C
index 220ee4013a82e4de2b379e2383028c3e4d7dafd2..8b157df513b33cd6a4da1684f25a740ca00deb97 100644 (file)
--- a/src/mathed/math_stringinset.C
+++ b/src/mathed/math_stringinset.C
@@ -1,17 +1,23 @@
-#include <config.h>
+/**
+ * \file math_stringinset.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
+#include <config.h>
 
 #include "math_stringinset.h"
 #include "math_mathmlstream.h"
 #include "math_streamstr.h"
-#include "LColor.h"
 #include "math_support.h"
-#include "math_parser.h"
-#include "LaTeXFeatures.h"
-#include "debug.h"
+
+
+using std::string;
+using std::auto_ptr;
 
 
 MathStringInset::MathStringInset(string const & s)
@@ -19,34 +25,34 @@ MathStringInset::MathStringInset(string const & s)
 {}
 
 
-MathInset * MathStringInset::clone() const
+auto_ptr<InsetBase> MathStringInset::doClone() const
 {
-       return new MathStringInset(*this);
+       return auto_ptr<InsetBase>(new MathStringInset(*this));
 }
 
 
-void MathStringInset::metrics(MathMetricsInfo & mi) const
+void MathStringInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       mathed_string_dim(mi.base.font, str_, ascent_, descent_, width_);
+       mathed_string_dim(mi.base.font, str_, dim);
 }
 
 
-void MathStringInset::draw(MathPainterInfo & pi, int x, int y) const
+void MathStringInset::draw(PainterInfo & pi, int x, int y) const
 {
        //lyxerr << "drawing '" << str_ << "' code: " << code_ << endl;
-       drawStr(pi, pi.base.font, x, y, str_);
+       pi.draw(x, y, str_);
 }
 
 
 void MathStringInset::normalize(NormalStream & os) const
 {
-       os << "[string " << str_ << ' ' << "mathalpha" << "]";
+       os << "[string " << str_ << ' ' << "mathalpha" << ']';
 }
 
 
-void MathStringInset::maplize(MapleStream & os) const
+void MathStringInset::maple(MapleStream & os) const
 {
-       if (/*code_ != LM_TC_VAR || */ str_.size() <= 1) {
+       if (/*code_ != LM_TC_VAR ||*/ str_.size() <= 1) {
                os << ' ' << str_ << ' ';
                return;
        }
@@ -54,11 +60,17 @@ void MathStringInset::maplize(MapleStream & os) const
        // insert '*' between adjacent chars if type is LM_TC_VAR
        os << str_[0];
        for (string::size_type i = 1; i < str_.size(); ++i)
-               os << '*' << str_[i];
+               os << str_[i];
+}
+
+
+void MathStringInset::mathematica(MathematicaStream & os) const
+{
+       os << ' ' << str_ << ' ';
 }
 
 
-void MathStringInset::octavize(OctaveStream & os) const
+void MathStringInset::octave(OctaveStream & os) const
 {
        if (/*code_ != LM_TC_VAR ||*/ str_.size() <= 1) {
                os << ' ' << str_ << ' ';
@@ -68,7 +80,7 @@ void MathStringInset::octavize(OctaveStream & os) const
        // insert '*' between adjacent chars if type is LM_TC_VAR
        os << str_[0];
        for (string::size_type i = 1; i < str_.size(); ++i)
-               os << '*' << str_[i];
+               os << str_[i];
 }