X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathChar.cpp;h=03bda07cf60475c4ebaae4584ea401c613fccc12;hb=6de3c19fd63f810eed90ef3bc4469faf28e949c2;hp=8166b53d5286d9867f3343530365b161034a95ca;hpb=f1cba8ff64b369792fd49f5ddf90e8126ab476ac;p=lyx.git

diff --git a/src/mathed/InsetMathChar.cpp b/src/mathed/InsetMathChar.cpp
index 8166b53d52..03bda07cf6 100644
--- 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);
 }
 
 
@@ -159,14 +159,80 @@ void InsetMathChar::octave(OctaveStream & os) 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.
 void InsetMathChar::mathmlize(MathStream & ms) const
 {
+	std::string entity;
 	switch (char_) {
-		case '<': ms << "&lt;"; break;
-		case '>': ms << "&gt;"; break;
-		case '&': ms << "&amp;"; break;
-		default: ms.os().put(char_); break;
+		case '<': entity = "&lt;"; break;
+		case '>': entity = "&gt;"; break;
+		case '&': entity = "&amp;"; break;
+		case ' ': {
+			ms << from_ascii("&nbsp;");
+			return;
+		}
+		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 = 
+		(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 << ">";	
+}
+
+
+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 (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
+		// an operator, so give some space
+		ms << " " << char_type(char_) << " ";
 }