X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathDots.cpp;h=44490cb0d27496348cb155ec5599f0b985cd246c;hb=d9082639080b9de993742bd352f92e5183058cf5;hp=8ca2a1e46981c9ed5f4a40f95803b143434360ca;hpb=c060a85d811674888c31db9ee0407d8b5cc37b6e;p=lyx.git

diff --git a/src/mathed/InsetMathDots.cpp b/src/mathed/InsetMathDots.cpp
index 8ca2a1e469..44490cb0d2 100644
--- a/src/mathed/InsetMathDots.cpp
+++ b/src/mathed/InsetMathDots.cpp
@@ -13,6 +13,7 @@
 
 #include "InsetMathDots.h"
 
+#include "Dimension.h"
 #include "LaTeXFeatures.h"
 #include "MathStream.h"
 #include "MathSupport.h"
@@ -25,7 +26,7 @@
 namespace lyx {
 
 InsetMathDots::InsetMathDots(latexkeys const * key)
-	: key_(key)
+	: dh_(0), key_(key)
 {}
 
 
@@ -53,12 +54,12 @@ void InsetMathDots::metrics(MetricsInfo & mi, Dimension & dim) const
 }
 
 
-void InsetMathDots::draw(PainterInfo & pain, int x, int y) const
+void InsetMathDots::draw(PainterInfo & pi, int x, int y) const
 {
-	Dimension const dim = dimension(*pain.base.bv);
+	Dimension const dim = dimension(*pi.base.bv);
 	if (key_->name == "adots" || key_->name == "iddots")
 		--y;
-	mathed_draw_deco(pain, x + 2, y - dh_, dim.width() - 2, dim.ascent(),
+	mathed_draw_deco(pi, x + 2, y - dh_, dim.width() - 2, dim.ascent(),
 			key_->name);
 	if (key_->name == "vdots" || key_->name == "ddots" || key_->name == "adots" || key_->name == "iddots")
 		++x;
@@ -66,9 +67,8 @@ void InsetMathDots::draw(PainterInfo & pain, int x, int y) const
 		++y;
 	else if (key_->name != "vdots")
 		--y;
-	mathed_draw_deco(pain, x + 2, y - dh_, dim.width() - 2, dim.ascent(),
+	mathed_draw_deco(pi, x + 2, y - dh_, dim.width() - 2, dim.ascent(),
 		key_->name);
-	setPosCache(pain, x, y);
 }
 
 
@@ -80,32 +80,65 @@ docstring InsetMathDots::name() const
 
 void InsetMathDots::validate(LaTeXFeatures & features) const
 {
-	if (!key_->requires.empty())
-		features.require(to_utf8(key_->requires));
+	if (!key_->required.empty())
+		features.require(key_->required);
 }
 
 
-void InsetMathDots::mathmlize(MathStream & os) const
+void InsetMathDots::mathmlize(MathMLStream & ms) const
+{
+	// which symbols we support is decided by what is listed in
+	// lib/symbols as generating a dots inset
+	docstring const & n = key_->name;
+	std::string ent;
+	if (ms.xmlMode()) {
+		if (n == "dots" || n == "dotsc" || n == "dotso" || n == "ldots")
+			ent = "…";
+		else if (n == "adots" || n == "iddots")
+			ent = "⋰";
+		else if (n == "cdots" || n == "dotsb" || n == "dotsi" || n == "dotsm")
+			ent = "⋯";
+		else if (n == "ddots")
+			ent = "⋱";
+		else if (n == "vdots")
+			ent = "⋮";
+		else LASSERT(false, ent = "…");
+	} else {
+		if (n == "dots" || n == "dotsc" || n == "dotso" || n == "ldots")
+			ent = "…";
+		else if (n == "adots" || n == "iddots")
+			ent = "⋰";
+		else if (n == "cdots" || n == "dotsb" || n == "dotsi" || n == "dotsm")
+			ent = "⋯";
+		else if (n == "ddots")
+			ent = "⋱";
+		else if (n == "vdots")
+			ent = "⋮";
+		else LASSERT(false, ent = "…");
+	}
+	ms << MTag("mi") << from_ascii(ent) << ETag("mi");
+}
+
+
+void InsetMathDots::htmlize(HtmlStream & os) const
 {
 	// which symbols we support is decided by what is listed in
 	// lib/symbols as generating a dots inset
 	docstring const & n = key_->name;
 	std::string ent;
 	if (n == "dots" || n == "dotsc" || n == "dotso" || n == "ldots")
-		ent = "&hellip;";
-	else if (n == "adots")
-		ent = "&utdot;";
+		ent = "&#x02026;";
+	else if (n == "adots" || n == "iddots")
+		ent = "&#x022F0;";
 	else if (n == "cdots" || n == "dotsb" || n == "dotsi" || n == "dotsm")
-		ent = "&ctdot;";
+		ent = "&#x022EF;";
 	else if (n == "ddots")
-		ent = "&dtdot;";
-	else if (n == "iddots")
-		ent = "&utdot;";
+		ent = "&#x022F1;";
 	else if (n == "vdots")
-		ent = "&vellip;";
+		ent = "&#x022EE;";
 	else
-		LASSERT(false, ent = "&hellip;");
-	os << MTag("mi") << from_ascii(ent) << ETag("mi");
+		LASSERT(false, ent = "#x02026;");
+	os << from_ascii(ent);
 }
 
 } // namespace lyx