X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathExFunc.cpp;h=e4e1f10c2e2b8daa099bcb490185c58828f1a798;hb=1538a8352ca82914bc131f2bf98b0ef4f55c1e2d;hp=ed5c728ef25b89449306f44479c23178cd071e00;hpb=237c132c1e6fc720b87f2fea6deb18a8395cbe0a;p=lyx.git

diff --git a/src/mathed/InsetMathExFunc.cpp b/src/mathed/InsetMathExFunc.cpp
index ed5c728ef2..e4e1f10c2e 100644
--- a/src/mathed/InsetMathExFunc.cpp
+++ b/src/mathed/InsetMathExFunc.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,24 +11,26 @@
 #include <config.h>
 
 #include "InsetMathExFunc.h"
+
 #include "MathData.h"
 #include "MathStream.h"
-#include "MathStream.h"
 #include "MathSupport.h"
+#include "MetricsInfo.h"
 
+#include "support/docstream.h"
 
-namespace lyx {
+using namespace std;
 
-using std::string;
+namespace lyx {
 
 
-InsetMathExFunc::InsetMathExFunc(docstring const & name)
-	: InsetMathNest(1), name_(name)
+InsetMathExFunc::InsetMathExFunc(Buffer * buf, docstring const & name)
+	: InsetMathNest(buf, 1), name_(name)
 {}
 
 
-InsetMathExFunc::InsetMathExFunc(docstring const & name, MathData const & ar)
-	: InsetMathNest(1), name_(name)
+InsetMathExFunc::InsetMathExFunc(Buffer * buf, docstring const & name, MathData const & ar)
+	: InsetMathNest(buf, 1), name_(name)
 {
 	cell(0) = ar;
 }
@@ -42,8 +44,7 @@ Inset * InsetMathExFunc::clone() const
 
 void InsetMathExFunc::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	mathed_string_dim(mi.base.font, name_, dim);
-	dim_ = dim;
+	metricsStrRedBlack(mi, dim, name_);
 }
 
 
@@ -123,7 +124,14 @@ void InsetMathExFunc::mathematica(MathematicaStream & os) const
 
 void InsetMathExFunc::mathmlize(MathStream & os) const
 {
-	os << MTag(name_.c_str()) << cell(0) << ETag(name_.c_str());
+	os << "<mi>" << name_ << "</mi><mo>&af;</mo>";
+	os << cell(0);
+}
+
+
+void InsetMathExFunc::htmlize(HtmlStream & os) const
+{
+	os << name_ << cell(0);
 }