Revert c6ce76c2 and fix 670efa8f

[lyx.git] / src / mathed / InsetMath.cpp

diff --git a/src/mathed/InsetMath.cpp b/src/mathed/InsetMath.cpp
index 51b4deee709e484cf55c3411e111ba0a83d18461..87952f5679ab613c61e1820c1372c870ce9d3b7b 100644 (file)
--- a/src/mathed/InsetMath.cpp
+++ b/src/mathed/InsetMath.cpp
@@ -27,6 +27,12 @@ using namespace std;
 
 namespace lyx {
 
+docstring InsetMath::name() const
+{
+       return from_utf8("Unknown");
+}
+
+
 MathData & InsetMath::cell(idx_type)
 {
        static MathData dummyCell(&buffer());
@@ -47,7 +53,8 @@ void InsetMath::dump() const
 {
        lyxerr << "---------------------------------------------" << endl;
        odocstringstream os;
-       WriteStream wi(os, false, true, WriteStream::wsDefault);
+       otexrowstream ots(os, false);
+       WriteStream wi(ots, false, true, WriteStream::wsDefault);
        write(wi);
        lyxerr << to_utf8(os.str());
        lyxerr << "\n---------------------------------------------" << endl;
@@ -78,10 +85,11 @@ void InsetMath::write(WriteStream & os) const
 }
 
 
-int InsetMath::plaintext(odocstream &, OutputParams const &) const
+int InsetMath::plaintext(odocstringstream &, 
+        OutputParams const &, size_t) const
 {
        // all math plain text output shall take place in InsetMathHull
-       LASSERT(false, /**/);
+       LATTEST(false);
        return 0;
 }
 
@@ -122,8 +130,21 @@ void InsetMath::mathematica(MathematicaStream & os) const
 
 void InsetMath::mathmlize(MathStream & os) const
 {
+       os << "<!-- " << from_utf8(insetName(lyxCode())) << " -->";
+       os << MTag("mi");
+       NormalStream ns(os.os());
+       normalize(ns);
+       os << ETag("mi");
+}
+
+
+void InsetMath::htmlize(HtmlStream & os) const
+{
+       os << "<!-- " << from_utf8(insetName(lyxCode())) << " -->";
+       os << MTag("span", "style='color: red;'");
        NormalStream ns(os.os());
        normalize(ns);
+       os << ETag("span");
 }
 
 
@@ -136,7 +157,8 @@ HullType InsetMath::getType() const
 ostream & operator<<(ostream & os, MathAtom const & at)
 {
        odocstringstream oss;
-       WriteStream wi(oss, false, false, WriteStream::wsDefault);
+       otexrowstream ots(oss, false);
+       WriteStream wi(ots, false, false, WriteStream::wsDefault);
        at->write(wi);
        return os << to_utf8(oss.str());
 }
@@ -144,7 +166,8 @@ ostream & operator<<(ostream & os, MathAtom const & at)
 
 odocstream & operator<<(odocstream & os, MathAtom const & at)
 {
-       WriteStream wi(os, false, false, WriteStream::wsDefault);
+       otexrowstream ots(os, false);
+       WriteStream wi(ots, false, false, WriteStream::wsDefault);
        at->write(wi);
        return os;
 }