X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathScript.cpp;h=fc72b6b078e1052002cd045701c607767e57ac40;hb=28be7d552f62cc02fa86d7f79201d089bfb2d7b5;hp=a4ffd576b03bea104467d878bba6cfdc7543550a;hpb=d9018f14a61502636aaf84480113deca69def5db;p=lyx.git

diff --git a/src/mathed/InsetMathScript.cpp b/src/mathed/InsetMathScript.cpp
index a4ffd576b0..fc72b6b078 100644
--- a/src/mathed/InsetMathScript.cpp
+++ b/src/mathed/InsetMathScript.cpp
@@ -226,7 +226,8 @@ int InsetMathScript::dx0(BufferView const & bv) const
 {
 	LASSERT(hasDown(), return 0);
 	Dimension const dim = dimension(bv);
-	return hasLimits() ? (dim.wid - down().dimension(bv).width()) / 2 : nwid(bv);
+	return hasLimits() ? (dim.wid - down().dimension(bv).width()) / 2
+		: nwid(bv) + min(nker(&bv), 0);
 }
 
 
@@ -234,7 +235,8 @@ int InsetMathScript::dx1(BufferView const & bv) const
 {
 	LASSERT(hasUp(), return 0);
 	Dimension const dim = dimension(bv);
-	return hasLimits() ? (dim.wid - up().dimension(bv).width()) / 2 : nwid(bv) + nker(&bv);
+	return hasLimits() ? (dim.wid - up().dimension(bv).width()) / 2
+		: nwid(bv) + max(nker(&bv), 0);
 }
 
 
@@ -265,10 +267,8 @@ int InsetMathScript::ndes(BufferView const & bv) const
 
 int InsetMathScript::nker(BufferView const * bv) const
 {
-	if (!nuc().empty()) {
-		int kerning = nuc().kerning(bv);
-		return kerning > 0 ? kerning : 0;
-	}
+	if (!nuc().empty())
+		return nuc().kerning(bv);
 	return 0;
 }
 
@@ -320,9 +320,9 @@ void InsetMathScript::metrics(MetricsInfo & mi, Dimension & dim) const
 			dim.wid = max(dim.wid, dimdown.width());
 	} else {
 		if (hasUp())
-			dim.wid = max(dim.wid, nker(mi.base.bv) + dimup.width());
+			dim.wid = max(dim.wid, max(nker(mi.base.bv), 0) + dimup.width());
 		if (hasDown())
-			dim.wid = max(dim.wid, dimdown.width());
+			dim.wid = max(dim.wid, min(nker(mi.base.bv), 0) + dimdown.width());
 		dim.wid += nwid(bv);
 	}
 	int na = nasc(bv);
@@ -337,7 +337,6 @@ void InsetMathScript::metrics(MetricsInfo & mi, Dimension & dim) const
 		dim.des = max(nd, des);
 	} else
 		dim.des = nd;
-	metricsMarkers(mi, dim);
 }
 
 
@@ -357,7 +356,6 @@ void InsetMathScript::draw(PainterInfo & pi, int x, int y) const
 		up().draw(pi, x + dx1(bv), y - dy1(bv));
 	if (hasDown())
 		down().draw(pi, x + dx0(bv), y + dy0(bv));
-	drawMarkers(pi, x, y);
 }