X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathBox.cpp;h=c0df607789ede1ddb977643bfeb7d575dc4e91e3;hb=21c92c8a129b5f3ff56de33bf2941a25967cffbb;hp=90a0749ca7c75c6f6d62a9ddf68ea03127167eca;hpb=dfc2a2792e870509c2f15a57597c6c767628a0cf;p=lyx.git diff --git a/src/mathed/InsetMathBox.cpp b/src/mathed/InsetMathBox.cpp index 90a0749ca7..c0df607789 100644 --- a/src/mathed/InsetMathBox.cpp +++ b/src/mathed/InsetMathBox.cpp @@ -19,10 +19,15 @@ #include "MathSupport.h" #include "MetricsInfo.h" +#include "support/gettext.h" +#include "support/lstrings.h" + #include "frontends/Painter.h" +#include #include +using namespace lyx::support; namespace lyx { @@ -54,7 +59,8 @@ void InsetMathBox::normalize(NormalStream & os) const void InsetMathBox::mathmlize(MathStream & ms) const { - // FIXME Need to do something special for tags here. + // FIXME XHTML + // Need to do something special for tags here. // Probably will have to involve deferring them, which // means returning something from this routine. SetMode textmode(ms, true); @@ -75,23 +81,21 @@ void InsetMathBox::htmlize(HtmlStream & ms) const void InsetMathBox::metrics(MetricsInfo & mi, Dimension & dim) const { - FontSetChanger dummy(mi.base, "textnormal"); + Changer dummy = mi.base.changeFontSet("textnormal"); cell(0).metrics(mi, dim); - metricsMarkers(dim); } void InsetMathBox::draw(PainterInfo & pi, int x, int y) const { - FontSetChanger dummy(pi.base, "textnormal"); + Changer dummy = pi.base.changeFontSet("textnormal"); cell(0).draw(pi, x, y); - drawMarkers(pi, x, y); } void InsetMathBox::infoize(odocstream & os) const -{ - os << "Box: " << name_; +{ + os << bformat(_("Box: %1$s"), name_); } @@ -101,13 +105,9 @@ void InsetMathBox::validate(LaTeXFeatures & features) const // It'd be better to be able to get this from an InsetLayout, but at present // InsetLayouts do not seem really to work for things that aren't InsetTexts. if (features.runparams().math_flavor == OutputParams::MathAsMathML) - features.addPreambleSnippet(""); + features.addCSSSnippet("mstyle.mathbox { font-style: normal; }"); else if (features.runparams().math_flavor == OutputParams::MathAsHTML) - features.addPreambleSnippet(""); + features.addCSSSnippet("span.mathbox { font-style: normal; }"); if (name_ == "tag" || name_ == "tag*") features.require("amsmath"); @@ -131,9 +131,12 @@ InsetMathFBox::InsetMathFBox(Buffer * buf) void InsetMathFBox::metrics(MetricsInfo & mi, Dimension & dim) const { - FontSetChanger dummy(mi.base, "textnormal"); + Changer dummy = mi.base.changeFontSet("textnormal"); cell(0).metrics(mi, dim); - metricsMarkers2(dim, 3); // 1 pixel space, 1 frame, 1 space + // 1 pixel space, 1 frame, 1 space + dim.wid += 2 * 3; + dim.asc += 3; + dim.des += 3; } @@ -142,9 +145,8 @@ void InsetMathFBox::draw(PainterInfo & pi, int x, int y) const Dimension const dim = dimension(*pi.base.bv); pi.pain.rectangle(x + 1, y - dim.ascent() + 1, dim.width() - 2, dim.height() - 2, Color_foreground); - FontSetChanger dummy(pi.base, "textnormal"); + Changer dummy = pi.base.changeFontSet("textnormal"); cell(0).draw(pi, x + 3, y); - setPosCache(pi, x, y); } @@ -162,7 +164,7 @@ void InsetMathFBox::normalize(NormalStream & os) const void InsetMathFBox::mathmlize(MathStream & ms) const -{ +{ SetMode textmode(ms, true); ms << MTag("mstyle", "class='fbox'") << cell(0) @@ -191,13 +193,11 @@ void InsetMathFBox::validate(LaTeXFeatures & features) const // It'd be better to be able to get this from an InsetLayout, but at present // InsetLayouts do not seem really to work for things that aren't InsetTexts. if (features.runparams().math_flavor == OutputParams::MathAsMathML) - features.addPreambleSnippet(""); + features.addCSSSnippet( + "mstyle.fbox { border: 1px solid black; font-style: normal; padding: 0.5ex; }"); else if (features.runparams().math_flavor == OutputParams::MathAsHTML) - features.addPreambleSnippet(""); + features.addCSSSnippet( + "span.fbox { border: 1px solid black; font-style: normal; padding: 0.5ex; }"); cell(0).validate(features); InsetMathNest::validate(features); @@ -219,24 +219,24 @@ InsetMathMakebox::InsetMathMakebox(Buffer * buf, bool framebox) void InsetMathMakebox::metrics(MetricsInfo & mi, Dimension & dim) const { - FontSetChanger dummy(mi.base, "textnormal"); - + Changer dummy = mi.base.changeFontSet("textnormal"); + Dimension wdim; static docstring bracket = from_ascii("["); - mathed_string_dim(mi.base.font, bracket, wdim); + metricsStrRedBlack(mi, wdim, bracket); int w = wdim.wid; - + Dimension dim0; Dimension dim1; Dimension dim2; cell(0).metrics(mi, dim0); cell(1).metrics(mi, dim1); cell(2).metrics(mi, dim2); - + dim.wid = w + dim0.wid + w + w + dim1.wid + w + 2 + dim2.wid; - dim.asc = std::max(std::max(wdim.asc, dim0.asc), std::max(dim1.asc, dim2.asc)); + dim.asc = std::max(std::max(wdim.asc, dim0.asc), std::max(dim1.asc, dim2.asc)); dim.des = std::max(std::max(wdim.des, dim0.des), std::max(dim1.des, dim2.des)); - + if (framebox_) { dim.wid += 4; dim.asc += 3; @@ -245,26 +245,22 @@ void InsetMathMakebox::metrics(MetricsInfo & mi, Dimension & dim) const dim.asc += 1; dim.des += 1; } - - metricsMarkers(dim); } void InsetMathMakebox::draw(PainterInfo & pi, int x, int y) const { - drawMarkers(pi, x, y); - - FontSetChanger dummy(pi.base, "textnormal"); + Changer dummy = pi.base.changeFontSet("textnormal"); BufferView const & bv = *pi.base.bv; int w = mathed_char_width(pi.base.font, '['); - + if (framebox_) { Dimension const dim = dimension(*pi.base.bv); pi.pain.rectangle(x + 1, y - dim.ascent() + 1, dim.width() - 2, dim.height() - 2, Color_foreground); x += 2; } - + drawStrBlack(pi, x, y, from_ascii("[")); x += w; cell(0).draw(pi, x, y); @@ -287,9 +283,9 @@ void InsetMathMakebox::write(WriteStream & os) const { ModeSpecifier specifier(os, TEXT_MODE); os << (framebox_ ? "\\framebox" : "\\makebox"); - if (cell(0).size() || !os.latex()) { + if (!cell(0).empty() || !os.latex()) { os << '[' << cell(0) << ']'; - if (cell(1).size() || !os.latex()) + if (!cell(1).empty() || !os.latex()) os << '[' << cell(1) << ']'; } os << '{' << cell(2) << '}'; @@ -305,7 +301,7 @@ void InsetMathMakebox::normalize(NormalStream & os) const void InsetMathMakebox::infoize(odocstream & os) const { - os << (framebox_ ? "Framebox" : "Makebox") + os << (framebox_ ? "Framebox" : "Makebox") << " (width: " << cell(0) << " pos: " << cell(1) << ")"; } @@ -339,13 +335,9 @@ void InsetMathMakebox::validate(LaTeXFeatures & features) const // It'd be better to be able to get this from an InsetLayout, but at present // InsetLayouts do not seem really to work for things that aren't InsetTexts. if (features.runparams().math_flavor == OutputParams::MathAsMathML) - features.addPreambleSnippet(""); + features.addCSSSnippet("mstyle.framebox { border: 1px solid black; }"); else if (features.runparams().math_flavor == OutputParams::MathAsHTML) - features.addPreambleSnippet(""); + features.addCSSSnippet("span.framebox { border: 1px solid black; }"); InsetMathNest::validate(features); } @@ -364,7 +356,10 @@ InsetMathBoxed::InsetMathBoxed(Buffer * buf) void InsetMathBoxed::metrics(MetricsInfo & mi, Dimension & dim) const { cell(0).metrics(mi, dim); - metricsMarkers2(dim, 3); // 1 pixel space, 1 frame, 1 space + // 1 pixel space, 1 frame, 1 space + dim.wid += 2 * 3; + dim.asc += 3; + dim.des += 3; } @@ -374,7 +369,6 @@ void InsetMathBoxed::draw(PainterInfo & pi, int x, int y) const pi.pain.rectangle(x + 1, y - dim.ascent() + 1, dim.width() - 2, dim.height() - 2, Color_foreground); cell(0).draw(pi, x + 3, y); - setPosCache(pi, x, y); } @@ -421,14 +415,10 @@ void InsetMathBoxed::validate(LaTeXFeatures & features) const // It'd be better to be able to get this from an InsetLayout, but at present // InsetLayouts do not seem really to work for things that aren't InsetTexts. if (features.runparams().math_flavor == OutputParams::MathAsMathML) - features.addPreambleSnippet(""); + features.addCSSSnippet("mstyle.boxed { border: 1px solid black; }"); else if (features.runparams().math_flavor == OutputParams::MathAsHTML) - features.addPreambleSnippet(""); - + features.addCSSSnippet("span.boxed { border: 1px solid black; }"); + InsetMathNest::validate(features); }