X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FMathSupport.cpp;h=325d640915e4ea2500693451e38494d4096c2286;hb=4c093a50c2aaebad1459991b90b625a8c00a69e8;hp=42f737654d354f1a4ee2c54e2cdc504497c918c0;hpb=670efa8f646218f2a378f0cc614c4c37a9f6b89a;p=lyx.git diff --git a/src/mathed/MathSupport.cpp b/src/mathed/MathSupport.cpp index 42f737654d..325d640915 100644 --- a/src/mathed/MathSupport.cpp +++ b/src/mathed/MathSupport.cpp @@ -15,10 +15,13 @@ #include "InsetMathFont.h" #include "InsetMathSymbol.h" +#include "Length.h" #include "MathData.h" +#include "MathFactory.h" #include "MathParser.h" #include "MathStream.h" +#include "LaTeXFeatures.h" #include "MetricsInfo.h" #include "frontends/FontLoader.h" @@ -27,6 +30,7 @@ #include "support/debug.h" #include "support/docstream.h" +#include "support/lassert.h" #include "support/lyxlib.h" #include @@ -491,7 +495,7 @@ public: } }; -static init_deco_table dummy; +static init_deco_table dummy_deco_table; deco_struct const * search_deco(docstring const & name) @@ -501,7 +505,7 @@ deco_struct const * search_deco(docstring const & name) } -} // namespace anon +} // namespace int mathed_font_em(FontInfo const & font) @@ -509,6 +513,12 @@ int mathed_font_em(FontInfo const & font) return theFontMetrics(font).em(); } + +int mathed_font_x_height(FontInfo const & font) +{ + return theFontMetrics(font).ascent('x'); +} + /* The math units. Quoting TeX by Topic, p.205: * * Spacing around mathematical objects is measured in mu units. A mu @@ -527,27 +537,20 @@ int mathed_font_em(FontInfo const & font) * punctuation, and is put around inner objects, except where these * are followed by a close or preceded by an open symbol, and except * if the other object is a large operator or a binary relation. + * + * See the file MathClass.cpp for a formal implementation of the rules + * above. */ -int mathed_thinmuskip(FontInfo font) +int mathed_mu(FontInfo const & font, double mu) { - font.setFamily(SYMBOL_FAMILY); - return support::iround(3.0 / 18 * theFontMetrics(font).em()); + MetricsBase mb(nullptr, font); + return Length(mu, Length::MU).inPixels(mb); } - -int mathed_medmuskip(FontInfo font) -{ - font.setFamily(SYMBOL_FAMILY); - return support::iround(4.0 / 18 * theFontMetrics(font).em()); -} - - -int mathed_thickmuskip(FontInfo font) -{ - font.setFamily(SYMBOL_FAMILY); - return support::iround(5.0 / 18 * theFontMetrics(font).em()); -} +int mathed_thinmuskip(FontInfo const & font) { return mathed_mu(font, 3.0); } +int mathed_medmuskip(FontInfo const & font) { return mathed_mu(font, 4.0); } +int mathed_thickmuskip(FontInfo const & font) { return mathed_mu(font, 5.0); } int mathed_char_width(FontInfo const & font, char_type c) @@ -559,7 +562,7 @@ int mathed_char_width(FontInfo const & font, char_type c) int mathed_char_kerning(FontInfo const & font, char_type c) { frontend::FontMetrics const & fm = theFontMetrics(font); - return fm.rbearing(c) - fm.width(c); + return max(0, fm.rbearing(c) - fm.width(c)); } @@ -637,8 +640,8 @@ void mathed_draw_deco(PainterInfo & pi, int x, int y, int w, int h, } else { int xp[32]; int yp[32]; - int const n = int(d[i++]); - for (int j = 0; j < n; ++j) { + int const n2 = int(d[i++]); + for (int j = 0; j < n2; ++j) { double xx = d[i++]; double yy = d[i++]; // lyxerr << ' ' << xx << ' ' << yy << ' '; @@ -650,12 +653,47 @@ void mathed_draw_deco(PainterInfo & pi, int x, int y, int w, int h, yp[j] = int(y + yy + 0.5); // lyxerr << "P[" << j ' ' << xx << ' ' << yy << ' ' << x << ' ' << y << ']'; } - pi.pain.lines(xp, yp, n, pi.base.font.color()); + pi.pain.lines(xp, yp, n2, pi.base.font.color()); } } } +void mathedSymbolDim(MetricsBase & mb, Dimension & dim, latexkeys const * sym) +{ + LASSERT((bool)sym, return); + //lyxerr << "metrics: symbol: '" << sym->name + // << "' in font: '" << sym->inset + // << "' drawn as: '" << sym->draw + // << "'" << endl; + + bool const italic_upcase_greek = sym->inset == "cmr" && + sym->extra == "mathalpha" && + mb.fontname == "mathit"; + std::string const font = italic_upcase_greek ? "cmm" : sym->inset; + Changer dummy = mb.changeFontSet(font); + mathed_string_dim(mb.font, sym->draw, dim); +} + + +void mathedSymbolDraw(PainterInfo & pi, int x, int y, latexkeys const * sym) +{ + LASSERT((bool)sym, return); + //lyxerr << "drawing: symbol: '" << sym->name + // << "' in font: '" << sym->inset + // << "' drawn as: '" << sym->draw + // << "'" << endl; + + bool const italic_upcase_greek = sym->inset == "cmr" && + sym->extra == "mathalpha" && + pi.base.fontname == "mathit"; + std::string const font = italic_upcase_greek ? "cmm" : sym->inset; + + Changer dummy = pi.base.changeFontSet(font); + pi.draw(x, y, sym->draw); +} + + void metricsStrRedBlack(MetricsInfo & mi, Dimension & dim, docstring const & str) { FontInfo font = mi.base.font; @@ -708,6 +746,7 @@ FontShape const inh_shape = INHERIT_SHAPE; // does not work fontinfo fontinfos[] = { // math fonts + // Color_math determines which fonts are math (see isMathFont) {"mathnormal", ROMAN_FAMILY, MEDIUM_SERIES, ITALIC_SHAPE, Color_math}, {"mathbf", inh_family, BOLD_SERIES, @@ -919,7 +958,7 @@ bool isAlphaSymbol(MathAtom const & at) docstring asString(MathData const & ar) { odocstringstream os; - otexrowstream ots(os, false); + otexrowstream ots(os); WriteStream ws(ots); ws << ar; return os.str(); @@ -928,8 +967,13 @@ docstring asString(MathData const & ar) void asArray(docstring const & str, MathData & ar, Parse::flags pf) { + // If the QUIET flag is set, we are going to parse for either + // a paste operation or a macro definition. We try to do the + // right thing in all cases. + bool quiet = pf & Parse::QUIET; - if ((str.size() == 1 && quiet) || (!mathed_parse_cell(ar, str, pf) && quiet)) + bool macro = pf & Parse::MACRODEF; + if ((str.size() == 1 && quiet) || (!mathed_parse_cell(ar, str, pf) && quiet && !macro)) mathed_parse_cell(ar, str, pf | Parse::VERBATIM); } @@ -937,7 +981,7 @@ void asArray(docstring const & str, MathData & ar, Parse::flags pf) docstring asString(InsetMath const & inset) { odocstringstream os; - otexrowstream ots(os, false); + otexrowstream ots(os); WriteStream ws(ots); inset.write(ws); return os.str(); @@ -947,11 +991,30 @@ docstring asString(InsetMath const & inset) docstring asString(MathAtom const & at) { odocstringstream os; - otexrowstream ots(os, false); + otexrowstream ots(os); WriteStream ws(ots); at->write(ws); return os.str(); } +int axis_height(MetricsBase & mb) +{ + Changer dummy = mb.changeFontSet("mathnormal"); + return theFontMetrics(mb.font).ascent('-') - 1; +} + + +void validate_math_word(LaTeXFeatures & features, docstring const & word) +{ + MathWordList const & words = mathedWordList(); + MathWordList::const_iterator it = words.find(word); + if (it != words.end()) { + string const req = it->second.requires; + if (!req.empty()) + features.require(req); + } +} + + } // namespace lyx