X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText3.cpp;h=f290ca690c8f62ead95e1aa9550ad42e8ba634c7;hb=b9e29418471d0d275650c52f976da300f4f42501;hp=195879ad17ecc04273521c3a70def239789ce544;hpb=83b1ac3b55ada8d9198b611e8a52ac5d02111e8b;p=lyx.git

diff --git a/src/Text3.cpp b/src/Text3.cpp
index 195879ad17..f290ca690c 100644
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -60,6 +60,7 @@
 #include "insets/InsetFloatList.h"
 #include "insets/InsetGraphics.h"
 #include "insets/InsetGraphicsParams.h"
+#include "insets/InsetInfo.h"
 #include "insets/InsetIPAMacro.h"
 #include "insets/InsetNewline.h"
 #include "insets/InsetQuotes.h"
@@ -69,8 +70,10 @@
 
 #include "support/convert.h"
 #include "support/debug.h"
+#include "support/filetools.h"
 #include "support/gettext.h"
 #include "support/lassert.h"
+#include "support/limited_stack.h"
 #include "support/lstrings.h"
 #include "support/lyxalgo.h"
 #include "support/lyxtime.h"
@@ -79,6 +82,7 @@
 
 #include "mathed/InsetMathHull.h"
 #include "mathed/InsetMathMacroTemplate.h"
+#include "lyxfind.h"
 
 #include <clocale>
 #include <sstream>
