Fix math cursor positioning bug

[lyx.git] / src / mathed / math_symbolinset.C

diff --git a/src/mathed/math_symbolinset.C b/src/mathed/math_symbolinset.C
index e862aa53ec93bc85c53843deda15ca52ab60d555..2d07bd6240e7cca2e9b7e97887598dbb552b7805 100644 (file)
--- a/src/mathed/math_symbolinset.C
+++ b/src/mathed/math_symbolinset.C
@@ -1,23 +1,36 @@
+/**
+ * \file math_symbolinset.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
 #include <config.h>
 
 #include "math_symbolinset.h"
+#include "dimension.h"
 #include "math_mathmlstream.h"
 #include "math_streamstr.h"
 #include "math_support.h"
 #include "math_parser.h"
+#include "math_atom.h"
 #include "LaTeXFeatures.h"
 #include "debug.h"
 
 
-using std::ostream;
+using std::string;
+using std::auto_ptr;
 
 
-MathSymbolInset::MathSymbolInset(const latexkeys * l)
+MathSymbolInset::MathSymbolInset(latexkeys const * l)
        : sym_(l), h_(0)
 {}
 
 
-MathSymbolInset::MathSymbolInset(const char * name)
+MathSymbolInset::MathSymbolInset(char const * name)
        : sym_(in_word_set(name)), h_(0)
 {}
 
@@ -27,10 +40,9 @@ MathSymbolInset::MathSymbolInset(string const & name)
 {}
 
 
-
-MathInset * MathSymbolInset::clone() const
+auto_ptr<InsetBase> MathSymbolInset::doClone() const
 {
-       return new MathSymbolInset(*this);
+       return auto_ptr<InsetBase>(new MathSymbolInset(*this));
 }
 
 
@@ -40,44 +52,63 @@ string MathSymbolInset::name() const
 }
 
 
-void MathSymbolInset::metrics(MathMetricsInfo & mi) const
+void MathSymbolInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        //lyxerr << "metrics: symbol: '" << sym_->name
        //      << "' in font: '" << sym_->inset
        //      << "' drawn as: '" << sym_->draw
-       //      << "'\n";
-       MathFontSetChanger dummy(mi.base, sym_->inset.c_str());
-       mathed_string_dim(mi.base.font, sym_->draw, ascent_, descent_, width_);
-       // correct height for broken cmex font
+       //      << "'" << std::endl;
+
+       int const em = mathed_char_width(mi.base.font, 'M');
+       FontSetChanger dummy(mi.base, sym_->inset.c_str());
+       mathed_string_dim(mi.base.font, sym_->draw, dim);
+       // correct height for broken cmex and wasy font
+#if defined(__APPLE__) && defined(__GNUC__)
        if (sym_->inset == "cmex") {
-               h_ = 4 * descent_ / 5;
-               ascent_  += h_;
-               descent_ -= h_;
+               h_ = 4 * dim.des / 5;
+               dim.asc += 0*h_;
+               dim.des -= h_;
+               h_ = dim.asc;
+       } else if (sym_->inset == "wasy") {
+               h_ = 4 * dim.des / 5;
+               dim.asc += h_;
+               dim.des -= h_;
        }
-       if (isRelOp())
-               width_ += 6;
+#else
+       if (sym_->inset == "cmex" || sym_->inset == "wasy") {
+               h_ = 4 * dim.des / 5;
+               dim.asc += h_;
+               dim.des -= h_;
+       }
+#endif
        // seperate things a bit
-       if (sym_->draw.size() > 1)
-               width_ += 2;
+       if (isRelOp())
+               dim.wid += static_cast<int>(0.5 * em + 0.5);
+       else
+               dim.wid += static_cast<int>(0.1667 * em + 0.5);
 
        scriptable_ = false;
        if (mi.base.style == LM_ST_DISPLAY)
                if (sym_->inset == "cmex" || sym_->extra == "funclim")
                        scriptable_ = true;
+
+       width_ = dim.wid;
 }
 
 
-void MathSymbolInset::draw(MathPainterInfo & pi, int x, int y) const
+void MathSymbolInset::draw(PainterInfo & pi, int x, int y) const
 {
        //lyxerr << "metrics: symbol: '" << sym_->name
        //      << "' in font: '" << sym_->inset
        //      << "' drawn as: '" << sym_->draw
-       //      << "'\n";
+       //      << "'" << std::endl;
+       int const em = mathed_char_width(pi.base.font, 'M');
        if (isRelOp())
-               x += 3;
-       if (sym_->draw.size() > 1)
-               x += 1;
-       MathFontSetChanger dummy(pi.base, sym_->inset.c_str());
+               x += static_cast<int>(0.25*em+0.5);
+       else
+               x += static_cast<int>(0.0833*em+0.5);
+
+       FontSetChanger dummy(pi.base, sym_->inset.c_str());
        drawStr(pi, pi.base.font, x, y - h_, sym_->draw);
 }
 
@@ -107,16 +138,18 @@ void MathSymbolInset::validate(LaTeXFeatures & features) const
 {
        if (sym_->inset == "msa" || sym_->inset == "msb")
                features.require("amssymb");
+       else if (sym_->inset == "wasy")
+               features.require("wasysym");
 }
 
 
 void MathSymbolInset::normalize(NormalStream & os) const
 {
-       os << "[symbol " << name() << "]";
+       os << "[symbol " << name() << ']';
 }
 
 
-void MathSymbolInset::maplize(MapleStream & os) const
+void MathSymbolInset::maple(MapleStream & os) const
 {
        if (name() == "cdot")
                os << '*';
@@ -126,7 +159,18 @@ void MathSymbolInset::maplize(MapleStream & os) const
                os << name();
 }
 
-void MathSymbolInset::mathematicize(MathematicaStream & os) const
+void MathSymbolInset::maxima(MaximaStream & os) const
+{
+       if (name() == "cdot")
+               os << '*';
+       else if (name() == "infty")
+               os << "INF";
+       else
+               os << name();
+}
+
+
+void MathSymbolInset::mathematica(MathematicaStream & os) const
 {
        if ( name() == "pi")    { os << "Pi"; return;}
        if ( name() == "infty") { os << "Infinity"; return;}
@@ -142,13 +186,6 @@ char const * MathMLtype(string const & s)
 }
 
 
-bool MathSymbolInset::match(MathInset * p) const
-{
-       MathSymbolInset const * q = p->asSymbolInset();
-       return q && name() == q->name();
-}
-
-
 void MathSymbolInset::mathmlize(MathMLStream & os) const
 {
        char const * type = MathMLtype(sym_->extra);
@@ -161,7 +198,7 @@ void MathSymbolInset::mathmlize(MathMLStream & os) const
 }
 
 
-void MathSymbolInset::octavize(OctaveStream & os) const
+void MathSymbolInset::octave(OctaveStream & os) const
 {
        if (name() == "cdot")
                os << '*';
@@ -172,11 +209,12 @@ void MathSymbolInset::octavize(OctaveStream & os) const
 
 void MathSymbolInset::write(WriteStream & os) const
 {
-       os << '\\' << name() << ' ';
+       os << '\\' << name();
+       os.pendingSpace(true);
 }
 
 
-void MathSymbolInset::infoize(ostream & os) const
+void MathSymbolInset::infoize2(std::ostream & os) const
 {
        os << "Symbol: " << name();
 }