[LyX/master] Give a 2 pixels space for markers around math objects

[Jean-Marc Lasgouttes]

commit 5a3962958f2a2c5370b302d6dfea0967343b9a46
Author: Jean-Marc Lasgouttes <lasgout...@lyx.org>
Date:   Thu Jun 8 15:22:03 2017 +0200

    Give a 2 pixels space for markers around math objects
---
 src/mathed/MathRow.cpp |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/mathed/MathRow.cpp b/src/mathed/MathRow.cpp
index 783e85a..b312e22 100644
--- a/src/mathed/MathRow.cpp
+++ b/src/mathed/MathRow.cpp
@@ -49,8 +49,16 @@ namespace {
 
 int markerMargin(MathRow::Element const & e)
 {
-       return e.marker == InsetMath::MARKER
-               || e.marker == InsetMath::MARKER2;
+       switch(e.marker) {
+       case InsetMath::MARKER:
+       case InsetMath::MARKER2:
+       case InsetMath::BOX_MARKER:
+               return 2;
+       case InsetMath::NO_MARKER:
+               return 0;
+       }
+       // should not happen
+       return 0;
 }
 
 
@@ -92,7 +100,7 @@ void drawMarkers(PainterInfo const & pi, MathRow::Element 
const & e,
        Dimension const dim = coords.getInsets().dim(e.inset);
 
        // the marker is before/after the inset. Necessary space has been 
reserved already.
-       int const l = x + e.before - markerMargin(e);
+       int const l = x + e.before - (markerMargin(e) > 0 ? 1 : 0);
        int const r = x + dim.width() - e.after;
 
        if (e.marker == InsetMath::BOX_MARKER) {