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 f4aca5b3ee0fbeed368606fa0403d93d162d8525..9bb3f256d4d12ceacc2d7f2bb00a6139bbb24ab0 100644 (file)
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -45,7 +45,6 @@
 #include "SpellChecker.h"
 #include "TextClass.h"
 #include "TextMetrics.h"
-#include "VSpace.h"
 #include "WordLangTuple.h"
 
 #include "frontends/Application.h"
@@ -68,6 +67,7 @@
 #include "support/convert.h"
 #include "support/debug.h"
 #include "support/gettext.h"
+#include "support/lassert.h"
 #include "support/lstrings.h"
 #include "support/lyxtime.h"
 #include "support/os.h"
@@ -93,6 +93,7 @@ using cap::pasteClipboardGraphics;
 using cap::replaceSelection;
 using cap::grabAndEraseSelection;
 using cap::selClearOrDel;
+using cap::pasteSimpleText;
 
 // globals...
 static Font freefont(ignore_font, ignore_language);
@@ -246,8 +247,10 @@ static bool doInsertInset(Cursor & cur, Text * text,
                        inset->edit(cur, true);
                // Now put this into inset
                Font const f(inherit_font, cur.current_font.language());
-               cur.text()->insertStringAsLines(cur, ds, f);
-               cur.leaveInset(*inset);
+               if (!ds.empty()) {
+                       cur.text()->insertStringAsLines(cur, ds, f);
+                       cur.leaveInset(*inset);
+               }
                return true;
        }
 
@@ -627,8 +630,12 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                                // provide it with two different cursors.
                                Cursor dummy = cur;
                                dummy.pos() = dummy.pit() = 0;
-                               if (cur.bv().checkDepm(dummy, cur))
+                               if (cur.bv().checkDepm(dummy, cur)) {
                                        cur.forceBufferUpdate();
+                                       // DEPM may have requested a screen update
+                                       cur.screenUpdateFlags(
+                                               cur.screenUpdate() | dummy.screenUpdate());
+                               }
                        }
                }
                break;
@@ -654,8 +661,12 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                                Cursor dummy = cur;
                                dummy.pos() = cur.lastpos();
                                dummy.pit() = cur.lastpit();
-                               if (cur.bv().checkDepm(dummy, cur))
+                               if (cur.bv().checkDepm(dummy, cur)) {
                                        cur.forceBufferUpdate();
+                                       // DEPM may have requested a screen update
+                                       cur.screenUpdateFlags(
+                                               cur.screenUpdate() | dummy.screenUpdate());
+                               }
                        }
                }
                break;
@@ -838,8 +849,12 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                                // provide it with two different cursors.
                                Cursor dummy = cur;
                                dummy.pos() = dummy.pit() = 0;
-                               if (cur.bv().checkDepm(dummy, cur))
+                               if (cur.bv().checkDepm(dummy, cur)) {
                                        cur.forceBufferUpdate();
+                                       // DEPM may have requested a screen update
+                                       cur.screenUpdateFlags(
+                                               cur.screenUpdate() | dummy.screenUpdate());
+                               }
                        }
                }
                break;
@@ -888,8 +903,12 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                                Cursor dummy = cur;
                                dummy.pos() = cur.lastpos();
                                dummy.pit() = cur.lastpit();
-                               if (cur.bv().checkDepm(dummy, cur))
+                               if (cur.bv().checkDepm(dummy, cur)) {
                                        cur.forceBufferUpdate();
+                                       // DEPM may have requested a screen update
+                                       cur.screenUpdateFlags(
+                                               cur.screenUpdate() | dummy.screenUpdate());
+                               }
                        }
                }
                break;
@@ -1318,6 +1337,11 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                bv->buffer().errors("Paste");
                break;
 
+       case LFUN_CLIPBOARD_PASTE_SIMPLE:
+               cur.clearSelection();
+               pasteSimpleText(cur, cmd.argument() == "paragraph");
+               break;
+
        case LFUN_PRIMARY_SELECTION_PASTE:
                pasteString(cur, theSelection().get(),
                            cmd.argument() == "paragraph");
@@ -1552,6 +1576,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 
                cur.resetAnchor();
                moveCursor(cur, false);
+               cur.markNewWordPosition();
                bv->bookmarkEditPosition();
                break;
        }
@@ -1624,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);
@@ -1645,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();
@@ -1890,9 +1919,9 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                Language const * lang = languages.getLanguage(to_utf8(cmd.argument()));
                if (!lang)
                        break;
-               selectWordWhenUnderCursor(cur, WHOLE_WORD);
+               selectWordWhenUnderCursor(cur, WHOLE_WORD_STRICT);
                Font font(ignore_font, lang);
-               toggleAndShow(cur, this, font);
+               toggleAndShow(cur, this, font, false);
                break;
        }
 
@@ -2375,7 +2404,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
                        // make sure we know about such floats
                        if (cit == floats.end() ||
                                        // and that we know how to generate a list of them
-                           (!cit->second.needsFloatPkg() && cit->second.listCommand().empty())) {
+                           (!cit->second.usesFloatPkg() && cit->second.listCommand().empty())) {
                                flag.setUnknown(true);
                                // probably not necessary, but...
                                enable = false;
@@ -2417,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;
@@ -2582,6 +2614,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
         }
 
        case LFUN_CLIPBOARD_PASTE:
+       case LFUN_CLIPBOARD_PASTE_SIMPLE:
                enable = !theClipboard().empty();
                break;