@@ -89,6 +93,7 @@ using namespace lyx::support;
 namespace lyx {
 
 using cap::copySelection;
+using cap::copySelectionToTemp;
 using cap::cutSelection;
 using cap::cutSelectionToTemp;
 using cap::pasteFromStack;
@@ -102,7 +107,8 @@ using cap::pasteSimpleText;
 using frontend::Clipboard;
 
 // globals...
-static Font freefont(ignore_font, ignore_language);
+typedef limited_stack<pair<docstring, Font>> FontStack;
+static FontStack freeFonts(15);
 static bool toggleall = false;
 
 static void toggleAndShow(Cursor & cur, Text * text,
@@ -249,20 +255,7 @@ static bool doInsertInset(Cursor & cur, Text * text,
 		ci->setButtonLabel();
 
 	cur.recordUndo();
-	if (cmd.action() == LFUN_INDEX_INSERT) {
-		docstring ds = subst(text->getStringToIndex(cur), '\n', ' ');
-		text->insertInset(cur, inset);
-		if (edit)
-			inset->edit(cur, true);
-		// Now put this into inset
-		Font const f(inherit_font, cur.current_font.language());
-		if (!ds.empty()) {
-			cur.text()->insertStringAsLines(cur, ds, f);
-			cur.leaveInset(*inset);
-		}
-		return true;
-	}
-	else if (cmd.action() == LFUN_ARGUMENT_INSERT) {
+	if (cmd.action() == LFUN_ARGUMENT_INSERT) {
 		bool cotextinsert = false;
 		InsetArgument const * const ia = static_cast<InsetArgument const *>(inset);
 		Layout const & lay = cur.paragraph().layout();
@@ -301,9 +294,24 @@ static bool doInsertInset(Cursor & cur, Text * text,
 
 	bool gotsel = false;
 	if (cur.selection()) {
-		cutSelectionToTemp(cur, false, pastesel);
+		if (cmd.action() == LFUN_INDEX_INSERT)
+			copySelectionToTemp(cur);
+		else {
+			cutSelectionToTemp(cur, pastesel);
+			/* Move layout information inside the inset if the whole
+			 * paragraph and the inset allows setting layout
+			 * FIXME: this does not work as expected when change tracking is on
+			 *   However, we do not really know what to do in this case.
+			 */
+			if (cur.paragraph().empty() && !inset->forcePlainLayout())
+				cur.paragraph().setPlainOrDefaultLayout(bparams.documentClass());
+		}
 		cur.clearSelection();
 		gotsel = true;
+	} else if (cmd.action() == LFUN_INDEX_INSERT) {
+		gotsel = text->selectWordWhenUnderCursor(cur, WHOLE_WORD);
+		copySelectionToTemp(cur);
+		cur.clearSelection();
 	}
 	text->insertInset(cur, inset);
 
@@ -320,24 +328,17 @@ static bool doInsertInset(Cursor & cur, Text * text,
 	InsetText * inset_text = inset->asInsetText();
 	if (inset_text) {
 		inset_text->fixParagraphsFont();
-		if (!inset_text->allowMultiPar() || cur.lastpit() == 0) {
-			// reset first par to default
-			cur.text()->paragraphs().begin()
-				->setPlainOrDefaultLayout(bparams.documentClass());
-			cur.pos() = 0;
-			cur.pit() = 0;
-			// Merge multiple paragraphs -- hack
-			while (cur.lastpit() > 0)
-				mergeParagraph(bparams, cur.text()->paragraphs(), 0);
-			if (cmd.action() == LFUN_FLEX_INSERT)
-				return true;
-			Cursor old = cur;
-			cur.leaveInset(*inset);
-			if (cmd.action() == LFUN_PREVIEW_INSERT
-			    || cmd.action() == LFUN_IPA_INSERT)
-				// trigger preview
-				notifyCursorLeavesOrEnters(old, cur);
-		}
+		cur.pos() = 0;
+		cur.pit() = 0;
+		// FIXME: what does this do?
+		if (cmd.action() == LFUN_FLEX_INSERT)
+			return true;
+		Cursor old = cur;
+		cur.leaveInset(*inset);
+		if (cmd.action() == LFUN_PREVIEW_INSERT
+			|| cmd.action() == LFUN_IPA_INSERT)
+			// trigger preview
+			notifyCursorLeavesOrEnters(old, cur);
 	} else {
 		cur.leaveInset(*inset);
 		// reset surrounding par to default
@@ -351,12 +352,6 @@ static bool doInsertInset(Cursor & cur, Text * text,
 }
 
 
-string const freefont2string()
-{
-	return freefont.toString(toggleall);
-}
-
-
 /// the type of outline operation
 enum OutlineOp {
 	OutlineUp, // Move this header with text down
@@ -540,16 +535,14 @@ static void outline(OutlineOp mode, Cursor & cur, Text * text)
 					continue;
 
 				DocumentClass const & tc = buf.params().documentClass();
-				DocumentClass::const_iterator lit = tc.begin();
-				DocumentClass::const_iterator len = tc.end();
 				int const newtoclevel =
 					(mode == OutlineIn ? toclevel + 1 : toclevel - 1);
 				LabelType const oldlabeltype = start->layout().labeltype;
 
-				for (; lit != len; ++lit) {
-					if (lit->toclevel ==  newtoclevel &&
-					     lit->labeltype == oldlabeltype) {
-						start->setLayout(*lit);
+				for (auto const & lay : tc) {
+					if (lay.toclevel ==  newtoclevel &&
+						 lay.labeltype == oldlabeltype) {
+						start->setLayout(lay);
 						break;
 					}
 				}
@@ -568,18 +561,67 @@ void Text::number(Cursor & cur)
 }
 
 
-bool Text::isRTL(Paragraph const & par) const
+bool Text::isRTL(pit_type const pit) const
 {
 	Buffer const & buffer = owner_->buffer();
-	return par.isRTL(buffer.params());
+	return pars_[pit].isRTL(buffer.params());
 }
 
 
 namespace {
 
-	Language const * getLanguage(Cursor const & cur, string const & lang) {
-		return lang.empty() ? cur.getFont().language() : languages.getLanguage(lang);
+Language const * getLanguage(Cursor const & cur, string const & lang)
+{
+	return lang.empty() ? cur.getFont().language() : languages.getLanguage(lang);
+}
+
+
+docstring resolveLayout(docstring layout, DocIterator const & dit)
+{
+	Paragraph const & par = dit.paragraph();
+	DocumentClass const & tclass = dit.buffer()->params().documentClass();
+
+	if (layout.empty())
+		layout = tclass.defaultLayoutName();
+
+	if (dit.inset().forcePlainLayout(dit.idx()))
+		// in this case only the empty layout is allowed
+		layout = tclass.plainLayoutName();
+	else if (par.usePlainLayout()) {
+		// in this case, default layout maps to empty layout
+		if (layout == tclass.defaultLayoutName())
+			layout = tclass.plainLayoutName();
+	} else {
+		// otherwise, the empty layout maps to the default
+		if (layout == tclass.plainLayoutName())
+			layout = tclass.defaultLayoutName();
+	}
+
+	// If the entry is obsolete, use the new one instead.
+	if (tclass.hasLayout(layout)) {
+		docstring const & obs = tclass[layout].obsoleted_by();
+		if (!obs.empty())
+			layout = obs;
 	}
+	if (!tclass.hasLayout(layout))
+		layout.clear();
+	return layout;
+}
+
+
+bool isAlreadyLayout(docstring const & layout, CursorData const & cur)
+{
+	ParagraphList const & pars = cur.text()->paragraphs();
+
+	pit_type pit = cur.selBegin().pit();
+	pit_type const epit = cur.selEnd().pit() + 1;
+	for ( ; pit != epit; ++pit)
+		if (pars[pit].layout().name() != layout)
+			return false;
+
+	return true;
+}
+
 
 } // namespace
 
@@ -629,7 +671,6 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 	case LFUN_PARAGRAPH_MOVE_DOWN: {
 		pit_type const pit = cur.pit();
 		cur.recordUndo(pit, pit + 1);
-		cur.finishUndo();
 		pars_.swap(pit, pit + 1);
 		needsUpdate = true;
 		cur.forceBufferUpdate();
@@ -674,7 +715,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 
 	case LFUN_WORD_DELETE_FORWARD:
 		if (cur.selection())
-			cutSelection(cur, true, false);
+			cutSelection(cur, false);
 		else
 			deleteWordForward(cur, cmd.getArg(0) == "force");
 		finishChange(cur, false);
@@ -682,7 +723,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 
 	case LFUN_WORD_DELETE_BACKWARD:
 		if (cur.selection())
-			cutSelection(cur, true, false);
+			cutSelection(cur, false);
 		else
 			deleteWordBackward(cur, cmd.getArg(0) == "force");
 		finishChange(cur, false);
@@ -690,7 +731,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 
 	case LFUN_LINE_DELETE_FORWARD:
 		if (cur.selection())
-			cutSelection(cur, true, false);
+			cutSelection(cur, false);
 		else
 			tm->deleteLineForward(cur);
 		finishChange(cur, false);
@@ -883,6 +924,14 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		break;
 	}
 
+	case LFUN_PARAGRAPH_SELECT:
+		if (cur.pos() > 0)
+			needsUpdate |= setCursor(cur, cur.pit(), 0);
+		needsUpdate |= cur.selHandle(true);
+		if (cur.pos() < cur.lastpos())
+			needsUpdate |= setCursor(cur, cur.pit(), cur.lastpos());
+		break;
+
 	case LFUN_PARAGRAPH_UP:
 	case LFUN_PARAGRAPH_UP_SELECT:
 		needsUpdate |= cur.selHandle(cmd.action() == LFUN_PARAGRAPH_UP_SELECT);
@@ -1168,7 +1217,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 			needsUpdate |= erase(cur);
 			cur.resetAnchor();
 		} else {
-			cutSelection(cur, true, false);
+			cutSelection(cur, false);
 			singleParUpdate = false;
 		}
 		moveCursor(cur, false);
@@ -1198,7 +1247,13 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 				}
 			}
 		} else {
-			cutSelection(cur, true, false);
+			DocIterator const dit = cur.selectionBegin();
+			cutSelection(cur, false);
+			if (cur.buffer()->params().track_changes)
+				// since we're doing backwards deletion,
+				// and the selection is not really cut,
+				// move cursor before selection (#11630)
+				cur.setCursor(dit);
 			singleParUpdate = false;
 		}
 		break;
@@ -1212,6 +1267,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		pit_type prev = pit > 0 ? depthHook(pit, par.getDepth()) : pit;
 		if (prev < pit && cur.pos() == par.beginOfBody()
 		    && !par.size() && !par.isEnvSeparator(cur.pos())
+		    && !par.layout().keepempty
 		    && !par.layout().isCommand()
 		    && pars_[prev].layout() != par.layout()
 		    && pars_[prev].layout().isEnvironment()
@@ -1283,7 +1339,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 			}
 			*/
 			if (cur.selection())
-				cutSelection(cur, true, false);
+				cutSelection(cur, false);
 			cur.insert(inset);
 			cur.forceBufferUpdate();
 			if (inset->editable() && inset->asInsetText())
@@ -1469,13 +1525,14 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		}
 
 		bv->buffer().errors("Paste");
+		bv->buffer().updatePreviews(); // bug 11619
 		cur.clearSelection(); // bug 393
 		cur.finishUndo();
 		break;
 	}
 
 	case LFUN_CUT:
-		cutSelection(cur, true, true);
+		cutSelection(cur, true);
 		cur.message(_("Cut"));
 		break;
 
@@ -1507,60 +1564,25 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		cur.message(cur.paragraph().layout().name());
 		break;
 
-	case LFUN_LAYOUT: {
+	case LFUN_LAYOUT:
+	case LFUN_LAYOUT_TOGGLE: {
 		bool const ignoreautonests = cmd.getArg(1) == "ignoreautonests";
-		docstring layout = ignoreautonests ? from_utf8(cmd.getArg(0)) : cmd.argument();
-		LYXERR(Debug::INFO, "LFUN_LAYOUT: (arg) " << to_utf8(layout));
-
-		Paragraph const & para = cur.paragraph();
-		docstring const old_layout = para.layout().name();
-		DocumentClass const & tclass = bv->buffer().params().documentClass();
-
-		if (layout.empty())
-			layout = tclass.defaultLayoutName();
-
-		if (owner_->forcePlainLayout())
-			// in this case only the empty layout is allowed
-			layout = tclass.plainLayoutName();
-		else if (para.usePlainLayout()) {
-			// in this case, default layout maps to empty layout
-			if (layout == tclass.defaultLayoutName())
-				layout = tclass.plainLayoutName();
-		} else {
-			// otherwise, the empty layout maps to the default
-			if (layout == tclass.plainLayoutName())
-				layout = tclass.defaultLayoutName();
-		}
-
-		bool hasLayout = tclass.hasLayout(layout);
-
-		// If the entry is obsolete, use the new one instead.
-		if (hasLayout) {
-			docstring const & obs = tclass[layout].obsoleted_by();
-			if (!obs.empty())
-				layout = obs;
-		}
+		docstring req_layout = ignoreautonests ? from_utf8(cmd.getArg(0)) : cmd.argument();
+		LYXERR(Debug::INFO, "LFUN_LAYOUT: (arg) " << to_utf8(req_layout));
 
-		if (!hasLayout) {
-			cur.errorMessage(from_utf8(N_("Layout ")) + cmd.argument() +
+		docstring layout = resolveLayout(req_layout, cur);
+		if (layout.empty()) {
+			cur.errorMessage(from_utf8(N_("Layout ")) + req_layout +
 				from_utf8(N_(" not known")));
 			break;
 		}
 
-		bool change_layout = (old_layout != layout);
+		docstring const old_layout = cur.paragraph().layout().name();
+		bool change_layout = !isAlreadyLayout(layout, cur);
 
-		if (!change_layout && cur.selection() &&
-			cur.selBegin().pit() != cur.selEnd().pit())
-		{
-			pit_type spit = cur.selBegin().pit();
-			pit_type epit = cur.selEnd().pit() + 1;
-			while (spit != epit) {
-				if (pars_[spit].layout().name() != old_layout) {
-					change_layout = true;
-					break;
-				}
-				++spit;
-			}
+		if (cmd.action() == LFUN_LAYOUT_TOGGLE && !change_layout) {
+			change_layout = true;
+			layout = resolveLayout(docstring(), cur);
 		}
 
 		if (change_layout) {
@@ -1576,14 +1598,20 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 			}
 		}
 
-		Layout::LaTeXArgMap args = tclass[layout].args();
-		Layout::LaTeXArgMap::const_iterator lait = args.begin();
-		Layout::LaTeXArgMap::const_iterator const laend = args.end();
-		for (; lait != laend; ++lait) {
-			Layout::latexarg arg = (*lait).second;
+		DocumentClass const & tclass = bv->buffer().params().documentClass();
+		bool inautoarg = false;
+		for (auto const & la_pair : tclass[layout].args()) {
+			Layout::latexarg const & arg = la_pair.second;
 			if (arg.autoinsert) {
-				FuncRequest cmd2(LFUN_ARGUMENT_INSERT, (*lait).first);
+				// If we had already inserted an arg automatically,
+				// leave this now in order to insert the next one.
+				if (inautoarg) {
+					cur.leaveInset(cur.inset());
+					cur.posForward();
+				}
+				FuncRequest const cmd2(LFUN_ARGUMENT_INSERT, la_pair.first);
 				lyx::dispatch(cmd2);
+				inautoarg = true;
 			}
 		}
 
@@ -1660,8 +1688,13 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 			DocIterator scur = cur;
 			depth_type const max_depth = cur.paragraph().params().depth() + 1;
 			cur.forwardPar();
-			while (cur.paragraph().params().depth() < min(nextpar_depth, max_depth))
+			while (cur.paragraph().params().depth() < min(nextpar_depth, max_depth)) {
+				depth_type const olddepth = cur.paragraph().params().depth();
 				lyx::dispatch(FuncRequest(LFUN_DEPTH_INCREMENT));
+				if (olddepth == cur.paragraph().params().depth())
+					// leave loop if no incrementation happens
+					break;
+			}
 			cur.setCursor(scur);
 		}
 
@@ -1696,26 +1729,6 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		bv->buffer().errors("Paste");
 		break;
 
-	case LFUN_UNICODE_INSERT: {
-		if (cmd.argument().empty())
-			break;
-		// splits on whitespace
-		vector<docstring> args =
-			getVectorFromString(cmd.argument(), from_ascii(" "), false, true);
-		for (auto const & arg : args) {
-			if (!isHex(arg)) {
-				LYXERR0("Not a hexstring: " << arg);
-				continue;
-			}
-			char_type c = hexToInt(arg);
-			if (c >= 32 && c < 0x10ffff) {
-				LYXERR(Debug::KEY, "Inserting c: " << c);
-				lyx::dispatch(FuncRequest(LFUN_SELF_INSERT, docstring(1, c)));
-			}
-		}
-		break;
-	}
-
 	case LFUN_QUOTE_INSERT: {
 		cap::replaceSelection(cur);
 		cur.recordUndo();
@@ -1767,19 +1780,14 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		break;
 	}
 
-	case LFUN_DATE_INSERT: {
-		string const format = cmd.argument().empty()
-			? lyxrc.date_insert_format : to_utf8(cmd.argument());
-		string const time = formatted_time(current_time(), format);
-		lyx::dispatch(FuncRequest(LFUN_SELF_INSERT, time));
-		break;
-	}
-
 	case LFUN_MOUSE_TRIPLE:
 		if (cmd.button() == mouse_button::button1) {
-			tm->cursorHome(cur);
+			if (cur.pos() > 0)
+				setCursor(cur, cur.pit(), 0);
+			bv->cursor() = cur;
 			cur.resetAnchor();
-			tm->cursorEnd(cur);
+			if (cur.pos() < cur.lastpos())
+				setCursor(cur, cur.pit(), cur.lastpos());
 			cur.setSelection();
 			bv->cursor() = cur;
 		}
@@ -1937,14 +1945,11 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		// true (on).
 
 		if (lyxrc.auto_region_delete && cur.selection())
-			cutSelection(cur, false, false);
-
+			cutSelection(cur, false);
 		cur.clearSelection();
 
-		docstring::const_iterator cit = cmd.argument().begin();
-		docstring::const_iterator const end = cmd.argument().end();
-		for (; cit != end; ++cit)
-			bv->translateAndInsert(*cit, this, cur);
+		for (char_type c : cmd.argument())
+			bv->translateAndInsert(c, this, cur);
 
 		cur.resetAnchor();
 		moveCursor(cur, false);
@@ -2017,22 +2022,18 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 	}
 
 	case LFUN_INFO_INSERT: {
-		Inset * inset;
-		if (cmd.argument().empty() && cur.selection()) {
-			// if command argument is empty use current selection as parameter.
-			docstring ds = cur.selectionAsString(false);
-			cutSelection(cur, true, false);
-			FuncRequest cmd0(cmd, ds);
-			inset = createInset(cur.buffer(), cmd0);
+		if (cmd.argument().empty()) {
+			bv->showDialog("info", cur.current_font.language()->lang());
 		} else {
+			Inset * inset;
 			inset = createInset(cur.buffer(), cmd);
+			if (!inset)
+				break;
+			cur.recordUndo();
+			insertInset(cur, inset);
+			cur.forceBufferUpdate();
+			cur.posForward();
 		}
-		if (!inset)
-			break;
-		cur.recordUndo();
-		insertInset(cur, inset);
-		cur.forceBufferUpdate();
-		cur.posForward();
 		break;
 	}
 	case LFUN_CAPTION_INSERT:
@@ -2053,6 +2054,16 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		// inside it.
 		doInsertInset(cur, this, cmd, true, true);
 		cur.posForward();
+		if (act == LFUN_SCRIPT_INSERT) {
+			/* Script insets change the font style in metrics(), and
+			 * this is used to compute the height of the caret
+			 * (because the font is stored in TextMetrics::font_).
+			 * When we insert, we have to make sure that metrics are
+			 * computed so that the caret height is wrong. Arguably,
+			 * this is hackish.*/
+			bv->processUpdateFlags(Update::SinglePar);
+		}
+		cur.setCurrentFont();
 		// Some insets are numbered, others are shown in the outline pane so
 		// let's update the labels and the toc backend.
 		cur.forceBufferUpdate();
@@ -2064,18 +2075,31 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		bool const sel = cur.selection();
 		doInsertInset(cur, this, cmd, true, true);
 		// Insert auto-insert arguments
-		bool autoargs = false;
-		Layout::LaTeXArgMap args = cur.inset().getLayout().latexargs();
-		Layout::LaTeXArgMap::const_iterator lait = args.begin();
-		Layout::LaTeXArgMap::const_iterator const laend = args.end();
-		for (; lait != laend; ++lait) {
-			Layout::latexarg arg = (*lait).second;
+		bool autoargs = false, inautoarg = false;
+		Layout::LaTeXArgMap args = cur.inset().getLayout().args();
+		for (auto const & argt : args) {
+			Layout::latexarg arg = argt.second;
+			if (!inautoarg && arg.insertonnewline && cur.pos() > 0) {
+				FuncRequest cmd2(LFUN_PARAGRAPH_BREAK);
+				lyx::dispatch(cmd2);
+			}
 			if (arg.autoinsert) {
 				// The cursor might have been invalidated by the replaceSelection.
 				cur.buffer()->changed(true);
-				FuncRequest cmd2(LFUN_ARGUMENT_INSERT, (*lait).first);
+				// If we had already inserted an arg automatically,
+				// leave this now in order to insert the next one.
+				if (inautoarg) {
+					cur.leaveInset(cur.inset());
+					cur.posForward();
+					if (arg.insertonnewline && cur.pos() > 0) {
+						FuncRequest cmd2(LFUN_PARAGRAPH_BREAK);
+						lyx::dispatch(cmd2);
+					}
+				}
+				FuncRequest cmd2(LFUN_ARGUMENT_INSERT, argt.first);
 				lyx::dispatch(cmd2);
 				autoargs = true;
+				inautoarg = true;
 			}
 		}
 		if (!autoargs) {
@@ -2089,14 +2113,78 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		break;
 	}
 
-	case LFUN_TABULAR_INSERT:
+	case LFUN_TABULAR_INSERT: {
 		// if there were no arguments, just open the dialog
+		if (cmd.argument().empty()) {
+			bv->showDialog("tabularcreate");
+			break;
+		} else if (cur.buffer()->masterParams().tablestyle != "default"
+			   || bv->buffer().params().documentClass().tablestyle() != "default") {
+			string tabstyle = cur.buffer()->masterParams().tablestyle;
+			if (tabstyle == "default")
+				tabstyle = bv->buffer().params().documentClass().tablestyle();
+			if (!libFileSearch("tabletemplates", tabstyle + ".lyx").empty()) {
+				FuncRequest fr(LFUN_TABULAR_STYLE_INSERT,
+					       tabstyle + " " + to_ascii(cmd.argument()));
+				lyx::dispatch(fr);
+				break;
+			} else
+				// Unknown style. Report and fall back to default.
+				cur.errorMessage(from_utf8(N_("Table Style ")) + from_utf8(tabstyle) +
+						     from_utf8(N_(" not known")));
+			
+		}
 		if (doInsertInset(cur, this, cmd, false, true))
 			cur.posForward();
-		else
-			bv->showDialog("tabularcreate");
+		break;
+	}
 
+	case LFUN_TABULAR_STYLE_INSERT: {
+		string const style = cmd.getArg(0);
+		string const rows = cmd.getArg(1);
+		string const cols = cmd.getArg(2);
+		if (cols.empty() || !isStrInt(cols)
+		    || rows.empty() || !isStrInt(rows))
+			break;
+		int const r = convert<int>(rows);
+		int const c = convert<int>(cols);
+			
+		string suffix;
+		if (r == 1)
+			suffix = "_1x1";
+		else if (r == 2)
+			suffix = "_1x2";
+		FileName const tabstyle = libFileSearch("tabletemplates",
+							style + suffix + ".lyx", "lyx");
+		if (tabstyle.empty())
+			    break;
+		UndoGroupHelper ugh(cur.buffer());
+		cur.recordUndo();
+		FuncRequest cmd2(LFUN_FILE_INSERT, tabstyle.absFileName() + " ignorelang");
+		lyx::dispatch(cmd2);
+		// go into table
+		cur.backwardPos();
+		if (r > 2) {
+			// move one cell up to middle cell
+			cur.up();
+			// add the missing rows
+			int const addrows = r - 3;
+			for (int i = 0 ; i < addrows ; ++i) {
+				FuncRequest fr(LFUN_TABULAR_FEATURE, "append-row");
+				lyx::dispatch(fr);
+			}
+		}
+		// add the missing columns
+		int const addcols = c - 1;
+		for (int i = 0 ; i < addcols ; ++i) {
+			FuncRequest fr(LFUN_TABULAR_FEATURE, "append-column");
+			lyx::dispatch(fr);
+		}
+		if (r > 1)
+			// go to first cell
+			cur.up();
 		break;
+	}
 
 	case LFUN_FLOAT_INSERT:
 	case LFUN_FLOAT_WIDE_INSERT:
@@ -2153,9 +2241,11 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 
 	case LFUN_NOMENCL_INSERT: {
 		InsetCommandParams p(NOMENCL_CODE);
-		if (cmd.argument().empty())
-			p["symbol"] = bv->cursor().innerText()->getStringToIndex(bv->cursor());
-		else
+		if (cmd.argument().empty()) {
+			p["symbol"] = 
+				bv->cursor().innerText()->getStringForDialog(bv->cursor());
+			cur.clearSelection();
+		} else
 			p["symbol"] = cmd.argument();
 		string const data = InsetCommand::params2string(p);
 		bv->showDialog("nomenclature", data);
@@ -2381,27 +2471,51 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		selectWordWhenUnderCursor(cur, WHOLE_WORD_STRICT);
 		Font font(ignore_font, lang);
 		toggleAndShow(cur, this, font, toggle);
+		// We need a buffer update if we change the language
+		// of an info inset
+		if (cur.insetInSelection(INFO_CODE))
+			cur.forceBufferUpdate();
 		break;
 	}
 
-	case LFUN_TEXTSTYLE_APPLY:
-		toggleAndShow(cur, this, freefont, toggleall);
-		cur.message(_("Character set"));
+	case LFUN_TEXTSTYLE_APPLY: {
+		unsigned int num = 0;
+		string const arg = to_utf8(cmd.argument());
+		// Argument?
+		if (!arg.empty()) {
+			if (isStrUnsignedInt(arg)) {
+				num = convert<uint>(arg);
+				if (num >= freeFonts.size()) {
+					cur.message(_("Invalid argument (number exceeds stack size)!"));
+					break;
+				}
+			} else {
+				cur.message(_("Invalid argument (must be a non-negative number)!"));
+				break;
+			}
+		}
+		toggleAndShow(cur, this, freeFonts[num].second, toggleall);
+		cur.message(bformat(_("Text properties applied: %1$s"), freeFonts[num].first));
 		break;
+	}
 
 	// Set the freefont using the contents of \param data dispatched from
 	// the frontends and apply it at the current cursor location.
 	case LFUN_TEXTSTYLE_UPDATE: {
-		Font font;
+		Font font(ignore_font, ignore_language);
 		bool toggle;
 		if (font.fromString(to_utf8(cmd.argument()), toggle)) {
-			freefont = font;
+			docstring const props = font.stateText(&bv->buffer().params(), true);
+			freeFonts.push(make_pair(props, font));
 			toggleall = toggle;
-			toggleAndShow(cur, this, freefont, toggleall);
-			cur.message(_("Character set"));
-		} else {
-			lyxerr << "Argument not ok";
-		}
+			toggleAndShow(cur, this, font, toggleall);
+			// We need a buffer update if we change the language
+			// of an info inset
+			if (cur.insetInSelection(INFO_CODE))
+				cur.forceBufferUpdate();
+			cur.message(bformat(_("Text properties applied: %1$s"), props));
+		} else
+			LYXERR0("Invalid argument of textstyle-update");
 		break;
 	}
 
@@ -2488,7 +2602,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		if (tclass.floats().typeExist(to_utf8(cmd.argument()))) {
 			cur.recordUndo();
 			if (cur.selection())
-				cutSelection(cur, true, false);
+				cutSelection(cur, false);
 			breakParagraph(cur);
 
 			if (cur.lastpos() != 0) {
@@ -2645,19 +2759,23 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 		}
 		break;
 
-	case LFUN_OUTLINE_UP:
+	case LFUN_OUTLINE_UP: {
+		pos_type const opos = cur.pos();
 		outline(OutlineUp, cur, this);
-		setCursor(cur, cur.pit(), 0);
+		setCursor(cur, cur.pit(), opos);
 		cur.forceBufferUpdate();
 		needsUpdate = true;
 		break;
+	}
 
-	case LFUN_OUTLINE_DOWN:
+	case LFUN_OUTLINE_DOWN: {
+		pos_type const opos = cur.pos();
 		outline(OutlineDown, cur, this);
-		setCursor(cur, cur.pit(), 0);
+		setCursor(cur, cur.pit(), opos);
 		cur.forceBufferUpdate();
 		needsUpdate = true;
 		break;
+	}
 
 	case LFUN_OUTLINE_IN:
 		outline(OutlineIn, cur, this);
@@ -2769,7 +2887,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 	bool enable = true;
 	bool allow_in_passthru = false;
 	InsetCode code = NO_CODE;
-
+	
 	switch (cmd.action()) {
 
 	case LFUN_DEPTH_DECREMENT:
@@ -2859,6 +2977,9 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 	case LFUN_TABULAR_INSERT:
 		code = TABULAR_CODE;
 		break;
+	case LFUN_TABULAR_STYLE_INSERT:
+		code = TABULAR_CODE;
+		break;
 	case LFUN_MARGINALNOTE_INSERT:
 		code = MARGIN_CODE;
 		break;
@@ -2931,11 +3052,6 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 	}
 	case LFUN_NOTE_INSERT:
 		code = NOTE_CODE;
-		// in commands (sections etc.) and description items,
-		// only Notes are allowed
-		enable = (cmd.argument().empty() || cmd.getArg(0) == "Note" ||
-			  (!cur.paragraph().layout().isCommand()
-			   && !inDescriptionItem(cur)));
 		break;
 	case LFUN_FLEX_INSERT: {
 		code = FLEX_CODE;
@@ -2969,6 +3085,8 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 		break;
 	case LFUN_INFO_INSERT:
 		code = INFO_CODE;
+		enable = cmd.argument().empty()
+			|| infoparams.validateArgument(cur.buffer(), cmd.argument(), true);
 		break;
 	case LFUN_ARGUMENT_INSERT: {
 		code = ARG_CODE;
@@ -3219,17 +3337,41 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 
 	case LFUN_CHANGE_ACCEPT:
 	case LFUN_CHANGE_REJECT:
-		// In principle, these LFUNs should only be enabled if there
-		// is a change at the current position/in the current selection.
-		// However, without proper optimizations, this will inevitably
-		// result in unacceptable performance - just imagine a user who
-		// wants to select the complete content of a long document.
 		if (!cur.selection())
 			enable = cur.paragraph().isChanged(cur.pos());
-		else
-			// TODO: context-sensitive enabling of LFUN_CHANGE_ACCEPT/REJECT
-			// for selections.
-			enable = true;
+		else {
+			// will enable if there is a change in the selection
+			enable = false;
+
+			// cheap improvement for efficiency: using cached
+			// buffer variable, if there is no change in the
+			// document, no need to check further.
+			if (!cur.buffer()->areChangesPresent())
+				break;
+
+			for (DocIterator it = cur.selectionBegin(); ; it.forwardPar()) {
+				pos_type const beg = it.pos();
+				pos_type end;
+				bool const in_last_par = (it.pit() == cur.selectionEnd().pit() &&
+							  it.idx() == cur.selectionEnd().idx());
+				if (in_last_par)
+					end = cur.selectionEnd().pos();
+				else
+					// the +1 is needed for cases, e.g., where there is a
+					// paragraph break. See #11629.
+					end = it.lastpos() + 1;
+				if (beg != end && it.paragraph().isChanged(beg, end)) {
+					enable = true;
+					break;
+				}
+				if (beg != end && it.paragraph().hasChangedInsets(beg, end)) {
+					enable = true;
+					break;
+				}
+				if (in_last_par)
+					break;
+			}
+		}
 		break;
 
 	case LFUN_OUTLINE_UP:
@@ -3272,13 +3414,6 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 		enable = !inDescriptionItem(cur);
 		break;
 
-	case LFUN_DATE_INSERT: {
-		string const format = cmd.argument().empty()
-			? lyxrc.date_insert_format : to_utf8(cmd.argument());
-		enable = support::os::is_valid_strftime(format);
-		break;
-	}
-
 	case LFUN_LANGUAGE:
 		enable = !cur.paragraph().isPassThru();
 		flag.setOnOff(cmd.getArg(0) == cur.real_current_font.language()->lang());
@@ -3291,23 +3426,22 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 	case LFUN_SPELLING_ADD:
 	case LFUN_SPELLING_IGNORE:
 	case LFUN_SPELLING_REMOVE:
-		enable = theSpellChecker() != NULL;
+		enable = theSpellChecker() != nullptr;
 		if (enable && !cmd.getArg(1).empty()) {
 			// validate explicitly given language
 			Language const * const lang = const_cast<Language *>(languages.getLanguage(cmd.getArg(1)));
-			enable &= lang != NULL;
+			enable &= lang != nullptr;
 		}
 		break;
 
-	case LFUN_LAYOUT: {
-		DocumentClass const & tclass = cur.buffer()->params().documentClass();
+	case LFUN_LAYOUT:
+	case LFUN_LAYOUT_TOGGLE: {
 		bool const ignoreautonests = cmd.getArg(1) == "ignoreautonests";
-		docstring layout = ignoreautonests ? from_utf8(cmd.getArg(0)) : cmd.argument();
-		if (layout.empty())
-			layout = tclass.defaultLayoutName();
-		enable = !owner_->forcePlainLayout() && tclass.hasLayout(layout);
+		docstring const req_layout = ignoreautonests ? from_utf8(cmd.getArg(0)) : cmd.argument();
+		docstring const layout = resolveLayout(req_layout, cur);
 
-		flag.setOnOff(layout == cur.paragraph().layout().name());
+		enable = !owner_->forcePlainLayout() && !layout.empty();
+		flag.setOnOff(isAlreadyLayout(layout, cur));
 		break;
 	}
 
@@ -3379,7 +3513,6 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 	case LFUN_ACCENT_UMLAUT:
 	case LFUN_ACCENT_UNDERBAR:
 	case LFUN_ACCENT_UNDERDOT:
-	case LFUN_FONT_DEFAULT:
 	case LFUN_FONT_FRAK:
 	case LFUN_FONT_SIZE:
 	case LFUN_FONT_STATE:
@@ -3388,11 +3521,46 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 	case LFUN_FONT_CROSSOUT:
 	case LFUN_FONT_UNDERUNDERLINE:
 	case LFUN_FONT_UNDERWAVE:
-	case LFUN_TEXTSTYLE_APPLY:
 	case LFUN_TEXTSTYLE_UPDATE:
 		enable = !cur.paragraph().isPassThru();
 		break;
 
+	case LFUN_FONT_DEFAULT: {
+		Font font(inherit_font, ignore_language);
+		BufferParams const & bp = cur.buffer()->masterParams();
+		if (cur.selection()) {
+			enable = false;
+			// Check if we have a non-default font attribute
+			// in the selection range.
+			DocIterator const from = cur.selectionBegin();
+			DocIterator const to = cur.selectionEnd();
+			for (DocIterator dit = from ; dit != to && !dit.atEnd(); ) {
+				if (!dit.inTexted()) {
+					dit.forwardPos();
+					continue;
+				}
+				Paragraph const & par = dit.paragraph();
+				pos_type const pos = dit.pos();
+				Font tmp = par.getFontSettings(bp, pos);
+				if (tmp.fontInfo() != font.fontInfo()
+				    || tmp.language() != bp.language) {
+					enable = true;
+					break;
+				}
+				dit.forwardPos();
+			}
+			break;
+		}
+		// Disable if all is default already.
+		enable = (cur.current_font.fontInfo() != font.fontInfo()
+			  || cur.current_font.language() != bp.language);
+		break;
+	}
+
+	case LFUN_TEXTSTYLE_APPLY:
+		enable = !freeFonts.empty();
+		break;
+
 	case LFUN_WORD_DELETE_FORWARD:
 	case LFUN_WORD_DELETE_BACKWARD:
 	case LFUN_LINE_DELETE_FORWARD:
@@ -3412,6 +3580,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 	case LFUN_UP_SELECT:
 	case LFUN_DOWN:
 	case LFUN_DOWN_SELECT:
+	case LFUN_PARAGRAPH_SELECT:
 	case LFUN_PARAGRAPH_UP_SELECT:
 	case LFUN_PARAGRAPH_DOWN_SELECT:
 	case LFUN_LINE_BEGIN_SELECT:
@@ -3465,6 +3634,12 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
 		break;
 	}
 
+	case LFUN_SEARCH_IGNORE: {
+		bool const value = cmd.getArg(1) == "true";
+		setIgnoreFormat(cmd.getArg(0), value);
+		break;
+	}
+
 	default:
 		return false;
 	}
@@ -3510,4 +3685,15 @@ bool Text::inDescriptionItem(Cursor & cur) const
 		    && (pos == 0 || par.getChar(pos - 1) != ' ')));
 }
 
+
+std::vector<docstring> Text::getFreeFonts() const
+{
+	vector<docstring> ffList;
+
+	for (auto const & f : freeFonts)
+		ffList.push_back(f.first);
+
+	return ffList;
+}
+
 } // namespace lyx