Introduce a return value for mathmlize(). We will need this to be able

[features.git] / src / mathed / InsetMathSymbol.cpp

diff --git a/src/mathed/InsetMathSymbol.cpp b/src/mathed/InsetMathSymbol.cpp
index 16f26169dd3c340bb4c0f5d6b5644bb546c225c1..d09d40b02c901a21c92adf58ea48b5c1cfc4b947 100644 (file)
--- a/src/mathed/InsetMathSymbol.cpp
+++ b/src/mathed/InsetMathSymbol.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,23 +11,20 @@
 #include <config.h>
 
 #include "InsetMathSymbol.h"
+
 #include "Dimension.h"
-#include "MathStream.h"
+#include "LaTeXFeatures.h"
+#include "MathAtom.h"
+#include "MathParser.h"
 #include "MathStream.h"
 #include "MathSupport.h"
-#include "MathParser.h"
-#include "MathAtom.h"
-#include "LaTeXFeatures.h"
-
-#include "debug.h"
 
+#include "support/debug.h"
+#include "support/docstream.h"
 #include "support/textutils.h"
 
-namespace lyx {
-
-using std::string;
-using std::auto_ptr;
 
+namespace lyx {
 
 InsetMathSymbol::InsetMathSymbol(latexkeys const * l)
        : sym_(l), h_(0), scriptable_(false)
@@ -44,9 +41,9 @@ InsetMathSymbol::InsetMathSymbol(docstring const & name)
 {}
 
 
-auto_ptr<Inset> InsetMathSymbol::doClone() const
+Inset * InsetMathSymbol::clone() const
 {
-       return auto_ptr<Inset>(new InsetMathSymbol(*this));
+       return new InsetMathSymbol(*this);
 }
 
 
@@ -56,12 +53,12 @@ docstring InsetMathSymbol::name() const
 }
 
 
-bool InsetMathSymbol::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetMathSymbol::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        //lyxerr << "metrics: symbol: '" << sym_->name
        //      << "' in font: '" << sym_->inset
        //      << "' drawn as: '" << sym_->draw
-       //      << "'" << std::endl;
+       //      << "'" << endl;
 
        int const em = mathed_char_width(mi.base.font, 'M');
        FontSetChanger dummy(mi.base, sym_->inset);
@@ -85,12 +82,6 @@ bool InsetMathSymbol::metrics(MetricsInfo & mi, Dimension & dim) const
                if (sym_->inset == "cmex" || sym_->inset == "esint" ||
                    sym_->extra == "funclim")
                        scriptable_ = true;
-
-       if (dim_ == dim)
-               return false;
-
-       dim_ = dim;
-       return true;
 }
 
 
@@ -99,7 +90,7 @@ void InsetMathSymbol::draw(PainterInfo & pi, int x, int y) const
        //lyxerr << "metrics: symbol: '" << sym_->name
        //      << "' in font: '" << sym_->inset
        //      << "' drawn as: '" << sym_->draw
-       //      << "'" << std::endl;
+       //      << "'" << endl;
        int const em = mathed_char_width(pi.base.font, 'M');
        if (isRelOp())
                x += static_cast<int>(0.25*em+0.5);
@@ -184,23 +175,29 @@ void InsetMathSymbol::mathematica(MathematicaStream & os) const
 }
 
 
+// FIXME This will likely need some work.
 char const * MathMLtype(docstring const & s)
 {
-       if (s == "mathop")
-               return "mo";
-       return "mi";
+       if (s == "mathord")
+               return "mi";
+       return "mo";
 }
 
 
-void InsetMathSymbol::mathmlize(MathStream & os) const
+docstring InsetMathSymbol::mathmlize(MathStream & os) const
 {
+       // FIXME To get this working properly, we need to do add the 
+       // XML entity definitions to lib/symbols. And probably do more
+       // interesting things with MathMLtype
        char const * type = MathMLtype(sym_->extra);
        os << '<' << type << "> ";
-       if (sym_->xmlname == "x") // unknown so far
+       if (sym_->xmlname == "x") 
+               // unknown so far
                os << name();
        else
                os << sym_->xmlname;
        os << " </" << type << '>';
+       return docstring();
 }
 
 
@@ -215,6 +212,7 @@ void InsetMathSymbol::octave(OctaveStream & os) const
 
 void InsetMathSymbol::write(WriteStream & os) const
 {
+       MathEnsurer ensurer(os);
        os << '\\' << name();
 
        // $,#, etc. In theory the restriction based on catcodes, but then
@@ -229,7 +227,7 @@ void InsetMathSymbol::write(WriteStream & os) const
 
 void InsetMathSymbol::infoize2(odocstream & os) const
 {
-       os << "Symbol: " << name();
+       os << from_ascii("Symbol: ") << name();
 }