X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathBox.cpp;h=aff3fb6c634847b94e20b86f315c50985547b381;hb=02e82157ec583c3900e359de86be79fac6512387;hp=704ee5c41890bee6bfa5b4b46e76f1fa1a7409ac;hpb=b90ec7288d64bf337c5aeeecb8083e590851840e;p=lyx.git diff --git a/src/mathed/InsetMathBox.cpp b/src/mathed/InsetMathBox.cpp index 704ee5c418..aff3fb6c63 100644 --- a/src/mathed/InsetMathBox.cpp +++ b/src/mathed/InsetMathBox.cpp @@ -3,7 +3,7 @@ * This file is part of LyX, the document processor. * Licence details can be found in the file COPYING. * - * \author André Pönitz + * \author André Pönitz * \author Ling Li (InsetMathMakebox) * * Full author contact details are available in file CREDITS. @@ -19,8 +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 { @@ -30,13 +37,14 @@ namespace lyx { // ///////////////////////////////////////////////////////////////////// -InsetMathBox::InsetMathBox(docstring const & name) - : InsetMathNest(1), name_(name) +InsetMathBox::InsetMathBox(Buffer * buf, docstring const & name) + : InsetMathNest(buf, 1), name_(name) {} void InsetMathBox::write(WriteStream & os) const { + ModeSpecifier specifier(os, TEXT_MODE); os << '\\' << name_ << '{' << cell(0) << '}'; } @@ -49,33 +57,64 @@ void InsetMathBox::normalize(NormalStream & os) const } +void InsetMathBox::mathmlize(MathStream & ms) const +{ + // 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); + ms << MTag("mstyle", "class='mathbox'") + << cell(0) + << ETag("mstyle"); +} + + +void InsetMathBox::htmlize(HtmlStream & ms) const +{ + SetHTMLMode textmode(ms, true); + ms << MTag("span", "class='mathbox'") + << cell(0) + << ETag("span"); +} + + 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); + metricsMarkers(mi, 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_); } void InsetMathBox::validate(LaTeXFeatures & features) const { + // FIXME XHTML + // 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.addCSSSnippet("mstyle.mathbox { font-style: normal; }"); + else if (features.runparams().math_flavor == OutputParams::MathAsHTML) + features.addCSSSnippet("span.mathbox { font-style: normal; }"); + if (name_ == "tag" || name_ == "tag*") features.require("amsmath"); - cell(0).validate(features); + + InsetMathNest::validate(features); } @@ -87,16 +126,16 @@ void InsetMathBox::validate(LaTeXFeatures & features) const ///////////////////////////////////////////////////////////////////// -InsetMathFBox::InsetMathFBox() - : InsetMathNest(1) +InsetMathFBox::InsetMathFBox(Buffer * buf) + : InsetMathNest(buf, 1) {} void InsetMathFBox::metrics(MetricsInfo & mi, Dimension & dim) const { - FontSetChanger dummy(mi.base, "textnormal"); + Changer dummy = mi.base.changeFontSet("textnormal"); cell(0).metrics(mi, dim); - metricsMarkers(dim, 3); // 1 pixel space, 1 frame, 1 space + metricsMarkers2(mi, dim, 3); // 1 pixel space, 1 frame, 1 space } @@ -105,14 +144,14 @@ 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); } void InsetMathFBox::write(WriteStream & os) const { + ModeSpecifier specifier(os, TEXT_MODE); os << "\\fbox{" << cell(0) << '}'; } @@ -123,12 +162,48 @@ void InsetMathFBox::normalize(NormalStream & os) const } +void InsetMathFBox::mathmlize(MathStream & ms) const +{ + SetMode textmode(ms, true); + ms << MTag("mstyle", "class='fbox'") + << cell(0) + << ETag("mstyle"); +} + + +void InsetMathFBox::htmlize(HtmlStream & ms) const +{ + SetHTMLMode textmode(ms, true); + ms << MTag("span", "class='fbox'") + << cell(0) + << ETag("span"); +} + + void InsetMathFBox::infoize(odocstream & os) const { os << "FBox: "; } +void InsetMathFBox::validate(LaTeXFeatures & features) const +{ + // FIXME XHTML + // 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.addCSSSnippet( + "mstyle.fbox { border: 1px solid black; font-style: normal; padding: 0.5ex; }"); + else if (features.runparams().math_flavor == OutputParams::MathAsHTML) + features.addCSSSnippet( + "span.fbox { border: 1px solid black; font-style: normal; padding: 0.5ex; }"); + + cell(0).validate(features); + InsetMathNest::validate(features); +} + + + ///////////////////////////////////////////////////////////////////// // // InsetMathMakebox @@ -136,18 +211,18 @@ void InsetMathFBox::infoize(odocstream & os) const ///////////////////////////////////////////////////////////////////// -InsetMathMakebox::InsetMathMakebox(bool framebox) - : InsetMathNest(3), framebox_(framebox) +InsetMathMakebox::InsetMathMakebox(Buffer * buf, bool framebox) + : InsetMathNest(buf, 3), framebox_(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; @@ -170,7 +245,7 @@ void InsetMathMakebox::metrics(MetricsInfo & mi, Dimension & dim) const dim.des += 1; } - metricsMarkers(dim); + metricsMarkers(mi, dim); } @@ -178,7 +253,7 @@ 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, '['); @@ -209,10 +284,11 @@ void InsetMathMakebox::draw(PainterInfo & pi, int x, int y) const 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) << '}'; @@ -234,21 +310,56 @@ void InsetMathMakebox::infoize(odocstream & os) const } +void InsetMathMakebox::mathmlize(MathStream & ms) const +{ + // FIXME We could do something with the other arguments. + std::string const cssclass = framebox_ ? "framebox" : "makebox"; + SetMode textmode(ms, true); + ms << MTag("mstyle", "class='" + cssclass + "'") + << cell(2) + << ETag("mstyle"); +} + + +void InsetMathMakebox::htmlize(HtmlStream & ms) const +{ + // FIXME We could do something with the other arguments. + SetHTMLMode textmode(ms, true); + std::string const cssclass = framebox_ ? "framebox" : "makebox"; + ms << MTag("span", "class='" + cssclass + "'") + << cell(2) + << ETag("span"); +} + + +void InsetMathMakebox::validate(LaTeXFeatures & features) const +{ + // FIXME XHTML + // 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.addCSSSnippet("mstyle.framebox { border: 1px solid black; }"); + else if (features.runparams().math_flavor == OutputParams::MathAsHTML) + features.addCSSSnippet("span.framebox { border: 1px solid black; }"); + InsetMathNest::validate(features); +} + + ///////////////////////////////////////////////////////////////////// // // InsetMathBoxed // ///////////////////////////////////////////////////////////////////// -InsetMathBoxed::InsetMathBoxed() - : InsetMathNest(1) +InsetMathBoxed::InsetMathBoxed(Buffer * buf) + : InsetMathNest(buf, 1) {} void InsetMathBoxed::metrics(MetricsInfo & mi, Dimension & dim) const { cell(0).metrics(mi, dim); - metricsMarkers2(dim, 3); // 1 pixel space, 1 frame, 1 space + metricsMarkers2(mi, dim, 3); // 1 pixel space, 1 frame, 1 space } @@ -258,12 +369,12 @@ 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); } void InsetMathBoxed::write(WriteStream & os) const { + ModeSpecifier specifier(os, MATH_MODE); os << "\\boxed{" << cell(0) << '}'; } @@ -280,9 +391,35 @@ void InsetMathBoxed::infoize(odocstream & os) const } +void InsetMathBoxed::mathmlize(MathStream & ms) const +{ + ms << MTag("mstyle", "class='boxed'") + << cell(0) + << ETag("mstyle"); +} + + +void InsetMathBoxed::htmlize(HtmlStream & ms) const +{ + ms << MTag("span", "class='boxed'") + << cell(0) + << ETag("span"); +} + + void InsetMathBoxed::validate(LaTeXFeatures & features) const { features.require("amsmath"); + + // FIXME XHTML + // 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.addCSSSnippet("mstyle.boxed { border: 1px solid black; }"); + else if (features.runparams().math_flavor == OutputParams::MathAsHTML) + features.addCSSSnippet("span.boxed { border: 1px solid black; }"); + + InsetMathNest::validate(features); }