The logic of the endParagraph() routine is wrong. We should first

[lyx.git] / src / Text3.cpp

diff --git a/src/Text3.cpp b/src/Text3.cpp
index 4c1d07bf46720cc8141b32cc79ba8a6034e76647..9bb3f256d4d12ceacc2d7f2bb00a6139bbb24ab0 100644 (file)
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -1649,6 +1649,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
        case LFUN_INDEX_INSERT:
        case LFUN_PREVIEW_INSERT:
        case LFUN_SCRIPT_INSERT:
+       case LFUN_IPA_INSERT:
                // Open the inset, and move the current selection
                // inside it.
                doInsertInset(cur, this, cmd, true, true);
@@ -1670,16 +1671,19 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
        case LFUN_FLOAT_INSERT:
        case LFUN_FLOAT_WIDE_INSERT:
        case LFUN_WRAP_INSERT: {
-               // will some text be moved into the inset?
-               bool content = cur.selection();
+               // will some content be moved into the inset?
+               bool const content = cur.selection();
+               // does the content consist of multiple paragraphs?
+               bool const singlepar = (cur.selBegin().pit() == cur.selEnd().pit());
 
                doInsertInset(cur, this, cmd, true, true);
                cur.posForward();
 
-               // If some text is moved into the inset, doInsertInset 
-               // puts the cursor outside the inset. To insert the
-               // caption we put it back into the inset.
-               if (content)
+               // If some single-par content is moved into the inset,
+               // doInsertInset puts the cursor outside the inset.
+               // To insert the caption we put it back into the inset.
+               // FIXME cleanup doInsertInset to avoid such dances!
+               if (content && singlepar)
                        cur.backwardPos();
 
                ParagraphList & pars = cur.text()->paragraphs();
@@ -2442,6 +2446,9 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
                    && cur.buffer()->params().branchlist().empty())
                        enable = false;
                break;
+       case LFUN_IPA_INSERT:
+               code = IPA_CODE;
+               break;
        case LFUN_PHANTOM_INSERT:
                code = PHANTOM_CODE;
                break;