X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMath.cpp;h=f71febc06de2a97dc386db267739e903c07dd30b;hb=400703aff1984aa304a71e1ba315e1047d344020;hp=0674d97382b58ffd19dc2f824518f12cd8369a05;hpb=31713932b247802b5b59482f5157c8a4f7206825;p=lyx.git

diff --git a/src/mathed/InsetMath.cpp b/src/mathed/InsetMath.cpp
index 0674d97382..f71febc06d 100644
--- a/src/mathed/InsetMath.cpp
+++ b/src/mathed/InsetMath.cpp
@@ -4,7 +4,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Alejandro Aguilar Sierra
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -27,9 +27,15 @@ using namespace std;
 
 namespace lyx {
 
+docstring InsetMath::name() const
+{
+	return from_utf8("Unknown");
+}
+
+
 MathData & InsetMath::cell(idx_type)
 {
-	static MathData dummyCell;
+	static MathData dummyCell(&buffer());
 	LYXERR0("I don't have any cell");
 	return dummyCell;
 }
@@ -47,7 +53,9 @@ void InsetMath::dump() const
 {
 	lyxerr << "---------------------------------------------" << endl;
 	odocstringstream os;
-	WriteStream wi(os, false, true, false);
+	TexRow texrow(false);
+	otexrowstream ots(os,texrow);
+	WriteStream wi(ots, false, true, WriteStream::wsDefault);
 	write(wi);
 	lyxerr << to_utf8(os.str());
 	lyxerr << "\n---------------------------------------------" << endl;
@@ -68,34 +76,21 @@ void InsetMath::drawT(TextPainter &, int, int) const
 
 void InsetMath::write(WriteStream & os) const
 {
-	bool brace = ensureMath(os);
+	MathEnsurer ensurer(os);
 	docstring const s = name();
 	os << "\\" << s;
 	// We need an extra ' ' unless this is a single-char-non-ASCII name
 	// or anything non-ASCII follows
 	if (s.size() != 1 || isAlphaASCII(s[0]))
 		os.pendingSpace(true);
-	os.pendingBrace(brace);
 }
 
 
-bool InsetMath::ensureMath(WriteStream & os, bool needs_math_mode) const
-{
-	bool brace = os.pendingBrace();
-	os.pendingBrace(false);
-	if (os.latex() && os.textMode() && needs_math_mode) {
-		os << "\\ensuremath{";
-		os.textMode(false);
-		brace = true;
-	}
-	return brace;
-}
-
-
-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;
 }
 
@@ -136,8 +131,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");
 }
 
 
@@ -150,7 +158,9 @@ HullType InsetMath::getType() const
 ostream & operator<<(ostream & os, MathAtom const & at)
 {
 	odocstringstream oss;
-	WriteStream wi(oss, false, false, false);
+	TexRow texrow(false);
+	otexrowstream ots(oss,texrow);
+	WriteStream wi(ots, false, false, WriteStream::wsDefault);
 	at->write(wi);
 	return os << to_utf8(oss.str());
 }
@@ -158,7 +168,9 @@ ostream & operator<<(ostream & os, MathAtom const & at)
 
 odocstream & operator<<(odocstream & os, MathAtom const & at)
 {
-	WriteStream wi(os, false, false, false);
+	TexRow texrow(false);
+	otexrowstream ots(os,texrow);
+	WriteStream wi(ots, false, false, WriteStream::wsDefault);
 	at->write(wi);
 	return os;
 }