X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText3.cpp;h=e17e965170d88ec129266ebfd7cdd737d0742750;hb=4e69b9bac5e970572b9cf9169e3db9060c47e3b6;hp=aec29086aff5e5c2f08c6d6ba37de23cfd455226;hpb=57deff6c3d1b6751248f9764e6649d1e4e400f14;p=lyx.git

diff --git a/src/Text3.cpp b/src/Text3.cpp
index aec29086af..e17e965170 100644
--- 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;
@@ -1312,13 +1331,19 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 	}
 
 	case LFUN_CLIPBOARD_PASTE:
-		cur.clearSelection();
+		cap::replaceSelection(cur);
 		pasteClipboardText(cur, bv->buffer().errorList("Paste"),
 			       cmd.argument() == "paragraph");
 		bv->buffer().errors("Paste");
 		break;
 
+	case LFUN_CLIPBOARD_PASTE_SIMPLE:
+		cap::replaceSelection(cur);
+		pasteSimpleText(cur, cmd.argument() == "paragraph");
+		break;
+
 	case LFUN_PRIMARY_SELECTION_PASTE:
+		cap::replaceSelection(cur);
 		pasteString(cur, theSelection().get(),
 			    cmd.argument() == "paragraph");
 		break;
@@ -1327,6 +1352,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		// Copy the selection buffer to the clipboard stack,
 		// because we want it to appear in the "Edit->Paste
 		// recent" menu.
+		cap::replaceSelection(cur);
 		cap::copySelectionToStack();
 		cap::pasteSelection(bv->cursor(), bv->buffer().errorList("Paste"));
 		bv->buffer().errors("Paste");
@@ -1552,6 +1578,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 
 		cur.resetAnchor();
 		moveCursor(cur, false);
+		cur.markNewWordPosition();
 		bv->bookmarkEditPosition();
 		break;
 	}
@@ -1624,6 +1651,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 +1673,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 +1921,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;
 	}
 
@@ -2417,6 +2448,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 +2616,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 	 }
 
 	case LFUN_CLIPBOARD_PASTE:
+	case LFUN_CLIPBOARD_PASTE_SIMPLE:
 		enable = !theClipboard().empty();
 		break;
 
@@ -2803,7 +2838,6 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 void Text::pasteString(Cursor & cur, docstring const & clip,
 		bool asParagraphs)
 {
-	cur.clearSelection();
 	if (!clip.empty()) {
 		cur.recordUndo();
 		if (asParagraphs)