* 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.
//
/////////////////////////////////////////////////////////////////////
-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) << '}';
}
}
+void InsetMathBox::mathmlize(MathStream & ms) const
+{
+ SetMode textmode(ms, true, "class='mathbox'");
+ ms << cell(0);
+}
+
+
+void InsetMathBox::htmlize(HtmlStream & ms) const
+{
+ SetHTMLMode textmode(ms, true);
+ ms << cell(0);
+}
+
+
void InsetMathBox::metrics(MetricsInfo & mi, Dimension & dim) const
{
FontSetChanger dummy(mi.base, "textnormal");
void InsetMathBox::infoize(odocstream & os) const
-{
+{
os << "Box: " << name_;
}
+void InsetMathBox::validate(LaTeXFeatures & features) const
+{
+ if (name_ == "tag" || name_ == "tag*")
+ features.require("amsmath");
+
+ cell(0).validate(features);
+}
+
+
/////////////////////////////////////////////////////////////////////
//
/////////////////////////////////////////////////////////////////////
-InsetMathFBox::InsetMathFBox()
- : InsetMathNest(1)
+InsetMathFBox::InsetMathFBox(Buffer * buf)
+ : InsetMathNest(buf, 1)
{}
{
FontSetChanger dummy(mi.base, "textnormal");
cell(0).metrics(mi, dim);
- metricsMarkers(dim, 3); // 1 pixel space, 1 frame, 1 space
+ metricsMarkers2(dim, 3); // 1 pixel space, 1 frame, 1 space
}
void InsetMathFBox::write(WriteStream & os) const
{
+ ModeSpecifier specifier(os, TEXT_MODE);
os << "\\fbox{" << cell(0) << '}';
}
}
+void InsetMathFBox::mathmlize(MathStream & ms) const
+{
+ SetMode textmode(ms, true, "class='fbox'");
+ ms << cell(0);
+}
+
+
+void InsetMathFBox::htmlize(HtmlStream & ms) const
+{
+ SetHTMLMode textmode(ms, true, "class='fbox'");
+ ms << cell(0);
+}
+
+
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.addPreambleSnippet("<style type=\"text/css\">\n"
+ "mtext.fbox { border: 1px solid black; }\n"
+ "</style>");
+ else if (features.runparams().math_flavor == OutputParams::MathAsHTML)
+ features.addPreambleSnippet("<style type=\"text/css\">\n"
+ "span.fbox { border: 1px solid black; }\n"
+ "</style>");
+ InsetMathNest::validate(features);
+}
+
+
+
/////////////////////////////////////////////////////////////////////
//
-// InsetMathFrameBox
+// InsetMathMakebox
//
/////////////////////////////////////////////////////////////////////
-InsetMathFrameBox::InsetMathFrameBox()
- : InsetMathNest(3)
+InsetMathMakebox::InsetMathMakebox(Buffer * buf, bool framebox)
+ : InsetMathNest(buf, 3), framebox_(framebox)
{}
-void InsetMathFrameBox::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetMathMakebox::metrics(MetricsInfo & mi, Dimension & dim) const
{
FontSetChanger dummy(mi.base, "textnormal");
- w_ = mathed_char_width(mi.base.font, '[');
- InsetMathNest::metrics(mi);
- dim = cell(0).dimension(*mi.base.bv);
- dim += cell(1).dimension(*mi.base.bv);
- dim += cell(2).dimension(*mi.base.bv);
+
+ Dimension wdim;
+ static docstring bracket = from_ascii("[");
+ mathed_string_dim(mi.base.font, bracket, wdim);
+ 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.des = std::max(std::max(wdim.des, dim0.des), std::max(dim1.des, dim2.des));
+
+ if (framebox_) {
+ dim.wid += 4;
+ dim.asc += 3;
+ dim.des += 2;
+ } else {
+ dim.asc += 1;
+ dim.des += 1;
+ }
+
metricsMarkers(dim);
}
-void InsetMathFrameBox::draw(PainterInfo & pi, int x, int y) const
+void InsetMathMakebox::draw(PainterInfo & pi, int x, int y) const
{
+ drawMarkers(pi, x, y);
+
FontSetChanger dummy(pi.base, "textnormal");
- 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 += 5;
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_;
+ x += w;
cell(0).draw(pi, x, y);
x += cell(0).dimension(bv).wid;
drawStrBlack(pi, x, y, from_ascii("]"));
- x += w_ + 4;
+ x += w;
drawStrBlack(pi, x, y, from_ascii("["));
- x += w_;
+ x += w;
cell(1).draw(pi, x, y);
x += cell(1).dimension(bv).wid;
drawStrBlack(pi, x, y, from_ascii("]"));
- x += w_ + 4;
+ x += w + 2;
cell(2).draw(pi, x, y);
- drawMarkers(pi, x, y);
}
-void InsetMathFrameBox::write(WriteStream & os) const
+void InsetMathMakebox::write(WriteStream & os) const
{
- os << "\\framebox";
- os << '[' << cell(0) << ']';
- if (cell(1).size())
- os << '[' << cell(1) << ']';
+ ModeSpecifier specifier(os, TEXT_MODE);
+ os << (framebox_ ? "\\framebox" : "\\makebox");
+ if (cell(0).size() || !os.latex()) {
+ os << '[' << cell(0) << ']';
+ if (cell(1).size() || !os.latex())
+ os << '[' << cell(1) << ']';
+ }
os << '{' << cell(2) << '}';
}
-void InsetMathFrameBox::normalize(NormalStream & os) const
+void InsetMathMakebox::normalize(NormalStream & os) const
+{
+ os << (framebox_ ? "[framebox " : "[makebox ")
+ << cell(0) << ' ' << cell(1) << ' ' << cell(2) << ']';
+}
+
+
+void InsetMathMakebox::infoize(odocstream & os) const
+{
+ os << (framebox_ ? "Framebox" : "Makebox")
+ << " (width: " << cell(0)
+ << " pos: " << cell(1) << ")";
+}
+
+
+void InsetMathMakebox::mathmlize(MathStream & ms) const
{
- os << "[framebox " << cell(0) << ' ' << cell(1) << ' ' << cell(2) << ']';
+ // FIXME We could do something with the other arguments.
+ std::string const cssclass = framebox_ ? "framebox" : "makebox";
+ SetMode textmode(ms, true, "class='" + cssclass + "'");
+ ms << cell(2);
}
+void InsetMathMakebox::htmlize(HtmlStream & ms) const
+{
+ // FIXME We could do something with the other arguments.
+ std::string const cssclass = framebox_ ? "framebox" : "makebox";
+ SetHTMLMode textmode(ms, true, "class='" + cssclass + "'");
+ ms << cell(2);
+}
+
+
+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.addPreambleSnippet("<style type=\"text/css\">\n"
+ "span.framebox { border: 1px solid black; }\n"
+ "</style>");
+ else if (features.runparams().math_flavor == OutputParams::MathAsHTML)
+ features.addPreambleSnippet("<style type=\"text/css\">\n"
+ "span.framebox { border: 1px solid black; }\n"
+ "</style>");
+ InsetMathNest::validate(features);
+}
+
/////////////////////////////////////////////////////////////////////
//
//
/////////////////////////////////////////////////////////////////////
-InsetMathBoxed::InsetMathBoxed()
- : InsetMathNest(1)
+InsetMathBoxed::InsetMathBoxed(Buffer * buf)
+ : InsetMathNest(buf, 1)
{}
void InsetMathBoxed::write(WriteStream & os) const
{
+ ModeSpecifier specifier(os, MATH_MODE);
os << "\\boxed{" << cell(0) << '}';
}
}
-void InsetMathBoxed::validate(LaTeXFeatures & features) const
-{
- features.require("amsmath");
-}
-
-
-/////////////////////////////////////////////////////////////////////
-//
-// InsetMathMakebox
-//
-/////////////////////////////////////////////////////////////////////
-
-
-InsetMathMakebox::InsetMathMakebox()
- : InsetMathNest(3)
-{}
-
-
-void InsetMathMakebox::metrics(MetricsInfo & mi, Dimension & dim) const
-{
- FontSetChanger dummy(mi.base, from_ascii("textnormal"));
- w_ = mathed_char_width(mi.base.font, '[');
- InsetMathNest::metrics(mi);
- dim = cell(0).dimension(*mi.base.bv);
- dim += cell(1).dimension(*mi.base.bv);
- dim += cell(2).dimension(*mi.base.bv);
- dim.wid += 4 * w_ + 4;
- metricsMarkers(dim);
-}
-
-
-void InsetMathMakebox::draw(PainterInfo & pi, int x, int y) const
+void InsetMathBoxed::mathmlize(MathStream & ms) const
{
- FontSetChanger dummy(pi.base, from_ascii("textnormal"));
- drawMarkers(pi, x, y);
-
- drawStrBlack(pi, x, y, from_ascii("["));
- x += w_;
- cell(0).draw(pi, x, y);
- x += cell(0).dimension(*pi.base.bv).width();
- drawStrBlack(pi, x, y, from_ascii("]"));
- x += w_ + 2;
-
- drawStrBlack(pi, x, y, from_ascii("["));
- x += w_;
- cell(1).draw(pi, x, y);
- x += cell(1).dimension(*pi.base.bv).wid;
- drawStrBlack(pi, x, y, from_ascii("]"));
- x += w_ + 2;
-
- cell(2).draw(pi, x, y);
- setPosCache(pi, x, y);
+ SetMode mathmode(ms, false, "class='boxed'");
+ ms << cell(0);
}
-void InsetMathMakebox::write(WriteStream & os) const
+void InsetMathBoxed::htmlize(HtmlStream & ms) const
{
- os << "\\makebox";
- os << '[' << cell(0) << ']';
- if (cell(1).size())
- os << '[' << cell(1) << ']';
- os << '{' << cell(2) << '}';
+ SetHTMLMode mathmode(ms, false, "class='boxed'");
+ ms << cell(0);
}
-void InsetMathMakebox::normalize(NormalStream & os) const
+void InsetMathBoxed::validate(LaTeXFeatures & features) const
{
- os << "[makebox " << cell(0) << ' ' << cell(1) << ' ' << cell(2) << ']';
-}
-
+ features.require("amsmath");
-void InsetMathMakebox::infoize(odocstream & os) const
-{
- os << "Makebox (width: " << cell(0)
- << " pos: " << cell(1) << ")";
+ // 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.addPreambleSnippet("<style type=\"text/css\">\n"
+ "mstyle.boxed { border: 1px solid black; }\n"
+ "</style>");
+ else if (features.runparams().math_flavor == OutputParams::MathAsHTML)
+ features.addPreambleSnippet("<style type=\"text/css\">\n"
+ "span.boxed { border: 1px solid black; }\n"
+ "</style>");
+
+ InsetMathNest::validate(features);
}
projects / lyx.git / blobdiff