rename mathed/math_xinset into mathed/InsetMathX

[lyx.git] / src / text2.C

diff --git a/src/text2.C b/src/text2.C
index 0824e42d184c2d87300d029d62460b69c47468b6..09b9a2ce93747ded3f0604b420cb6074e439c1fd 100644 (file)
--- a/src/text2.C
+++ b/src/text2.C
@@ -51,7 +51,7 @@
 
 #include "insets/insetenv.h"
 
-#include "mathed/math_hullinset.h"
+#include "mathed/InsetMathHull.h"
 
 #include "support/textutils.h"
 
@@ -555,7 +555,7 @@ void LyXText::toggleFree(LCursor & cur, LyXFont const & font, bool toggleall)
        if (font == LyXFont(LyXFont::ALL_IGNORE)) {
                // Could only happen with user style
                cur.message(_("No font change defined. "
-                             "Use Character under the Layout menu to define font change."));
+                                          "Use Character under the Layout menu to define font change."));
                return;
        }
 
@@ -719,6 +719,7 @@ void LyXText::setCursor(CursorSlice & cur, pit_type par, pos_type pos)
 void LyXText::setCursorIntern(LCursor & cur,
                              pit_type par, pos_type pos, bool setfont, bool boundary)
 {
+       BOOST_ASSERT(this == cur.text());
        cur.boundary(boundary);
        setCursor(cur.top(), par, pos);
        cur.setTargetX();
@@ -803,8 +804,8 @@ pos_type LyXText::getColumnNearX(pit_type const pit,
                c = bidi.vis2log(vc);
                last_tmpx = tmpx;
                if (body_pos > 0 && c == body_pos - 1) {
-                        string lsep = layout->labelsep;
-                        docstring dlsep(lsep.begin(), lsep.end());
+                       string lsep = layout->labelsep;
+                       docstring dlsep(lsep.begin(), lsep.end());
                        tmpx += r.label_hfill +
                                font_metrics::width(dlsep, getLabelFont(par));
                        if (par.isLineSeparator(body_pos - 1))
@@ -1082,7 +1083,7 @@ bool LyXText::cursorUp(LCursor & cur)
                LCursor old = cur;
                // Go to middle of previous row. 16 found to work OK;
                // 12 = top/bottom margin of display math
-               int const margin = 3 * MathHullInset::displayMargin() / 2;
+               int const margin = 3 * InsetMathHull::displayMargin() / 2;
                editXY(cur, x, y - par.rows()[row].ascent() - margin);
                cur.clearSelection();
 
@@ -1130,7 +1131,7 @@ bool LyXText::cursorDown(LCursor & cur)
                int const y = bv_funcs::getPos(cur, cur.boundary()).y_;
                LCursor old = cur;
                // To middle of next row
-               int const margin = 3 * MathHullInset::displayMargin() / 2;
+               int const margin = 3 * InsetMathHull::displayMargin() / 2;
                editXY(cur, x, y + par.rows()[row].descent() + margin);
                cur.clearSelection();