X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMath.cpp;h=738f6342c358a3801fb44a4858517a810a2d2082;hb=c9609fe56a2deb40f001503c2fd707c990a2e0e2;hp=126f4f71b79a3d77db4f35b233348dfbe17e7988;hpb=9d0ea8aeff32833a90b3fe64df0c5518a9e241be;p=lyx.git

diff --git a/src/mathed/InsetMath.cpp b/src/mathed/InsetMath.cpp
index 126f4f71b7..738f6342c3 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.
  */
@@ -14,26 +14,29 @@
 #include "InsetMath.h"
 #include "MathData.h"
 #include "MathStream.h"
-#include "support/gettext.h"
-#include "support/debug.h"
 
+#include "support/debug.h"
 #include "support/docstream.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
 #include "support/textutils.h"
 
-#include <boost/current_function.hpp>
-#include <boost/assert.hpp>
+#include "support/lassert.h"
 
-using std::endl;
+using namespace std;
 
 namespace lyx {
 
+docstring InsetMath::name() const
+{
+	return from_utf8("Unknown");
+}
 
 
 MathData & InsetMath::cell(idx_type)
 {
-	static MathData dummyCell;
-	lyxerr << BOOST_CURRENT_FUNCTION << ": I don't have any cell" << endl;
+	static MathData dummyCell(&buffer());
+	LYXERR0("I don't have any cell");
 	return dummyCell;
 }
 
@@ -41,7 +44,7 @@ MathData & InsetMath::cell(idx_type)
 MathData const & InsetMath::cell(idx_type) const
 {
 	static MathData dummyCell;
-	lyxerr << BOOST_CURRENT_FUNCTION << ": I don't have any cell" << endl;
+	LYXERR0("I don't have any cell");
 	return dummyCell;
 }
 
@@ -50,7 +53,7 @@ void InsetMath::dump() const
 {
 	lyxerr << "---------------------------------------------" << endl;
 	odocstringstream os;
-	WriteStream wi(os, false, true);
+	WriteStream wi(os, false, true, WriteStream::wsDefault);
 	write(wi);
 	lyxerr << to_utf8(os.str());
 	lyxerr << "\n---------------------------------------------" << endl;
@@ -59,18 +62,19 @@ void InsetMath::dump() const
 
 void InsetMath::metricsT(TextMetricsInfo const &, Dimension &) const
 {
-	lyxerr << "InsetMath::metricsT(Text) called directly!" << endl;
+	LYXERR0("InsetMath::metricsT(Text) called directly!");
 }
 
 
 void InsetMath::drawT(TextPainter &, int, int) const
 {
-	lyxerr << "InsetMath::drawT(Text) called directly!" << endl;
+	LYXERR0("InsetMath::drawT(Text) called directly!");
 }
 
 
 void InsetMath::write(WriteStream & os) const
 {
+	MathEnsurer ensurer(os);
 	docstring const s = name();
 	os << "\\" << s;
 	// We need an extra ' ' unless this is a single-char-non-ASCII name
@@ -80,11 +84,11 @@ void InsetMath::write(WriteStream & os) const
 }
 
 
-int InsetMath::plaintext(Buffer const &, odocstream &,
-			 OutputParams const &) const
+int InsetMath::plaintext(odocstringstream &, 
+        OutputParams const &, size_t) const
 {
 	// all math plain text output shall take place in InsetMathHull
-	BOOST_ASSERT(false);
+	LATTEST(false);
 	return 0;
 }
 
@@ -125,8 +129,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,10 +153,10 @@ HullType InsetMath::getType() const
 }
 
 
-std::ostream & operator<<(std::ostream & os, MathAtom const & at)
+ostream & operator<<(ostream & os, MathAtom const & at)
 {
 	odocstringstream oss;
-	WriteStream wi(oss, false, false);
+	WriteStream wi(oss, false, false, WriteStream::wsDefault);
 	at->write(wi);
 	return os << to_utf8(oss.str());
 }
@@ -147,7 +164,7 @@ std::ostream & operator<<(std::ostream & os, MathAtom const & at)
 
 odocstream & operator<<(odocstream & os, MathAtom const & at)
 {
-	WriteStream wi(os, false, false);
+	WriteStream wi(os, false, false, WriteStream::wsDefault);
 	at->write(wi);
 	return os;
 }