Introduce a return value for mathmlize(). We will need this to be able

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

diff --git a/src/mathed/InsetMathChar.cpp b/src/mathed/InsetMathChar.cpp
index a4640f2d159416572d37994cc2c6f5141e453171..27093e8504ca1ed241d1602f1f5f5c32ecb94ac9 100644 (file)
--- a/src/mathed/InsetMathChar.cpp
+++ b/src/mathed/InsetMathChar.cpp
@@ -4,7 +4,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Alejandro Aguilar Sierra
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -159,14 +159,27 @@ void InsetMathChar::octave(OctaveStream & os) const
 }
 
 
-void InsetMathChar::mathmlize(MathStream & ms) const
+// We have a bit of a problem here. MathML wants to know whether the
+// character represents an "identifier" or an "operator", and we have
+// no general way of telling. So we shall guess: If it's alpha or 
+// mathalpha, then we'll treat it as an identifier, otherwise as an 
+// operator.
+// Worst case: We get bad spacing, or bad italics.
+docstring InsetMathChar::mathmlize(MathStream & ms) const
 {
        switch (char_) {
-               case '<': ms << "&lt;"; break;
-               case '>': ms << "&gt;"; break;
-               case '&': ms << "&amp;"; break;
-               default: ms.os().put(char_); break;
+               case '<': ms << "<mo>&lt;</mo>"; return docstring();
+               case '>': ms << "<mo>&gt;</mo>"; return docstring();
+               case '&': ms << "<mo>&amp;</mo>"; return docstring();
+               default: break;
        }
+       
+       char const * type = 
+               (isalpha(char_) || Encodings::isMathAlpha(char_))       
+                       ? "mi" : "mo";
+       // we don't use MTag and ETag because we do not want the spacing
+       ms << "<" << type << ">" << char(char_) << "</" << type << ">"; 
+       return docstring();
 }