X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathSize.cpp;h=5055f2d73e6c2612d7e9b5402ce4a8deb7f2a775;hb=e5bb491e2e10a8097284d11eae5501a3673731cb;hp=e038c7a8f5abda8a2a8d7728325caddcd81eb093;hpb=1d6923b65ba0ef94b627fda9e968fff7f37666c1;p=lyx.git

diff --git a/src/mathed/InsetMathSize.cpp b/src/mathed/InsetMathSize.cpp
index e038c7a8f5..5055f2d73e 100644
--- a/src/mathed/InsetMathSize.cpp
+++ b/src/mathed/InsetMathSize.cpp
@@ -12,22 +12,28 @@
 
 #include "InsetMathSize.h"
 
+#include "LaTeXFeatures.h"
 #include "MathData.h"
 #include "MathParser.h"
 #include "MathStream.h"
+#include "MetricsInfo.h"
 #include "output_xhtml.h"
 
 #include "support/convert.h"
+#include "support/gettext.h"
+#include "support/lstrings.h"
 
 #include <string>
 #include <ostream>
 
+using namespace lyx::support;
 using namespace std;
 
 namespace lyx {
 
 InsetMathSize::InsetMathSize(Buffer * buf, latexkeys const * l)
-	: InsetMathNest(buf, 1), key_(l), style_(Styles(convert<int>(l->extra)))
+	: InsetMathNest(buf, 1), key_(l),
+	  style_(MathStyle(convert<int>(l->extra)))
 {}
 
 
@@ -39,21 +45,21 @@ Inset * InsetMathSize::clone() const
 
 void InsetMathSize::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	StyleChanger dummy(mi.base, style_);
+	Changer dummy2 = mi.base.changeEnsureMath();
+	Changer dummy = mi.base.font.changeStyle(style_);
 	cell(0).metrics(mi, dim);
-	metricsMarkers(dim);
 }
 
 
 void InsetMathSize::draw(PainterInfo & pi, int x, int y) const
 {
-	StyleChanger dummy(pi.base, style_);
-	cell(0).draw(pi, x + 1, y);
-	drawMarkers(pi, x, y);
+	Changer dummy2 = pi.base.changeEnsureMath();
+	Changer dummy = pi.base.font.changeStyle(style_);
+	cell(0).draw(pi, x, y);
 }
 
 
-void InsetMathSize::write(WriteStream & os) const
+void InsetMathSize::write(TeXMathStream & os) const
 {
 	MathEnsurer ensurer(os);
 	os << "{\\" << key_->name << ' ' << cell(0) << '}';
@@ -61,13 +67,13 @@ void InsetMathSize::write(WriteStream & os) const
 
 
 // From the MathML documentation:
-//	MathML uses two attributes, displaystyle and scriptlevel, to control 
-//	orthogonal presentation features that TeX encodes into one "style" 
-//	attribute with values \displaystyle, \textstyle, \scriptstyle, and 
-//	\scriptscriptstyle. The corresponding values of displaystyle and scriptlevel 
-//	for those TeX styles would be "true" and "0", "false" and "0", "false" and "1", 
-//	and "false" and "2", respectively. 
-void InsetMathSize::mathmlize(MathStream & ms) const
+//	MathML uses two attributes, displaystyle and scriptlevel, to control
+//	orthogonal presentation features that TeX encodes into one "style"
+//	attribute with values \displaystyle, \textstyle, \scriptstyle, and
+//	\scriptscriptstyle. The corresponding values of displaystyle and scriptlevel
+//	for those TeX styles would be "true" and "0", "false" and "0", "false" and "1",
+//	and "false" and "2", respectively.
+void InsetMathSize::mathmlize(MathMLStream & ms) const
 {
 	string const & name = to_utf8(key_->name);
 	bool dispstyle = (name == "displaystyle");
@@ -79,8 +85,15 @@ void InsetMathSize::mathmlize(MathStream & ms) const
 	stringstream attrs;
 	attrs << "displaystyle='" << (dispstyle ? "true" : "false")
 		<< "' scriptlevel='" << scriptlevel << "'";
-	ms << MTag("mstyle", attrs.str()) << ">"
-	   << cell(0) << ETag("mstyle");
+	ms << MTag("mstyle", attrs.str()) << cell(0) << ETag("mstyle");
+}
+
+
+void InsetMathSize::htmlize(HtmlStream & os) const
+{
+	string const & name = to_utf8(key_->name);
+	os <<	MTag("span", "class='" + name + "'")
+			<< cell(0) << ETag("span");
 }
 
 
@@ -92,8 +105,18 @@ void InsetMathSize::normalize(NormalStream & os) const
 
 void InsetMathSize::infoize(odocstream & os) const
 {
-	os << "Size: " << key_->name;
+	os << bformat(_("Size: %1$s"), key_->name);
 }
 
 
+void InsetMathSize::validate(LaTeXFeatures & features) const
+{
+	if (features.runparams().math_flavor == OutputParams::MathAsHTML)
+		features.addCSSSnippet(
+			"span.displaystyle, span.textstyle{font-size: normal;}\n"
+			"span.scriptstyle {font-size: small;}\n"
+			"span.scriptscriptstyle {font-size: x-small;}");
+	InsetMathNest::validate(features);
+}
+
 } // namespace lyx