Another warning.

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

diff --git a/src/mathed/InsetMathChar.cpp b/src/mathed/InsetMathChar.cpp
index 8832a751a87e0ca43c2163a40b92f16568f57c65..532d8496fa39bde2cfeb420a2f0f69ae69b3aca4 100644 (file)
--- a/src/mathed/InsetMathChar.cpp
+++ b/src/mathed/InsetMathChar.cpp
@@ -172,12 +172,17 @@ 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;
                default: break;
        }
        
        if (ms.inText()) {
                if (entity.empty())
-                       ms << char_type(char_);
+                       ms.os().put(char_);
                else 
                        ms << from_ascii(entity);
                return;
@@ -196,6 +201,40 @@ 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;
+               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) {
+               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_ == '>';