#include "MetricsInfo.h"
#include "Dimension.h"
-#include "Encoding.h"
+#include "BufferEncodings.h"
#include "LaTeXFeatures.h"
#include "TextPainter.h"
dim = fm.dimension(char_);
kerning_ = fm.rbearing(char_) - dim.wid;
}
- int const em = mathed_char_width(mi.base.font, 'M');
+ int const em = mathed_font_em(mi.base.font);
if (isBinaryOp(char_))
dim.wid += static_cast<int>(0.5*em+0.5);
else if (char_ == '\'')
void InsetMathChar::draw(PainterInfo & pi, int x, int y) const
{
//lyxerr << "drawing '" << char_ << "' font: " << pi.base.fontname << endl;
- int const em = mathed_char_width(pi.base.font, 'M');
+ int const em = mathed_font_em(pi.base.font);
if (isBinaryOp(char_))
x += static_cast<int>(0.25*em+0.5);
else if (char_ == '\'')
void InsetMathChar::validate(LaTeXFeatures & features) const
{
- if (char_ >= 0x80)
- encodings.validate(char_, features, true);
+ if (!isASCII(char_))
+ BufferEncodings::validate(char_, features, true);
}
case '<': entity = "<"; break;
case '>': entity = ">"; break;
case '&': entity = "&"; break;
- case ' ':
- if (!ms.inText())
- break;
- entity = " ";
- break;
+ case ' ': {
+ ms << from_ascii(" ");
+ return;
+ }
default: break;
}
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 << ">";
case '<': entity = "<"; break;
case '>': entity = ">"; break;
case '&': entity = "&"; break;
+ case ' ': entity = " "; break;
default: break;
}
}
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