X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCursor.cpp;h=e08793c393f2ed8c88c2ffb615bfbd95094189d3;hb=225c1dbe55635a97b183909ea7194b8d92051378;hp=f6d10cbc972ab2ca43f0180943e645f791c933c3;hpb=07924ac300f68eaf4825951af6a6ac3c14d6edd6;p=lyx.git

diff --git a/src/Cursor.cpp b/src/Cursor.cpp
index f6d10cbc97..e08793c393 100644
--- a/src/Cursor.cpp
+++ b/src/Cursor.cpp
@@ -26,6 +26,7 @@
 #include "FuncCode.h"
 #include "FuncRequest.h"
 #include "Language.h"
+#include "Layout.h"
 #include "LyXAction.h"
 #include "LyXRC.h"
 #include "Paragraph.h"
@@ -153,7 +154,7 @@ bool bruteFind(Cursor & cursor,
 	else
 		++et.pit();
 
-	double best_dist = numeric_limits<double>::max();;
+	double best_dist = numeric_limits<double>::max();
 	DocIterator best_cursor = et;
 
 	for ( ; it != et; it.forwardPos(true)) {
@@ -332,10 +333,11 @@ void Cursor::dispatch(FuncRequest const & cmd0)
 	fixIfBroken();
 	FuncRequest cmd = cmd0;
 	Cursor safe = *this;
+	Cursor old = *this;
 	disp_ = DispatchResult();
 
 	buffer()->undo().beginUndoGroup();
-	
+
 	// Is this a function that acts on inset at point?
 	if (lyxaction.funcHasFlag(cmd.action(), LyXAction::AtPoint)
 	    && nextInset()) {
@@ -392,6 +394,18 @@ void Cursor::dispatch(FuncRequest const & cmd0)
 		beforeDispatchCursor_ = safe.beforeDispatchCursor_;
 	}
 	buffer()->undo().endUndoGroup();
+
+	// notify insets we just left
+	if (*this != old) {
+		old.beginUndoGroup();
+		old.fixIfBroken();
+		bool badcursor = notifyCursorLeavesOrEnters(old, *this);
+		if (badcursor) {
+			fixIfBroken();
+			bv().fixInlineCompletionPos();
+		}
+		old.endUndoGroup();
+	}
 }
 
 
@@ -1352,6 +1366,15 @@ void Cursor::niceInsert(MathAtom const & t)
 		MathData ar(buffer());
 		asArray(safe, ar);
 		insert(ar);
+	} else if (t->asMacro() && !safe.empty()) {
+		MathData ar(buffer());
+		asArray(safe, ar);
+		docstring const name = t->asMacro()->name();
+		MacroData const * data = buffer()->getMacro(name);
+		if (data && data->numargs() - data->optionals() > 0) {
+			plainInsert(MathAtom(new InsetMathBrace(ar)));
+			posBackward();
+		}
 	}
 }
 
@@ -2016,15 +2039,18 @@ void Cursor::errorMessage(docstring const & msg) const
 }
 
 
-static docstring parbreak(InsetCode code)
+namespace {
+docstring parbreak(Cursor const * cur)
 {
 	odocstringstream os;
 	os << '\n';
-	// only add blank line if we're not in an ERT or Listings inset
-	if (code != ERT_CODE && code != LISTINGS_CODE)
+	// only add blank line if we're not in a ParbreakIsNewline situation
+	if (!cur->inset().getLayout().parbreakIsNewline() 
+	    && !cur->paragraph().layout().parbreak_is_newline)
 		os << '\n';
 	return os.str();
 }
+}
 
 
 docstring Cursor::selectionAsString(bool with_label) const
@@ -2060,13 +2086,13 @@ docstring Cursor::selectionAsString(bool with_label) const
 	// First paragraph in selection
 	docstring result = pars[startpit].
 		asString(startpos, pars[startpit].size(), label)
-		+ parbreak(inset().lyxCode());
+		+ parbreak(this);
 
 	// The paragraphs in between (if any)
 	for (pit_type pit = startpit + 1; pit != endpit; ++pit) {
 		Paragraph const & par = pars[pit];
 		result += par.asString(0, par.size(), label)
-			+ parbreak(inset().lyxCode());
+			+ parbreak(this);
 	}
 
 	// Last paragraph in selection
@@ -2345,9 +2371,9 @@ void Cursor::recordUndo(UndoKind kind) const
 }
 
 
-void Cursor::recordUndoInset(UndoKind kind) const
+void Cursor::recordUndoInset(UndoKind kind, Inset const * inset) const
 {
-	buffer()->undo().recordUndoInset(*this, kind);
+	buffer()->undo().recordUndoInset(*this, kind, inset);
 }