Small improvement for bug #7509 as suggested by JMarc

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

diff --git a/src/mathed/InsetMathChar.cpp b/src/mathed/InsetMathChar.cpp
index 4d5fc2112031dadbaa92274c6423b77d717cdd49..ae1a3b03ee3568b2287086330d10e02102c83a97 100644 (file)
--- a/src/mathed/InsetMathChar.cpp
+++ b/src/mathed/InsetMathChar.cpp
@@ -172,11 +172,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,7 +186,7 @@ void InsetMathChar::mathmlize(MathStream & ms) const
                        ms << from_ascii(entity);
                return;
        }
-       
+
        if (!entity.empty()) {
                ms << "<mo>" << from_ascii(entity) << "</mo>";
                return;
@@ -201,6 +200,42 @@ void InsetMathChar::mathmlize(MathStream & ms) const
 }
 
 
+void InsetMathChar::htmlize(HtmlStream & ms) const
+{
+       std::string entity;
+       switch (char_) {
+               case '<': entity = "&lt;"; break;
+               case '>': entity = "&gt;"; break;
+               case '&': entity = "&amp;"; break;
+               case ' ': entity = "&nbsp;"; break;
+               default: break;
+       }
+       
+       bool have_entity = !entity.empty();
+       
+       if (ms.inText()) {
+               if (have_entity)
+                       ms << from_ascii(entity);
+               else
+                       ms.os().put(char_);
+               return;
+       }
+       
+       if (have_entity) {
+               // an operator, so give some space
+               ms << ' ' << from_ascii(entity) << ' ';
+               return;
+       }               
+
+       if (isalpha(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
+               // an operator, so give some space
+               ms << " " << char_type(char_) << " ";
+}
+
+
 bool InsetMathChar::isRelOp() const
 {
        return char_ == '=' || char_ == '<' || char_ == '>';