X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathBig.cpp;h=eeaf96514bd97fdd32d6c9d79585f9fc4e294785;hb=5fdc577badb1cb133d6a0dc7d831bb1f82576adb;hp=293ff8b80db6cb3bab84342537a5f01ed7794225;hpb=04b8f5cdc4b26105ea855fb9ec5b23227dfd55cb;p=lyx.git diff --git a/src/mathed/InsetMathBig.cpp b/src/mathed/InsetMathBig.cpp index 293ff8b80d..eeaf96514b 100644 --- a/src/mathed/InsetMathBig.cpp +++ b/src/mathed/InsetMathBig.cpp @@ -12,7 +12,9 @@ #include "InsetMathBig.h" +#include "Dimension.h" #include "LaTeXFeatures.h" + #include "MathSupport.h" #include "MathStream.h" #include "MetricsInfo.h" @@ -67,6 +69,7 @@ double InsetMathBig::increase() const void InsetMathBig::metrics(MetricsInfo & mi, Dimension & dim) const { + Changer dummy = mi.base.changeEnsureMath(); double const h = theFontMetrics(mi.base.font).ascent('I'); double const f = increase(); dim.wid = 6; @@ -75,18 +78,26 @@ void InsetMathBig::metrics(MetricsInfo & mi, Dimension & dim) const } -void InsetMathBig::draw(PainterInfo & pi, int x, int y) const +docstring InsetMathBig::word() const { - Dimension const dim = dimension(*pi.base.bv); // mathed_draw_deco does not use the leading backslash, so remove it // (but don't use ltrim if this is the backslash delimiter). // Replace \| by \Vert (equivalent in LaTeX), since mathed_draw_deco // would treat it as |. - docstring const delim = (delim_ == "\\|") ? from_ascii("Vert") : - (delim_ == "\\\\") ? from_ascii("\\") : support::ltrim(delim_, "\\"); + if (delim_ == "\\|") + return from_ascii("Vert"); + if (delim_ == "\\\\") + return from_ascii("\\"); + return support::ltrim(delim_, "\\"); +} + + +void InsetMathBig::draw(PainterInfo & pi, int x, int y) const +{ + Changer dummy = pi.base.changeEnsureMath(); + Dimension const dim = dimension(*pi.base.bv); mathed_draw_deco(pi, x + 1, y - dim.ascent(), 4, dim.height(), - delim); - setPosCache(pi, x, y); + word()); } @@ -143,6 +154,7 @@ bool InsetMathBig::isBigInsetDelim(docstring const & delim) "<", ">", "\\\\", "\\backslash", "\\langle", "\\lceil", "\\lfloor", "\\rangle", "\\rceil", "\\rfloor", + "\\llbracket", "\\rrbracket", "\\downarrow", "\\Downarrow", "\\uparrow", "\\Uparrow", "\\updownarrow", "\\Updownarrow", "" @@ -153,6 +165,7 @@ bool InsetMathBig::isBigInsetDelim(docstring const & delim) void InsetMathBig::validate(LaTeXFeatures & features) const { + validate_math_word(features, word()); if (features.runparams().math_flavor == OutputParams::MathAsHTML) features.addCSSSnippet( "span.bigsymbol{font-size: 150%;}\n"