Take into account file system case sensitivity when checking whether

[lyx.git] / src / Text3.cpp

diff --git a/src/Text3.cpp b/src/Text3.cpp
index 08d15959e2d78f248a47a9f7afda67aaa4bfd39b..c8e4a4b1ead300c1196a1fbda9ffca122ce7bedb 100644 (file)
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -335,7 +335,7 @@ static void outline(OutlineOp mode, Cursor & cur)
 
        // Do we need to set insets' buffer_ members, because we copied
        // some stuff? We'll assume we do and reset it otherwise.
-       bool setBuffers = true;
+       bool set_buffers = true;
 
        switch (mode) {
                case OutlineUp: {
@@ -406,7 +406,7 @@ static void outline(OutlineOp mode, Cursor & cur)
                                        }
                                }
                        }
-                       setBuffers = false;
+                       set_buffers = false;
                        break;
                }
                case OutlineOut: {
@@ -426,11 +426,11 @@ static void outline(OutlineOp mode, Cursor & cur)
                                        }
                                }
                        }
-                       setBuffers = false;
+                       set_buffers = false;
                        break;
                }
        }
-       if (setBuffers)
+       if (set_buffers)
                // FIXME This only really needs doing for the newly introduced 
                // paragraphs. Something like:
                //      pit_type const numpars = distance(start, finish);
@@ -462,10 +462,10 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
        LYXERR(Debug::ACTION, "Text::dispatch: cmd: " << cmd);
 
        BufferView * bv = &cur.bv();
-       TextMetrics & tm = bv->textMetrics(this);
-       if (!tm.contains(cur.pit())) {
+       TextMetrics * tm = &bv->textMetrics(this);
+       if (!tm->contains(cur.pit())) {
                lyx::dispatch(FuncRequest(LFUN_SCREEN_SHOW_CURSOR));
-               tm = bv->textMetrics(this);
+               tm = &bv->textMetrics(this);
        }
 
        // FIXME: We use the update flag to indicates wether a singlePar or a
@@ -553,7 +553,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                if (cur.selection())
                        cutSelection(cur, true, false);
                else
-                       tm.deleteLineForward(cur);
+                       tm->deleteLineForward(cur);
                finishChange(cur, false);
                break;
 
@@ -740,13 +740,13 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
        case LFUN_LINE_BEGIN:
        case LFUN_LINE_BEGIN_SELECT:
                needsUpdate |= cur.selHandle(cmd.action == LFUN_LINE_BEGIN_SELECT);
-               needsUpdate |= tm.cursorHome(cur);
+               needsUpdate |= tm->cursorHome(cur);
                break;
 
        case LFUN_LINE_END:
        case LFUN_LINE_END_SELECT:
                needsUpdate |= cur.selHandle(cmd.action == LFUN_LINE_END_SELECT);
-               needsUpdate |= tm.cursorEnd(cur);
+               needsUpdate |= tm->cursorEnd(cur);
                break;
 
        case LFUN_SECTION_SELECT: {
@@ -1150,8 +1150,8 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 
        case LFUN_SERVER_GET_XY:
                cur.message(from_utf8(
-                       convert<string>(tm.cursorX(cur.top(), cur.boundary()))
-                       + ' ' + convert<string>(tm.cursorY(cur.top(), cur.boundary()))));
+                       convert<string>(tm->cursorX(cur.top(), cur.boundary()))
+                       + ' ' + convert<string>(tm->cursorY(cur.top(), cur.boundary()))));
                break;
 
        case LFUN_SERVER_SET_XY: {
@@ -1163,7 +1163,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                        lyxerr << "SETXY: Could not parse coordinates in '"
                               << to_utf8(cmd.argument()) << endl;
                else
-                       tm.setCursorFromCoordinates(cur, x, y);
+                       tm->setCursorFromCoordinates(cur, x, y);
                break;
        }
 
@@ -1309,9 +1309,9 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 
        case LFUN_MOUSE_TRIPLE:
                if (cmd.button() == mouse_button::button1) {
-                       tm.cursorHome(cur);
+                       tm->cursorHome(cur);
                        cur.resetAnchor();
-                       tm.cursorEnd(cur);
+                       tm->cursorEnd(cur);
                        cur.setSelection();
                        bv->cursor() = cur;
                }
@@ -1380,7 +1380,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                int const wh = bv->workHeight();
                int const y = max(0, min(wh - 1, cmd.y));
 
-               tm.setCursorFromCoordinates(cur, cmd.x, y);
+               tm->setCursorFromCoordinates(cur, cmd.x, y);
                cur.setTargetX(cmd.x);
                if (cmd.y >= wh)
                        lyx::dispatch(FuncRequest(LFUN_DOWN_SELECT));
@@ -1523,6 +1523,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                }
                if (!inset)
                        break;
+               cur.recordUndo();
                insertInset(cur, inset);
                cur.posForward();
                break;
@@ -1629,7 +1630,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                dispatch(cur, fr);
                break;
        }
-
+       
        case LFUN_NOMENCL_PRINT:
        case LFUN_TOC_INSERT:
        case LFUN_LINE_INSERT:
@@ -2126,6 +2127,8 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
                        code = INDEX_PRINT_CODE;
                else if (cmd.argument() == "nomenclature")
                        code = NOMENCL_CODE;
+               else if (cmd.argument() == "nomencl_print")
+                       code = NOMENCL_PRINT_CODE;
                else if (cmd.argument() == "label")
                        code = LABEL_CODE;
                else if (cmd.argument() == "note")