... and RELEASE-NOTES

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

diff --git a/src/mathed/InsetMathChar.cpp b/src/mathed/InsetMathChar.cpp
index 532d8496fa39bde2cfeb420a2f0f69ae69b3aca4..813067e08a55bff863821a60885ed335032bd291 100644 (file)
--- a/src/mathed/InsetMathChar.cpp
+++ b/src/mathed/InsetMathChar.cpp
@@ -18,7 +18,7 @@
 #include "MetricsInfo.h"
 
 #include "Dimension.h"
-#include "Encoding.h"
+#include "BufferEncodings.h"
 #include "LaTeXFeatures.h"
 #include "TextPainter.h"
 
@@ -34,12 +34,6 @@ namespace lyx {
 extern bool has_math_fonts;
 
 
-static bool isBinaryOp(char_type c)
-{
-       return support::contains("+-<>=/*", static_cast<char>(c));
-}
-
-
 static bool slanted(char_type c)
 {
        return isAlphaASCII(c) || Encodings::isMathAlpha(c);
@@ -62,24 +56,28 @@ void InsetMathChar::metrics(MetricsInfo & mi, Dimension & dim) const
 {
 #if 1
        if (char_ == '=' && has_math_fonts) {
-               FontSetChanger dummy(mi.base, "cmr");
+               Changer dummy = mi.base.changeFontSet("cmr");
                dim = theFontMetrics(mi.base.font).dimension(char_);
        } else if ((char_ == '>' || char_ == '<') && has_math_fonts) {
-               FontSetChanger dummy(mi.base, "cmm");
+               Changer dummy = mi.base.changeFontSet("cmm");
                dim = theFontMetrics(mi.base.font).dimension(char_);
        } else if (!slanted(char_) && mi.base.fontname == "mathnormal") {
-               ShapeChanger dummy(mi.base.font, UP_SHAPE);
+               Changer dummy = mi.base.font.changeShape(UP_SHAPE);
                dim = theFontMetrics(mi.base.font).dimension(char_);
        } else {
                frontend::FontMetrics const & fm = theFontMetrics(mi.base.font);
                dim = fm.dimension(char_);
                kerning_ = fm.rbearing(char_) - dim.wid;
        }
-       int const em = mathed_char_width(mi.base.font, 'M');
-       if (isBinaryOp(char_))
-               dim.wid += static_cast<int>(0.5*em+0.5);
+       if (isMathBin())
+               dim.wid += 2 * mathed_medmuskip(mi.base.font);
+       else if (isMathRel())
+               dim.wid += 2 * mathed_thickmuskip(mi.base.font);
+       else if (isMathPunct())
+               dim.wid += mathed_thinmuskip(mi.base.font);
        else if (char_ == '\'')
-               dim.wid += static_cast<int>(0.1667*em+0.5);
+               // FIXME: don't know where this is coming from
+               dim.wid += mathed_thinmuskip(mi.base.font);
 #else
        whichFont(font_, code_, mi);
        dim = theFontMetrics(font_).dimension(char_);
@@ -92,21 +90,22 @@ void InsetMathChar::metrics(MetricsInfo & mi, Dimension & dim) const
 
 void InsetMathChar::draw(PainterInfo & pi, int x, int y) const
 {
-       //lyxerr << "drawing '" << char_ << "' font: " << pi.base.fontname << endl;
-       int const em = mathed_char_width(pi.base.font, 'M');
-       if (isBinaryOp(char_))
-               x += static_cast<int>(0.25*em+0.5);
+       //lyxerr << "drawing '" << char_ << "' font: " << pi.base.fontname << std::endl;
+       if (isMathBin())
+               x += mathed_medmuskip(pi.base.font);
+       else if (isMathRel())
+               x += mathed_thickmuskip(pi.base.font);
        else if (char_ == '\'')
-               x += static_cast<int>(0.0833*em+0.5);
+               x += mathed_thinmuskip(pi.base.font) / 2;
 #if 1
        if (char_ == '=' && has_math_fonts) {
-               FontSetChanger dummy(pi.base, "cmr");
+               Changer dummy = pi.base.changeFontSet("cmr");
                pi.draw(x, y, char_);
        } else if ((char_ == '>' || char_ == '<') && has_math_fonts) {
-               FontSetChanger dummy(pi.base, "cmm");
+               Changer dummy = pi.base.changeFontSet("cmm");
                pi.draw(x, y, char_);
        } else if (!slanted(char_) && pi.base.fontname == "mathnormal") {
-               ShapeChanger dummy(pi.base.font, UP_SHAPE);
+               Changer dummy = pi.base.font.changeShape(UP_SHAPE);
                pi.draw(x, y, char_);
        } else {
                pi.draw(x, y, char_);
@@ -140,8 +139,8 @@ void InsetMathChar::write(WriteStream & os) const
 
 void InsetMathChar::validate(LaTeXFeatures & features) const
 {
-       if (char_ >= 0x80)
-               encodings.validate(char_, features, true);
+       if (!isASCII(char_))
+               BufferEncodings::validate(char_, features, true);
 }
 
 
@@ -172,11 +171,10 @@ void InsetMathChar::mathmlize(MathStream & ms) const
                case '<': entity = "&lt;"; break;
                case '>': entity = "&gt;"; break;
                case '&': entity = "&amp;"; break;
-               case ' ': 
-                       if (!ms.inText())
-                               break;
-                       entity = "&ThinSpace;";
-                       break;
+               case ' ': {
+                       ms << from_ascii("&nbsp;");
+                       return;
+               }
                default: break;
        }
        
@@ -187,14 +185,14 @@ void InsetMathChar::mathmlize(MathStream & ms) const
                        ms << from_ascii(entity);
                return;
        }
-       
+
        if (!entity.empty()) {
                ms << "<mo>" << from_ascii(entity) << "</mo>";
                return;
        }               
 
        char const * type = 
-               (isalpha(char_) || Encodings::isMathAlpha(char_))
+               (isAlphaASCII(char_) || Encodings::isMathAlpha(char_))
                        ? "mi" : "mo";
        // we don't use MTag and ETag because we do not want the spacing
        ms << "<" << type << ">" << char_type(char_) << "</" << type << ">";    
@@ -208,6 +206,7 @@ void InsetMathChar::htmlize(HtmlStream & ms) const
                case '<': entity = "&lt;"; break;
                case '>': entity = "&gt;"; break;
                case '&': entity = "&amp;"; break;
+               case ' ': entity = "&nbsp;"; break;
                default: break;
        }
        
@@ -222,11 +221,12 @@ void InsetMathChar::htmlize(HtmlStream & ms) const
        }
        
        if (have_entity) {
+               // an operator, so give some space
                ms << ' ' << from_ascii(entity) << ' ';
                return;
        }               
 
-       if (isalpha(char_) || Encodings::isMathAlpha(char_))
+       if (isAlphaASCII(char_) || Encodings::isMathAlpha(char_))
                // we don't use MTag and ETag because we do not want the spacing
                ms << MTag("i") << char_type(char_) << ETag("i");
        else
@@ -235,9 +235,21 @@ void InsetMathChar::htmlize(HtmlStream & ms) const
 }
 
 
-bool InsetMathChar::isRelOp() const
+bool InsetMathChar::isMathBin() const
+{
+       return support::contains("+-*", static_cast<char>(char_));
+}
+
+
+bool InsetMathChar::isMathRel() const
+{
+       return support::contains("<>=:", static_cast<char>(char_));
+}
+
+
+bool InsetMathChar::isMathPunct() const
 {
-       return char_ == '=' || char_ == '<' || char_ == '>';
+       return support::contains(",;", static_cast<char>(char_));
 }