X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FMathSupport.cpp;h=222807bba4a40b303d92492a913af6f68932e5df;hb=02e82157ec583c3900e359de86be79fac6512387;hp=82de873e24934300898050cf75d95a0f12f1130d;hpb=63772964923f765e4ab975946215725086a9c838;p=lyx.git diff --git a/src/mathed/MathSupport.cpp b/src/mathed/MathSupport.cpp index 82de873e24..222807bba4 100644 --- a/src/mathed/MathSupport.cpp +++ b/src/mathed/MathSupport.cpp @@ -13,19 +13,26 @@ #include "MathSupport.h" -#include "InsetMath.h" +#include "InsetMathFont.h" +#include "InsetMathSymbol.h" +#include "Length.h" #include "MathData.h" #include "MathParser.h" #include "MathStream.h" +#include "MetricsInfo.h" + #include "frontends/FontLoader.h" #include "frontends/FontMetrics.h" #include "frontends/Painter.h" #include "support/debug.h" #include "support/docstream.h" +#include "support/lassert.h" +#include "support/lyxlib.h" #include +#include using namespace std; @@ -111,6 +118,95 @@ double const brace[] = { }; +double const mapsto[] = { + 2, 3, + 0.75, 0.015, 0.95, 0.5, 0.75, 0.985, + 1, 0.015, 0.475, 0.945, 0.475, + 1, 0.015, 0.015, 0.015, 0.985, + 0 +}; + + +double const lhook[] = { + 2, 3, + 0.25, 0.015, 0.05, 0.5, 0.25, 0.985, + 1, 0.015, 0.475, 0.7, 0.475, + 2, 5, + 0.7, 0.015, 0.825, 0.15, 0.985, 0.25, + 0.825, 0.35, 0.7, 0.475, + 0 +}; + + +double const rhook[] = { + 2, 3, + 0.75, 0.015, 0.95, 0.5, 0.75, 0.985, + 1, 0.3, 0.475, 0.985, 0.475, + 2, 5, + 0.3, 0.015, 0.175, 0.15, 0.05, 0.25, + 0.175, 0.35, 0.3, 0.475, + 0 +}; + + +double const LRArrow[] = { + 2, 3, + 0.25, 0.015, 0.05, 0.5, 0.25, 0.985, + 2, 3, + 0.75, 0.015, 0.95, 0.5, 0.75, 0.985, + 1, 0.2, 0.8, 0.8, 0.8, + 1, 0.2, 0.2, 0.8, 0.2, + 0 +}; + + +double const LArrow[] = { + 2, 3, + 0.25, 0.015, 0.05, 0.5, 0.25, 0.985, + 1, 0.2, 0.8, 0.985, 0.8, + 1, 0.2, 0.2, 0.985, 0.2, + 0 +}; + + +double const lharpoondown[] = { + 2, 2, + 0.015, 0.5, 0.25, 0.985, + 1, 0.02, 0.475, 0.985, 0.475, + 0 +}; + + +double const lharpoonup[] = { + 2, 2, + 0.25, 0.015, 0.015, 0.5, + 1, 0.02, 0.525, 0.985, 0.525, + 0 +}; + + +double const lrharpoons[] = { + 2, 2, + 0.25, 0.015, 0.015, 0.225, + 1, 0.02, 0.23, 0.985, 0.23, + 2, 2, + 0.75, 0.985, 0.985, 0.775, + 1, 0.02, 0.7, 0.980, 0.7, + 0 +}; + + +double const rlharpoons[] = { + 2, 2, + 0.75, 0.015, 0.985, 0.225, + 1, 0.02, 0.23, 0.985, 0.23, + 2, 2, + 0.25, 0.985, 0.015, 0.775, + 1, 0.02, 0.7, 0.980, 0.7, + 0 +}; + + double const arrow[] = { 4, 7, 0.0150, 0.7500, 0.2000, 0.6000, 0.3500, 0.3500, @@ -137,7 +233,7 @@ double const udarrow[] = { 0.015, 0.25, 0.5, 0.05, 0.95, 0.25, 2, 3, 0.015, 0.75, 0.5, 0.95, 0.95, 0.75, - 1, 0.5, 0.2, 0.5, 0.8, + 1, 0.5, 0.1, 0.5, 0.9, 0 }; @@ -160,6 +256,15 @@ double const brack[] = { }; +double const dbrack[] = { + 2, 4, + 0.95, 0.05, 0.05, 0.05, 0.05, 0.95, 0.95, 0.95, + 2, 2, + 0.50, 0.05, 0.50, 0.95, + 0 +}; + + double const corner[] = { 2, 3, 0.95, 0.05, 0.05, 0.05, 0.05, 0.95, @@ -272,23 +377,36 @@ struct named_deco_struct { named_deco_struct deco_table[] = { // Decorations - {"widehat", angle, 3 }, - {"widetilde", tilde, 0 }, - {"underbar", hline, 0 }, - {"underline", hline, 0 }, - {"overline", hline, 0 }, - {"underbrace", brace, 1 }, - {"overbrace", brace, 3 }, - {"overleftarrow", arrow, 1 }, - {"overrightarrow", arrow, 3 }, - {"overleftrightarrow", udarrow, 1 }, - {"xleftarrow", arrow, 1 }, - {"xrightarrow", arrow, 3 }, - {"underleftarrow", arrow, 1 }, - {"underrightarrow", arrow, 3 }, - {"underleftrightarrow", udarrow, 1 }, - {"undertilde", tilde, 0 }, - {"utilde", tilde, 0 }, + {"widehat", angle, 3 }, + {"widetilde", tilde, 0 }, + {"underbar", hline, 0 }, + {"underline", hline, 0 }, + {"overline", hline, 0 }, + {"underbrace", brace, 1 }, + {"overbrace", brace, 3 }, + {"overleftarrow", arrow, 1 }, + {"overrightarrow", arrow, 3 }, + {"overleftrightarrow", udarrow, 1 }, + {"xhookleftarrow", lhook, 0 }, + {"xhookrightarrow", rhook, 0 }, + {"xleftarrow", arrow, 1 }, + {"xLeftarrow", LArrow, 0 }, + {"xleftharpoondown", lharpoondown, 0 }, + {"xleftharpoonup", lharpoonup, 0 }, + {"xleftrightharpoons", lrharpoons, 0 }, + {"xleftrightarrow", udarrow, 1 }, + {"xLeftrightarrow", LRArrow, 0 }, + {"xmapsto", mapsto, 0 }, + {"xrightarrow", arrow, 3 }, + {"xRightarrow", LArrow, 2 }, + {"xrightharpoondown", lharpoonup, 2 }, + {"xrightharpoonup", lharpoondown, 2 }, + {"xrightleftharpoons", rlharpoons, 0 }, + {"underleftarrow", arrow, 1 }, + {"underrightarrow", arrow, 3 }, + {"underleftrightarrow", udarrow, 1 }, + {"undertilde", tilde, 0 }, + {"utilde", tilde, 0 }, // Delimiters {"(", parenth, 0 }, @@ -299,11 +417,17 @@ named_deco_struct deco_table[] = { {"rbrace", brace, 2 }, {"[", brack, 0 }, {"]", brack, 2 }, + {"llbracket", dbrack, 0 }, + {"rrbracket", dbrack, 2 }, {"|", vert, 0 }, {"/", slash, 0 }, {"slash", slash, 0 }, {"vert", vert, 0 }, + {"lvert", vert, 0 }, + {"rvert", vert, 0 }, {"Vert", Vert, 0 }, + {"lVert", Vert, 0 }, + {"rVert", Vert, 0 }, {"'", slash, 1 }, {"<", angle, 0 }, {">", angle, 2 }, @@ -382,6 +506,45 @@ deco_struct const * search_deco(docstring const & name) } // namespace anon +int mathed_font_em(FontInfo const & font) +{ + return theFontMetrics(font).em(); +} + +/* The math units. Quoting TeX by Topic, p.205: + * + * Spacing around mathematical objects is measured in mu units. A mu + * is 1/18th part of \fontdimen6 of the font in family 2 in the + * current style, the ‘quad’ value of the symbol font. + * + * A \thickmuskip (default value in plain TeX: 5mu plus 5mu) is + * inserted around (binary) relations, except where these are preceded + * or followed by other relations or punctuation, and except if they + * follow an open, or precede a close symbol. + * + * A \medmuskip (default value in plain TeX: 4mu plus 2mu minus 4mu) + * is put around binary operators. + * + * A \thinmuskip (default value in plain TeX: 3mu) follows after + * 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_mu(FontInfo const & font, double mu) +{ + MetricsBase mb(nullptr, font); + return Length(mu, Length::MU).inPixels(mb); +} + +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) { return theFontMetrics(font).width(c); @@ -488,10 +651,45 @@ void mathed_draw_deco(PainterInfo & pi, int x, int y, int w, int h, } +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; - augmentFont(font, from_ascii("mathnormal")); + augmentFont(font, "mathnormal"); mathed_string_dim(font, str, dim); } @@ -499,7 +697,7 @@ void metricsStrRedBlack(MetricsInfo & mi, Dimension & dim, docstring const & str void drawStrRed(PainterInfo & pi, int x, int y, docstring const & str) { FontInfo f = pi.base.font; - augmentFont(f, from_ascii("mathnormal")); + augmentFont(f, "mathnormal"); f.setColor(Color_latex); pi.pain.text(x, y, str, f); } @@ -508,7 +706,7 @@ void drawStrRed(PainterInfo & pi, int x, int y, docstring const & str) void drawStrBlack(PainterInfo & pi, int x, int y, docstring const & str) { FontInfo f = pi.base.font; - augmentFont(f, from_ascii("mathnormal")); + augmentFont(f, "mathnormal"); f.setColor(Color_foreground); pi.pain.text(x, y, str, f); } @@ -540,6 +738,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, @@ -559,7 +758,7 @@ fontinfo fontinfos[] = { {"mathit", inh_family, inh_series, ITALIC_SHAPE, Color_math}, {"mathscr", RSFS_FAMILY, inh_series, - inh_shape, Color_math}, + inh_shape, Color_math}, {"cmex", CMEX_FAMILY, inh_series, inh_shape, Color_math}, {"cmm", CMM_FAMILY, inh_series, @@ -574,6 +773,8 @@ fontinfo fontinfos[] = { inh_shape, Color_math}, {"msb", MSB_FAMILY, inh_series, inh_shape, Color_math}, + {"stmry", STMARY_FAMILY, inh_series, + inh_shape, Color_math}, {"wasy", WASY_FAMILY, inh_series, inh_shape, Color_math}, {"esint", ESINT_FAMILY, inh_series, @@ -616,6 +817,9 @@ fontinfo fontinfos[] = { // LyX internal usage {"lyxtex", inh_family, inh_series, UP_SHAPE, Color_latex}, + // FIXME: The following two don't work on OS X, since the Symbol font + // uses a different encoding, and is therefore disabled in + // FontLoader::available(). {"lyxsymbol", SYMBOL_FAMILY, inh_series, inh_shape, Color_math}, {"lyxboldsymbol", SYMBOL_FAMILY, BOLD_SERIES, @@ -633,11 +837,10 @@ fontinfo fontinfos[] = { }; -fontinfo * lookupFont(docstring const & name0) +fontinfo * lookupFont(string const & name) { //lyxerr << "searching font '" << name << "'" << endl; int const n = sizeof(fontinfos) / sizeof(fontinfo); - string name = to_utf8(name0); for (int i = 0; i < n; ++i) if (fontinfos[i].cmd_ == name) { //lyxerr << "found '" << i << "'" << endl; @@ -647,7 +850,7 @@ fontinfo * lookupFont(docstring const & name0) } -fontinfo * searchFont(docstring const & name) +fontinfo * searchFont(string const & name) { fontinfo * f = lookupFont(name); return f ? f : fontinfos; @@ -656,27 +859,27 @@ fontinfo * searchFont(docstring const & name) } -bool isFontName(docstring const & name) +bool isFontName(string const & name) { return lookupFont(name); } -bool isMathFont(docstring const & name) +bool isMathFont(string const & name) { fontinfo * f = lookupFont(name); return f && f->color_ == Color_math; } -bool isTextFont(docstring const & name) +bool isTextFont(string const & name) { fontinfo * f = lookupFont(name); return f && f->color_ == Color_foreground; } -FontInfo getFont(docstring const & name) +FontInfo getFont(string const & name) { FontInfo font; augmentFont(font, name); @@ -684,7 +887,7 @@ FontInfo getFont(docstring const & name) } -void fakeFont(docstring const & orig, docstring const & fake) +void fakeFont(string const & orig, string const & fake) { fontinfo * forig = searchFont(orig); fontinfo * ffake = searchFont(fake); @@ -694,22 +897,22 @@ void fakeFont(docstring const & orig, docstring const & fake) forig->shape_ = ffake->shape_; forig->color_ = ffake->color_; } else { - lyxerr << "Can't fake font '" << to_utf8(orig) << "' with '" - << to_utf8(fake) << "'" << endl; + lyxerr << "Can't fake font '" << orig << "' with '" + << fake << "'" << endl; } } -void augmentFont(FontInfo & font, docstring const & name) +void augmentFont(FontInfo & font, string const & name) { static bool initialized = false; if (!initialized) { initialized = true; // fake fonts if necessary - if (!theFontLoader().available(getFont(from_ascii("mathfrak")))) - fakeFont(from_ascii("mathfrak"), from_ascii("lyxfakefrak")); - if (!theFontLoader().available(getFont(from_ascii("mathcal")))) - fakeFont(from_ascii("mathcal"), from_ascii("lyxfakecal")); + if (!theFontLoader().available(getFont("mathfrak"))) + fakeFont("mathfrak", "lyxfakefrak"); + if (!theFontLoader().available(getFont("mathcal"))) + fakeFont("mathcal", "lyxfakecal"); } fontinfo * info = searchFont(name); if (info->family_ != inh_family) @@ -723,10 +926,32 @@ void augmentFont(FontInfo & font, docstring const & name) } +bool isAlphaSymbol(MathAtom const & at) +{ + if (at->asCharInset() || + (at->asSymbolInset() && + at->asSymbolInset()->isOrdAlpha())) + return true; + + if (at->asFontInset()) { + MathData const & ar = at->asFontInset()->cell(0); + for (size_t i = 0; i < ar.size(); ++i) { + if (!(ar[i]->asCharInset() || + (ar[i]->asSymbolInset() && + ar[i]->asSymbolInset()->isOrdAlpha()))) + return false; + } + return true; + } + return false; +} + + docstring asString(MathData const & ar) { odocstringstream os; - WriteStream ws(os); + otexrowstream ots(os); + WriteStream ws(ots); ws << ar; return os.str(); } @@ -743,7 +968,8 @@ void asArray(docstring const & str, MathData & ar, Parse::flags pf) docstring asString(InsetMath const & inset) { odocstringstream os; - WriteStream ws(os); + otexrowstream ots(os); + WriteStream ws(ots); inset.write(ws); return os.str(); } @@ -752,7 +978,8 @@ docstring asString(InsetMath const & inset) docstring asString(MathAtom const & at) { odocstringstream os; - WriteStream ws(os); + otexrowstream ots(os); + WriteStream ws(ots); at->write(ws); return os.str(); }