#include "frontends/FontMetrics.h"
#include "support/debug.h"
-#include "support/lstrings.h"
#include "support/textutils.h"
+#include <algorithm>
+
+using namespace std;
-namespace lyx {
-extern bool has_math_fonts;
+namespace lyx {
namespace {
void InsetMathChar::metrics(MetricsInfo & mi, Dimension & dim) const
{
- bool const mathfont = isMathFont(mi.base.fontname);
- if (mathfont && subst_) {
+ string const & f = mi.base.fontname;
+ if (isMathFont(f) && subst_) {
// If the char has a substitute, draw the replacement symbol
// instead, but only in math mode.
- mathedSymbolDim(mi.base, dim, subst_);
- kerning_ = mathed_char_kerning(mi.base.font, *subst_->draw.rbegin());
- return;
- } else if (!slanted(char_) && mi.base.fontname == "mathnormal") {
+ kerning_ = mathedSymbolDim(mi.base, dim, subst_);
+ } else if (!slanted(char_) && f == "mathnormal") {
Changer dummy = mi.base.font.changeShape(UP_SHAPE);
dim = theFontMetrics(mi.base.font).dimension(char_);
+ kerning_ = 0;
+ } else if (!isASCII(char_) && Encodings::unicodeCharInfo(char_).isUnicodeSymbol()) {
+ Changer dummy1 = mi.base.changeFontSet("mathnormal");
+ Changer dummy2 = Encodings::isMathAlpha(char_)
+ ? noChange()
+ : mi.base.font.changeShape(UP_SHAPE);
+ dim = theFontMetrics(mi.base.font).dimension(char_);
+ kerning_ = -mathed_char_kerning(mi.base.font, char_);
} else {
frontend::FontMetrics const & fm = theFontMetrics(mi.base.font);
dim = fm.dimension(char_);
- kerning_ = fm.rbearing(char_) - dim.wid;
+ kerning_ = mathed_char_kerning(mi.base.font, char_);
+ // cmmi has almost no left bearing: simulate this
+ if (f == "mathnormal") {
+ dim.wid += max(-fm.lbearing(char_), 0);
+ }
+ // Rule 17 from Appendix G
+ // These are the fonts with fontdimen(2)==0.
+ // To properly handle the case fontdimen(2)!=0 (that is for all other
+ // math fonts), where the italic correction must also be converted into
+ // kerning but only at the end of strings of characters with the same
+ // font, one would need a more elaborate implementation in MathRow. For
+ // now the case fontdimen(2)==0 is the most important.
+ if (f == "mathnormal" || f == "mathscr" || f == "mathcal") {
+ dim.wid += kerning_;
+ // We use a negative value to tell InsetMathScript to move the
+ // subscript leftwards instead of the superscript rightwards
+ kerning_ = -kerning_;
+ }
}
}
Changer dummy = pi.base.font.changeShape(UP_SHAPE);
pi.draw(x, y, char_);
return;
+ } else if (!isASCII(char_) && Encodings::unicodeCharInfo(char_).isUnicodeSymbol()) {
+ Changer dummy1 = pi.base.changeFontSet("mathnormal");
+ Changer dummy2 = Encodings::isMathAlpha(char_)
+ ? noChange()
+ : pi.base.font.changeShape(UP_SHAPE);
+ pi.draw(x, y, char_);
+ return;
}
}
+ // cmmi has almost no left bearing: simulate this
+ if (pi.base.fontname == "mathnormal") {
+ x += max(-theFontMetrics(pi.base.font).lbearing(char_), 0);
+ }
pi.draw(x, y, char_);
}
}
-void InsetMathChar::write(WriteStream & os) const
+void InsetMathChar::write(TeXMathStream & os) const
{
+ if (os.latex() && os.pendingSpace()) {
+ if (isAlphaASCII(char_))
+ os.os() << ' ';
+ os.pendingSpace(false);
+ }
os.os().put(char_);
}
// 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
+// 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
+// In any case, never let MathML stretch a single character when it
+// is recognised as an operator, to match TeX' behaviour.
+void InsetMathChar::mathmlize(MathMLStream & ms) const
{
std::string entity;
switch (char_) {
case '>': entity = ">"; break;
case '&': entity = "&"; break;
case ' ': {
- ms << from_ascii(" ");
+ ms << from_ascii(" ");
return;
}
default: break;
}
-
+
if (ms.inText()) {
if (entity.empty())
ms.os().put(char_);
- else
+ else
ms << from_ascii(entity);
return;
}
if (!entity.empty()) {
- ms << "<mo>" << from_ascii(entity) << "</mo>";
+ ms << MTagInline("mo", "stretchy='false'")
+ << from_ascii(entity)
+ << ETagInline("mo");
return;
- }
+ }
- char const * type =
+ 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 << ">";
+ ms << MTagInline(type, std::string(type) == "mo" ? "stretchy='false'" : "")
+ << char_type(char_)
+ << ETagInline(type);
}
case '<': entity = "<"; break;
case '>': entity = ">"; break;
case '&': entity = "&"; break;
- case ' ': entity = " "; break;
+ case ' ': entity = " "; break;
default: break;
}
-
+
bool have_entity = !entity.empty();
-
+
if (ms.inText()) {
if (have_entity)
ms << from_ascii(entity);
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
MathClass InsetMathChar::mathClass() const
{
// this information comes from fontmath.ltx in LaTeX source.
- char const ch = static_cast<char>(char_);
if (subst_)
return string_to_class(subst_->extra);
- else if (support::contains(",;", ch))
+
+ if (!isASCII(char_))
+ return MC_ORD;
+
+ switch (static_cast<char>(char_)) {
+ case ',':
+ case ';':
return MC_PUNCT;
- else if (support::contains("([", ch))
+ case '(':
+ case '[':
return MC_OPEN;
- else if (support::contains(")]!?", ch))
+ case ')':
+ case ']':
+ case '!':
+ case '?':
return MC_CLOSE;
- else return MC_ORD;
+ default:
+ return MC_ORD;
+ }
}
projects / lyx.git / blobdiff