#include "MathSupport.h"
#include "MetricsInfo.h"
+#include "support/gettext.h"
+#include "support/lstrings.h"
+
#include "frontends/Painter.h"
+#include <algorithm>
#include <ostream>
+using namespace lyx::support;
namespace lyx {
void InsetMathBox::mathmlize(MathStream & ms) const
-{
- SetMode textmode(ms, true, from_ascii("class='mathbox'"));
- ms << cell(0);
+{
+ // 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 << cell(0);
+ 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);
}
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
+ metricsMarkers2(mi, dim, 3); // 1 pixel space, 1 frame, 1 space
}
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::mathmlize(MathStream & ms) const
{
- SetMode textmode(ms, true, from_ascii("class='fbox'"));
- ms << cell(0);
+ SetMode textmode(ms, true);
+ ms << MTag("mstyle", "class='fbox'")
+ << cell(0)
+ << ETag("mstyle");
}
void InsetMathFBox::htmlize(HtmlStream & ms) const
{
- SetHTMLMode textmode(ms, true, "class='fbox'");
- ms << cell(0);
+ SetHTMLMode textmode(ms, true);
+ ms << MTag("span", "class='fbox'")
+ << cell(0)
+ << ETag("span");
}
// 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().flavor == OutputParams::HTML)
- features.addPreambleSnippet("<style type=\"text/css\">\n"
- "mtext.fbox { border: 1px solid black; }\n"
- "span.fbox { border: 1px solid black; }\n"
- "</style>");
+ 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);
}
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;
dim.des += 1;
}
- metricsMarkers(dim);
+ metricsMarkers(mi, dim);
}
{
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, '[');
{
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) << '}';
{
// FIXME We could do something with the other arguments.
std::string const cssclass = framebox_ ? "framebox" : "makebox";
- SetMode textmode(ms, true, from_ascii("class='" + cssclass + "'"));
- ms << cell(2);
+ 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";
- SetHTMLMode textmode(ms, true, "class='" + cssclass + "'");
- ms << cell(2);
+ ms << MTag("span", "class='" + cssclass + "'")
+ << cell(2)
+ << ETag("span");
}
// 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().flavor == OutputParams::HTML)
- features.addPreambleSnippet("<style type=\"text/css\">\n"
- "mtext.framebox { border: 1px solid black; }\n"
- "span.framebox { border: 1px solid black; }\n"
- "</style>");
+ 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
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
}
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::mathmlize(MathStream & ms) const
{
- SetMode mathmode(ms, false, from_ascii("class='boxed'"));
- ms << cell(0);
+ ms << MTag("mstyle", "class='boxed'")
+ << cell(0)
+ << ETag("mstyle");
}
void InsetMathBoxed::htmlize(HtmlStream & ms) const
{
- SetHTMLMode mathmode(ms, false, "class='boxed'");
- ms << cell(0);
+ 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().flavor == OutputParams::HTML)
- features.addPreambleSnippet("<style type=\"text/css\">\n"
- "mstyle.boxed { border: 1px solid black; }\n"
- "span.boxed { border: 1px solid black; }\n"
- "</style>");
+ 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);
}
projects / lyx.git / blobdiff