whichFont down to 5.3%

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

diff --git a/src/mathed/math_stringinset.C b/src/mathed/math_stringinset.C
index 901a5135841a6ff95d49e55341f5b1fea045a5b4..b1efdb6f8198a49eb79553c49c323ed581207361 100644 (file)
--- a/src/mathed/math_stringinset.C
+++ b/src/mathed/math_stringinset.C
@@ -1,17 +1,21 @@
+#include <config.h>
+
 #ifdef __GNUG__
 #pragma implementation
 #endif
 
-#include <cctype>
-
 #include "math_stringinset.h"
 #include "math_mathmlstream.h"
+#include "math_streamstr.h"
 #include "LColor.h"
 #include "Painter.h"
 #include "math_support.h"
 #include "math_parser.h"
+#include "LaTeXFeatures.h"
 #include "debug.h"
 
+#include <cctype>
+
 
 MathStringInset::MathStringInset()
        : str_(), code_(LM_TC_MIN)
@@ -45,6 +49,12 @@ int MathStringInset::width() const
        return mathed_string_width(code_, mi_, str_);
 }
 
+void MathStringInset::validate(LaTeXFeatures & features) const
+{
+       //lyxerr << "stringinset amssymb" << endl;
+       if (code_ == LM_TC_MSA || code_ == LM_TC_MSB)
+               features.require("amssymb");
+}
 
 void MathStringInset::metrics(MathMetricsInfo const & mi) const
 {
@@ -61,14 +71,14 @@ void MathStringInset::draw(Painter & pain, int x, int y) const
 
 void MathStringInset::normalize(NormalStream & os) const
 {
-       os << "[string " << str_.c_str() << ' ' << "mathalpha" << "]";
+       os << "[string " << str_ << ' ' << "mathalpha" << "]";
 }
 
 
 void MathStringInset::maplize(MapleStream & os) const
 {
        if (code_ != LM_TC_VAR || str_.size() <= 1) {
-               os << ' ' << str_.c_str() << ' ';
+               os << ' ' << str_ << ' ';
                return;
        }       
 
@@ -82,7 +92,7 @@ void MathStringInset::maplize(MapleStream & os) const
 void MathStringInset::octavize(OctaveStream & os) const
 {
        if (code_ != LM_TC_VAR || str_.size() <= 1) {
-               os << ' ' << str_.c_str() << ' ';
+               os << ' ' << str_ << ' ';
                return;
        }       
 
@@ -96,20 +106,22 @@ void MathStringInset::octavize(OctaveStream & os) const
 void MathStringInset::mathmlize(MathMLStream & os) const
 {
        if (code_ == LM_TC_VAR)
-               os << "<mi> " << str_.c_str() << " </mi>";
+               os << "<mi> " << str_ << " </mi>";
        else if (code_ == LM_TC_CONST)
-               os << "<mn> " << str_.c_str() << " </mn>";
+               os << "<mn> " << str_ << " </mn>";
        else if (code_ == LM_TC_RM || code_ == LM_TC_TEXTRM)
-               os << "<mtext> " << str_.c_str() <<  " </mtext>";
+               os << "<mtext> " << str_ <<  " </mtext>";
        else
-               os << str_.c_str();
+               os << str_;
 }
 
 
 void MathStringInset::write(WriteStream & os) const
 {
        if (math_font_name(code_)) 
-               os << '\\' << math_font_name(code_) << '{' << str_.c_str() << '}';
+               os << '\\' << math_font_name(code_) << '{' << str_ << '}';
        else 
-               os << str_.c_str();
+               os << str_;
 }
+
+