Better mechanism for setting cell height

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

diff --git a/src/mathed/InsetMathComment.cpp b/src/mathed/InsetMathComment.cpp
index 4648ba1f17bcf6795ffe71e1600e4dd33e776ac4..ea502d1aa2ef1fd7a7ab504c3799f5dc49cc489e 100644 (file)
--- a/src/mathed/InsetMathComment.cpp
+++ b/src/mathed/InsetMathComment.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -11,21 +11,30 @@
 #include <config.h>
 
 #include "InsetMathComment.h"
+
 #include "MathData.h"
 #include "MathStream.h"
 #include "MathSupport.h"
-#include "support/std_ostream.h"
+
+#include <ostream>
 
 
 namespace lyx {
 
-InsetMathComment::InsetMathComment()
-       : InsetMathNest(1)
+InsetMathComment::InsetMathComment(Buffer * buf)
+       : InsetMathNest(buf, 1)
 {}
 
 
-InsetMathComment::InsetMathComment(docstring const & str)
-       : InsetMathNest(1)
+InsetMathComment::InsetMathComment(MathData const & ar)
+       : InsetMathNest(const_cast<Buffer *>(ar.buffer()), 1)
+{
+       cell(0) = ar;
+}
+
+
+InsetMathComment::InsetMathComment(Buffer * buf, docstring const & str)
+       : InsetMathNest(buf, 1)
 {
        // FIXME UNICODE
        asArray(str, cell(0));
@@ -41,16 +50,12 @@ Inset * InsetMathComment::clone() const
 void InsetMathComment::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        cell(0).metrics(mi, dim);
-       metricsMarkers(dim);
-       // Cache the inset dimension. 
-       setDimCache(mi, dim);
 }
 
 
 void InsetMathComment::draw(PainterInfo & pi, int x, int y) const
 {
-       cell(0).draw(pi, x + 1, y);
-       drawMarkers(pi, x, y);
+       cell(0).draw(pi, x, y);
 }
 
 
@@ -78,17 +83,15 @@ void InsetMathComment::maple(MapleStream & os) const
 }
 
 
-void InsetMathComment::mathematica(MathematicaStream &) const
-{}
-
-
-void InsetMathComment::octave(OctaveStream &) const
-{}
+void InsetMathComment::mathmlize(MathStream & os) const
+{
+       os << MTag("comment") << cell(0) << ETag("comment");
+}
 
 
-void InsetMathComment::mathmlize(MathStream & os) const
+void InsetMathComment::htmlize(HtmlStream & os) const
 {
-       os << MTag("comment") << cell(0) << cell(1) << ETag("comment");
+       os << "<!-- " << cell(0) << " -->";
 }