small up/down tweaking

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

diff --git a/src/mathed/math_stringinset.C b/src/mathed/math_stringinset.C
index 32981c22e2ea1743e6971c11fb931df74a33786f..e28556edbc643f961b614ae68fe5c6e64c455a9d 100644 (file)
--- a/src/mathed/math_stringinset.C
+++ b/src/mathed/math_stringinset.C
@@ -1,94 +1,96 @@
+#include <config.h>
+
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
-#include <cctype>
-
 #include "math_stringinset.h"
-#include "LColor.h"
-#include "Painter.h"
-#include "support/LOstream.h"
-#include "support.h"
-#include "math_parser.h"
+#include "math_mathmlstream.h"
+#include "math_streamstr.h"
+#include "math_support.h"
 #include "debug.h"
 
 
-MathStringInset::MathStringInset(string const & s, MathTextCodes t)
-       : str_(s), code_(t)
+MathStringInset::MathStringInset(string const & s)
+       : str_(s)
 {}
 
 
 MathInset * MathStringInset::clone() const
-{   
+{
        return new MathStringInset(*this);
 }
 
 
-int MathStringInset::ascent() const
+void MathStringInset::metrics(MathMetricsInfo & mi) const
 {
-       return mathed_string_ascent(code_, mi_, str_);
+       mathed_string_dim(mi.base.font, str_, dim_);
 }
 
 
-int MathStringInset::descent() const
+void MathStringInset::draw(MathPainterInfo & pi, int x, int y) const
 {
-       return mathed_string_descent(code_, mi_, str_);
+       //lyxerr << "drawing '" << str_ << "' code: " << code_ << endl;
+       drawStr(pi, pi.base.font, x, y, str_);
 }
 
 
-int MathStringInset::width() const
+void MathStringInset::normalize(NormalStream & os) const
 {
-       return mathed_string_width(code_, mi_, str_);
+       os << "[string " << str_ << ' ' << "mathalpha" << ']';
 }
 
 
-void MathStringInset::metrics(MathMetricsInfo const & mi) const
+void MathStringInset::maplize(MapleStream & os) const
 {
-       mi_ = mi;
-}
-
+       if (/*code_ != LM_TC_VAR ||*/ str_.size() <= 1) {
+               os << ' ' << str_ << ' ';
+               return;
+       }
 
-void MathStringInset::draw(Painter & pain, int x, int y) const
-{ 
-       //lyxerr << "drawing '" << str_ << "' code: " << code_ << endl;
-       drawStr(pain, code_, mi_, x, y, str_);
+       // 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];
 }
 
 
-void MathStringInset::write(MathWriteInfo & os) const
+void MathStringInset::mathematicize(MathematicaStream & os) const
 {
-       if (math_font_name(code_)) 
-               os << '\\' << math_font_name(code_) << '{' << str_ << '}';
-       else 
-               os << str_;
+       os << ' ' << str_ << ' ';
 }
 
 
-void MathStringInset::writeNormal(std::ostream & os) const
+void MathStringInset::octavize(OctaveStream & os) const
 {
-       os << "[string " << str_ << " " << "mathalpha" << "]";
+       if (/*code_ != LM_TC_VAR ||*/ str_.size() <= 1) {
+               os << ' ' << str_ << ' ';
+               return;
+       }
+
+       // 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];
 }
 
 
-string MathStringInset::octavize() const
+void MathStringInset::mathmlize(MathMLStream & os) const
 {
-       return maplize();
+/*
+       if (code_ == LM_TC_VAR)
+               os << "<mi> " << str_ << " </mi>";
+       else if (code_ == LM_TC_CONST)
+               os << "<mn> " << str_ << " </mn>";
+       else if (code_ == LM_TC_RM || code_ == LM_TC_TEXTRM)
+               os << "<mtext> " << str_ <<  " </mtext>";
+       else
+*/
+               os << str_;
 }
 
 
-string MathStringInset::maplize() const
+void MathStringInset::write(WriteStream & os) const
 {
-       if (code_ != LM_TC_VAR)
-               return str_;
-       if (str_.size() <= 1)
-               return str_;
-       string res;
-
-       // insert '*' between adjacent chars if type is LM_TC_VAR
-       res += str_[0];
-       for (string::size_type i = 1; i < str_.size(); ++i) {
-               res += '*';
-               res += str_[i];
-       }
-       return res;
+       os << str_;
 }