X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathBox.cpp;h=2b237d8cbbb3f9624ba6a654b06066730022f252;hb=e5bb491e2e10a8097284d11eae5501a3673731cb;hp=8b3cb2b427b1c1938cf980bae60959072eebe8a9;hpb=aafd52f44167d5510be1ddcb974daa9dae486933;p=lyx.git

diff --git a/src/mathed/InsetMathBox.cpp b/src/mathed/InsetMathBox.cpp
index 8b3cb2b427..2b237d8cbb 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 <algorithm>
 #include <ostream>
 
+using namespace lyx::support;
 
 namespace lyx {
 
@@ -37,7 +42,7 @@ InsetMathBox::InsetMathBox(Buffer * buf, docstring const & name)
 {}
 
 
-void InsetMathBox::write(WriteStream & os) const
+void InsetMathBox::write(TeXMathStream & os) const
 {
 	ModeSpecifier specifier(os, TEXT_MODE);
 	os << '\\' << name_ << '{' << cell(0) << '}';
@@ -52,7 +57,7 @@ void InsetMathBox::normalize(NormalStream & os) const
 }
 
 
-void InsetMathBox::mathmlize(MathStream & ms) const
+void InsetMathBox::mathmlize(MathMLStream & ms) const
 {
 	// FIXME XHTML
 	// Need to do something special for tags here.
@@ -76,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_);
 }
 
 
@@ -128,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;
 }
 
 
@@ -139,13 +145,12 @@ 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
+void InsetMathFBox::write(TeXMathStream & os) const
 {
 	ModeSpecifier specifier(os, TEXT_MODE);
 	os << "\\fbox{" << cell(0) << '}';
@@ -158,8 +163,8 @@ void InsetMathFBox::normalize(NormalStream & os) const
 }
 
 
-void InsetMathFBox::mathmlize(MathStream & ms) const
-{	
+void InsetMathFBox::mathmlize(MathMLStream & ms) const
+{
 	SetMode textmode(ms, true);
 	ms << MTag("mstyle", "class='fbox'")
 	   << cell(0)
@@ -214,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("[");
 	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;
@@ -240,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);
@@ -278,7 +279,7 @@ void InsetMathMakebox::draw(PainterInfo & pi, int x, int y) const
 }
 
 
-void InsetMathMakebox::write(WriteStream & os) const
+void InsetMathMakebox::write(TeXMathStream & os) const
 {
 	ModeSpecifier specifier(os, TEXT_MODE);
 	os << (framebox_ ? "\\framebox" : "\\makebox");
@@ -300,13 +301,13 @@ 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) << ")";
 }
 
 
-void InsetMathMakebox::mathmlize(MathStream & ms) const
+void InsetMathMakebox::mathmlize(MathMLStream & ms) const
 {
 	// FIXME We could do something with the other arguments.
 	std::string const cssclass = framebox_ ? "framebox" : "makebox";
@@ -355,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;
 }
 
 
@@ -365,11 +369,10 @@ 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
+void InsetMathBoxed::write(TeXMathStream & os) const
 {
 	ModeSpecifier specifier(os, MATH_MODE);
 	os << "\\boxed{" << cell(0) << '}';
@@ -388,7 +391,7 @@ void InsetMathBoxed::infoize(odocstream & os) const
 }
 
 
-void InsetMathBoxed::mathmlize(MathStream & ms) const
+void InsetMathBoxed::mathmlize(MathMLStream & ms) const
 {
 	ms << MTag("mstyle", "class='boxed'")
 	   << cell(0)
@@ -415,7 +418,7 @@ void InsetMathBoxed::validate(LaTeXFeatures & features) const
 		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);
 }