Another warning.

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

diff --git a/src/mathed/InsetMathChar.cpp b/src/mathed/InsetMathChar.cpp
index 7949c230991a1ea4de5310d8fefeca36103984cd..532d8496fa39bde2cfeb420a2f0f69ae69b3aca4 100644 (file)
--- a/src/mathed/InsetMathChar.cpp
+++ b/src/mathed/InsetMathChar.cpp
@@ -167,13 +167,32 @@ void InsetMathChar::octave(OctaveStream & os) const
 // Worst case: We get bad spacing, or bad italics.
 void InsetMathChar::mathmlize(MathStream & ms) const
 {
+       std::string entity;
        switch (char_) {
-               case '<': ms << "<mo>&lt;</mo>"; return;
-               case '>': ms << "<mo>&gt;</mo>"; return;
-               case '&': ms << "<mo>&amp;</mo>"; return;
+               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.os().put(char_);
+               else 
+                       ms << from_ascii(entity);
+               return;
+       }
+       
+       if (!entity.empty()) {
+               ms << "<mo>" << from_ascii(entity) << "</mo>";
+               return;
+       }               
+
        char const * type = 
                (isalpha(char_) || Encodings::isMathAlpha(char_))
                        ? "mi" : "mo";
@@ -182,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_ == '>';