* zh_TW.po: Update from Mingyi Wu

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

diff --git a/src/mathed/InsetMathChar.cpp b/src/mathed/InsetMathChar.cpp
index 532d8496fa39bde2cfeb420a2f0f69ae69b3aca4..03bda07cf60475c4ebaae4584ea401c613fccc12 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"
 
@@ -140,8 +140,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 +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,14 +186,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 +207,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 +222,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