From: Richard Heck <rgheck@comcast.net>
Date: Wed, 31 Mar 2010 21:02:10 +0000 (+0000)
Subject: Revert r33989. We do need this.
X-Git-Tag: 2.0.0~3590
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=bf76659e67c348095bbc307d265e79536e2e8bd1;p=features.git

Revert r33989. We do need this.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33990 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/mathed/InsetMathExFunc.cpp b/src/mathed/InsetMathExFunc.cpp
index 61b3a43f16..25c8dcbaf9 100644
--- a/src/mathed/InsetMathExFunc.cpp
+++ b/src/mathed/InsetMathExFunc.cpp
@@ -122,6 +122,13 @@ void InsetMathExFunc::mathematica(MathematicaStream & os) const
 }
 
 
+void InsetMathExFunc::mathmlize(MathStream & os) const
+{
+	os << "<mi>" << name_ << "</mi><mo>&af;</mo>";
+	os << cell(0);
+}
+
+
 void InsetMathExFunc::octave(OctaveStream & os) const
 {
 	os << name_ << '(' << cell(0) << ')';
diff --git a/src/mathed/InsetMathExFunc.h b/src/mathed/InsetMathExFunc.h
index 24e23d71b8..fb6dda8b36 100644
--- a/src/mathed/InsetMathExFunc.h
+++ b/src/mathed/InsetMathExFunc.h
@@ -43,6 +43,8 @@ public:
 	///
 	void mathematica(MathematicaStream &) const;
 	///
+	void mathmlize(MathStream &) const;
+	///
 	void octave(OctaveStream &) const;
 	///
 	InsetCode lyxCode() const { return MATH_EXFUNC_CODE; }
diff --git a/src/mathed/MathExtern.cpp b/src/mathed/MathExtern.cpp
index a8fd9a173d..f394183965 100644
--- a/src/mathed/MathExtern.cpp
+++ b/src/mathed/MathExtern.cpp
@@ -957,8 +957,8 @@ void extractStructure(MathData & ar, ExternalMath kind)
 		extractSums(ar);
 	extractNumbers(ar);
 	extractMatrices(ar);
+	extractFunctions(ar, kind);
 	if (kind != MATHML && kind != HTML) {
-		extractFunctions(ar, kind);
 		extractDets(ar);
 		extractDiff(ar);
 		extractExps(ar);