X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMath.cpp;h=ba559e7eb6b4888080cc140c303526125602a65a;hb=02e82157ec583c3900e359de86be79fac6512387;hp=a1cc8d8049e940914e2d1510ab5050f228c97e6d;hpb=25edee2ead3daed304f5e74fa59879551b104715;p=lyx.git

diff --git a/src/mathed/InsetMath.cpp b/src/mathed/InsetMath.cpp
index a1cc8d8049..ba559e7eb6 100644
--- a/src/mathed/InsetMath.cpp
+++ b/src/mathed/InsetMath.cpp
@@ -13,20 +13,29 @@
 
 #include "InsetMath.h"
 #include "MathData.h"
+#include "MathRow.h"
 #include "MathStream.h"
 
+#include "MetricsInfo.h"
+
 #include "support/debug.h"
 #include "support/docstream.h"
 #include "support/gettext.h"
+#include "support/lassert.h"
 #include "support/lstrings.h"
 #include "support/textutils.h"
 
-#include "support/lassert.h"
 
 using namespace std;
 
 namespace lyx {
 
+docstring InsetMath::name() const
+{
+	return from_utf8("Unknown");
+}
+
+
 MathData & InsetMath::cell(idx_type)
 {
 	static MathData dummyCell(&buffer());
@@ -43,11 +52,57 @@ MathData const & InsetMath::cell(idx_type) const
 }
 
 
+MathClass InsetMath::mathClass() const
+{
+	return MC_ORD;
+}
+
+
+bool InsetMath::addToMathRow(MathRow & mrow, MetricsInfo & ) const
+{
+	MathRow::Element e(MathRow::INSET, mathClass());
+	e.inset = this;
+	mrow.push_back(e);
+	return true;
+}
+
+void InsetMath::metricsMarkers(MetricsInfo & mi, Dimension & dim,
+                           int framesize) const
+{
+	if (!mi.base.macro_nesting)
+		Inset::metricsMarkers(dim, framesize);
+}
+
+
+void InsetMath::metricsMarkers2(MetricsInfo & mi, Dimension & dim,
+                            int framesize) const
+{
+	if (!mi.base.macro_nesting)
+		Inset::metricsMarkers2(dim, framesize);
+}
+
+
+void InsetMath::drawMarkers(PainterInfo & pi, int x, int y) const
+{
+	if (!pi.base.macro_nesting)
+		Inset::drawMarkers(pi, x, y);
+}
+
+
+void InsetMath::drawMarkers2(PainterInfo & pi, int x, int y) const
+{
+	if (!pi.base.macro_nesting)
+		Inset::drawMarkers2(pi, x, y);
+}
+
+
+
 void InsetMath::dump() const
 {
 	lyxerr << "---------------------------------------------" << endl;
 	odocstringstream os;
-	WriteStream wi(os, false, true, WriteStream::wsDefault);
+	otexrowstream ots(os);
+	WriteStream wi(ots, false, true, WriteStream::wsDefault);
 	write(wi);
 	lyxerr << to_utf8(os.str());
 	lyxerr << "\n---------------------------------------------" << endl;
@@ -78,10 +133,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;
 }
 
@@ -130,6 +186,16 @@ void InsetMath::mathmlize(MathStream & os) const
 }
 
 
+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");
+}
+
+
 HullType InsetMath::getType() const
 {
 	return hullNone;
@@ -139,7 +205,8 @@ HullType InsetMath::getType() const
 ostream & operator<<(ostream & os, MathAtom const & at)
 {
 	odocstringstream oss;
-	WriteStream wi(oss, false, false, WriteStream::wsDefault);
+	otexrowstream ots(oss);
+	WriteStream wi(ots, false, false, WriteStream::wsDefault);
 	at->write(wi);
 	return os << to_utf8(oss.str());
 }
@@ -147,7 +214,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);
+	WriteStream wi(ots, false, false, WriteStream::wsDefault);
 	at->write(wi);
 	return os;
 }