X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText3.cpp;h=533afd22329c11bc43f6ff213583fb4b1ae4291c;hb=c1ee1bc0baf00a64734ec5eb345884c057e4d9c1;hp=cc0a96f5707057f1d4381042f5c97344ae78ad7d;hpb=c0000cc405063044fb4eca3f04ab35f69fe3dd74;p=lyx.git

diff --git a/src/Text3.cpp b/src/Text3.cpp
index cc0a96f570..533afd2232 100644
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -586,7 +586,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		if (cur.selection())
 			cutSelection(cur, true, false);
 		else
-			deleteWordForward(cur);
+			deleteWordForward(cur, cmd.getArg(0) == "force");
 		finishChange(cur, false);
 		break;
 
@@ -594,7 +594,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		if (cur.selection())
 			cutSelection(cur, true, false);
 		else
-			deleteWordBackward(cur);
+			deleteWordBackward(cur, cmd.getArg(0) == "force");
 		finishChange(cur, false);
 		break;
 
@@ -1054,6 +1054,13 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 			if (cur.pos() == cur.paragraph().size())
 				// Par boundary, force full-screen update
 				singleParUpdate = false;
+			else if (cmd.getArg(0) != "force" && cur.confirmDeletion()) {
+				cur.resetAnchor();
+				cur.selection(true);
+				cur.posForward();
+				cur.setSelection();
+				break;
+			}
 			needsUpdate |= erase(cur);
 			cur.resetAnchor();
 		} else {
@@ -1071,6 +1078,13 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 				// Par boundary, full-screen update
 				if (par_boundary)
 					singleParUpdate = false;
+				else if (cmd.getArg(0) != "force" && cur.confirmDeletion(true)) {
+					cur.resetAnchor();
+					cur.selection(true);
+					cur.posBackward();
+					cur.setSelection();
+					break;
+				}
 				needsUpdate |= backspace(cur);
 				cur.resetAnchor();
 				if (par_boundary && !first_par && cur.pos() > 0
@@ -1229,6 +1243,8 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		string const name = to_utf8(cmd.argument());
 		if (name == "hyphenation")
 			specialChar(cur, InsetSpecialChar::HYPHENATION);
+		else if (name == "allowbreak")
+			specialChar(cur, InsetSpecialChar::ALLOWBREAK);
 		else if (name == "ligature-break")
 			specialChar(cur, InsetSpecialChar::LIGATURE_BREAK);
 		else if (name == "slash")
@@ -1775,13 +1791,9 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 	}
 
 	case LFUN_HREF_INSERT: {
-		// FIXME If we're actually given an argument, shouldn't
-		// we use it, whether or not we have a selection?
 		docstring content = cmd.argument();
-		if (cur.selection()) {
+		if (content.empty() && cur.selection())
 			content = cur.selectionAsString(false);
-			cutSelection(cur, true, false);
-		}
 
 		InsetCommandParams p(HYPERLINK_CODE);
 		if (!content.empty()){
@@ -2156,6 +2168,13 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		break;
 	}
 
+	case LFUN_FONT_CROSSOUT: {
+		Font font(ignore_font, ignore_language);
+		font.fontInfo().setXout(FONT_TOGGLE);
+		toggleAndShow(cur, this, font);
+		break;
+	}
+
 	case LFUN_FONT_UNDERUNDERLINE: {
 		Font font(ignore_font, ignore_language);
 		font.fontInfo().setUuline(FONT_TOGGLE);
@@ -3193,6 +3212,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 	case LFUN_FONT_STATE:
 	case LFUN_FONT_UNDERLINE:
 	case LFUN_FONT_STRIKEOUT:
+	case LFUN_FONT_CROSSOUT:
 	case LFUN_FONT_UNDERUNDERLINE:
 	case LFUN_FONT_UNDERWAVE:
 	case LFUN_TEXTSTYLE_APPLY: