* InsetMathHull:

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

diff --git a/src/mathed/InsetMathSymbol.cpp b/src/mathed/InsetMathSymbol.cpp
index 93f9f5e828a25ce8d8cebba1c0c98788542995e9..52d6eee85855ccb41e155d7f252fc1b69071660c 100644 (file)
--- a/src/mathed/InsetMathSymbol.cpp
+++ b/src/mathed/InsetMathSymbol.cpp
@@ -11,24 +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 "LyXRC.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)
@@ -45,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);
 }
 
 
@@ -57,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);
@@ -86,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;
 }
 
 
@@ -100,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);
@@ -230,7 +220,7 @@ void InsetMathSymbol::write(WriteStream & os) const
 
 void InsetMathSymbol::infoize2(odocstream & os) const
 {
-       os << "Symbol: " << name();
+       os << from_ascii("Symbol: ") << name();
 }