X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FText2.cpp;h=d7d4319d0f715ed85d3f4e0a01f9adb80a27f714;hb=28be7d552f62cc02fa86d7f79201d089bfb2d7b5;hp=0c96a81a2166bd68caf4d45147764f8b3b851b05;hpb=0a6ff99f28686066675848f3410f77c0947bc357;p=lyx.git

diff --git a/src/Text2.cpp b/src/Text2.cpp
index 0c96a81a21..d7d4319d0f 100644
--- a/src/Text2.cpp
+++ b/src/Text2.cpp
@@ -22,7 +22,6 @@
 
 #include "Text.h"
 
-#include "Bidi.h"
 #include "Buffer.h"
 #include "buffer_funcs.h"
 #include "BufferList.h"
@@ -50,10 +49,9 @@
 #include "support/lassert.h"
 #include "support/debug.h"
 #include "support/gettext.h"
+#include "support/lyxalgo.h"
 #include "support/textutils.h"
 
-#include <boost/next_prior.hpp>
-
 #include <sstream>
 
 using namespace std;
@@ -200,6 +198,7 @@ void Text::setLayout(Cursor & cur, docstring const & layout)
 	pit_type end = cur.selEnd().pit() + 1;
 	cur.recordUndoSelection();
 	setLayout(start, end, layout);
+	cur.setCurrentFont();
 	cur.forceBufferUpdate();
 }
 
@@ -264,6 +263,11 @@ void Text::changeDepth(Cursor & cur, DEPTH_CHANGE type)
 void Text::setFont(Cursor & cur, Font const & font, bool toggleall)
 {
 	LASSERT(this == cur.text(), return);
+
+	// If there is a selection, record undo before the cursor font is changed.
+	if (cur.selection())
+		cur.recordUndoSelection();
+
 	// Set the current_font
 	// Determine basis font
 	FontInfo layoutfont;
@@ -289,7 +293,6 @@ void Text::setFont(Cursor & cur, Font const & font, bool toggleall)
 		return;
 
 	// Ok, we have a selection.
-	cur.recordUndoSelection();
 	Font newfont = font;
 
 	if (toggleall) {	
@@ -334,6 +337,8 @@ void Text::setFont(Cursor & cur, Font const & font, bool toggleall)
 			newfi.setUnderbar(oldfi.underbar() == FONT_OFF ? FONT_ON : FONT_OFF);
 		if (newfi.strikeout() == FONT_TOGGLE)
 			newfi.setStrikeout(oldfi.strikeout() == FONT_OFF ? FONT_ON : FONT_OFF);
+		if (newfi.xout() == FONT_TOGGLE)
+			newfi.setXout(oldfi.xout() == FONT_OFF ? FONT_ON : FONT_OFF);
 		if (newfi.uuline() == FONT_TOGGLE)
 			newfi.setUuline(oldfi.uuline() == FONT_OFF ? FONT_ON : FONT_OFF);
 		if (newfi.uwave() == FONT_TOGGLE)
@@ -391,7 +396,7 @@ bool Text::cursorTop(Cursor & cur)
 bool Text::cursorBottom(Cursor & cur)
 {
 	LBUFERR(this == cur.text());
-	return setCursor(cur, cur.lastpit(), boost::prior(paragraphs().end())->size());
+	return setCursor(cur, cur.lastpit(), prev(paragraphs().end(), 1)->size());
 }
 
 
@@ -480,7 +485,7 @@ void Text::setLabelWidthStringToSequence(Cursor const & cur,
 }
 
 
-void Text::setParagraphs(Cursor & cur, docstring arg, bool merge) 
+void Text::setParagraphs(Cursor & cur, docstring arg, bool merge)
 {
 	LBUFERR(cur.text());
 
@@ -498,7 +503,7 @@ void Text::setParagraphs(Cursor & cur, docstring arg, bool merge)
 		// with same layout in a sequence.
 		// Do this only once for a selected range of paragraphs
 		// of the same layout and depth.
-		cur.recordUndo();
+		c.recordUndo();
 		par.params().apply(params, par.layout());
 		if (par.getDepth() != priordepth || par.layout() != priorlayout)
 			setLabelWidthStringToSequence(c, params.labelWidthString());
@@ -508,7 +513,7 @@ void Text::setParagraphs(Cursor & cur, docstring arg, bool merge)
 }
 
 
-void Text::setParagraphs(Cursor & cur, ParagraphParameters const & p) 
+void Text::setParagraphs(Cursor & cur, ParagraphParameters const & p)
 {
 	LBUFERR(cur.text());
 
@@ -544,47 +549,23 @@ void Text::insertInset(Cursor & cur, Inset * inset)
 }
 
 
-bool Text::setCursor(Cursor & cur, pit_type par, pos_type pos,
+bool Text::setCursor(Cursor & cur, pit_type pit, pos_type pos,
 			bool setfont, bool boundary)
 {
 	TextMetrics const & tm = cur.bv().textMetrics(this);
-	bool const update_needed = !tm.contains(par);
+	bool const update_needed = !tm.contains(pit);
 	Cursor old = cur;
-	setCursorIntern(cur, par, pos, setfont, boundary);
+	setCursorIntern(cur, pit, pos, setfont, boundary);
 	return cur.bv().checkDepm(cur, old) || update_needed;
 }
 
 
-void Text::setCursor(CursorSlice & cur, pit_type par, pos_type pos)
-{
-	LASSERT(par != int(paragraphs().size()), return);
-	cur.pit() = par;
-	cur.pos() = pos;
-
-	// now some strict checking
-	Paragraph & para = getPar(par);
-
-	// None of these should happen, but we're scaredy-cats
-	if (pos < 0) {
-		LYXERR0("Don't like -1!");
-		LATTEST(false);
-	}
-
-	if (pos > para.size()) {
-		LYXERR0("Don't like 1, pos: " << pos
-		       << " size: " << para.size()
-		       << " par: " << par);
-		LATTEST(false);
-	}
-}
-
-
-void Text::setCursorIntern(Cursor & cur,
-			      pit_type par, pos_type pos, bool setfont, bool boundary)
+void Text::setCursorIntern(Cursor & cur, pit_type pit, pos_type pos,
+                           bool setfont, bool boundary)
 {
 	LBUFERR(this == cur.text());
 	cur.boundary(boundary);
-	setCursor(cur.top(), par, pos);
+	cur.top().setPitPos(pit, pos);
 	if (setfont)
 		cur.setCurrentFont();
 }
@@ -592,8 +573,6 @@ void Text::setCursorIntern(Cursor & cur,
 
 bool Text::checkAndActivateInset(Cursor & cur, bool front)
 {
-	if (cur.selection())
-		return false;
 	if (front && cur.pos() == cur.lastpos())
 		return false;
 	if (!front && cur.pos() == 0)
@@ -601,6 +580,8 @@ bool Text::checkAndActivateInset(Cursor & cur, bool front)
 	Inset * inset = front ? cur.nextInset() : cur.prevInset();
 	if (!inset || !inset->editable())
 		return false;
+	if (cur.selection() && cur.realAnchor().find(inset) == -1)
+		return false;
 	/*
 	 * Apparently, when entering an inset we are expected to be positioned
 	 * *before* it in the containing paragraph, regardless of the direction
@@ -611,14 +592,14 @@ bool Text::checkAndActivateInset(Cursor & cur, bool front)
 	if (!front)
 		--cur.pos();
 	inset->edit(cur, front);
+	cur.setCurrentFont();
+	cur.boundary(false);
 	return true;
 }
 
 
 bool Text::checkAndActivateInsetVisual(Cursor & cur, bool movingForward, bool movingLeft)
 {
-	if (cur.selection())
-		return false;
 	if (cur.pos() == -1)
 		return false;
 	if (cur.pos() == cur.lastpos())
@@ -627,8 +608,12 @@ bool Text::checkAndActivateInsetVisual(Cursor & cur, bool movingForward, bool mo
 	Inset * inset = par.isInset(cur.pos()) ? par.getInset(cur.pos()) : 0;
 	if (!inset || !inset->editable())
 		return false;
+	if (cur.selection() && cur.realAnchor().find(inset) == -1)
+		return false;
 	inset->edit(cur, movingForward, 
 		movingLeft ? Inset::ENTRY_DIRECTION_RIGHT : Inset::ENTRY_DIRECTION_LEFT);
+	cur.setCurrentFont();
+	cur.boundary(false);
 	return true;
 }
 
@@ -656,6 +641,7 @@ bool Text::cursorBackward(Cursor & cur)
 				cur.textRow().pos() == cur.pos() &&
 				!cur.paragraph().isLineSeparator(cur.pos() - 1) &&
 				!cur.paragraph().isNewline(cur.pos() - 1) &&
+				!cur.paragraph().isEnvSeparator(cur.pos() - 1) &&
 				!cur.paragraph().isSeparator(cur.pos() - 1)) {
 			return setCursor(cur, cur.pit(), cur.pos(), true, true);
 		}
@@ -669,8 +655,14 @@ bool Text::cursorBackward(Cursor & cur)
 	}
 
 	// move to the previous paragraph or do nothing
-	if (cur.pit() > 0)
-		return setCursor(cur, cur.pit() - 1, getPar(cur.pit() - 1).size(), true, false);
+	if (cur.pit() > 0) {
+		Paragraph & par = getPar(cur.pit() - 1);
+		pos_type lastpos = par.size();
+		if (lastpos > 0 && par.isEnvSeparator(lastpos - 1))
+			return setCursor(cur, cur.pit() - 1, lastpos - 1, true, false);
+		else
+			return setCursor(cur, cur.pit() - 1, lastpos, true, false);
+	}
 	return false;
 }
 
@@ -734,12 +726,19 @@ bool Text::cursorForward(Cursor & cur)
 			bool sep2 = cur.paragraph().isSeparator(cur.pos()+1);
 		}
 #endif
-		if (cur.textRow().endpos() == cur.pos() + 1 &&
-		    cur.textRow().endpos() != cur.lastpos() &&
-				!cur.paragraph().isNewline(cur.pos()) &&
-				!cur.paragraph().isLineSeparator(cur.pos()) &&
-				!cur.paragraph().isSeparator(cur.pos())) {
-			return setCursor(cur, cur.pit(), cur.pos() + 1, true, true);
+		if (cur.textRow().endpos() == cur.pos() + 1) {
+			if (cur.paragraph().isEnvSeparator(cur.pos()) &&
+			    cur.pos() + 1 == cur.lastpos() &&
+			    cur.pit() != cur.lastpit()) {
+				// move to next paragraph
+				return setCursor(cur, cur.pit() + 1, 0, true, false);
+			} else if (cur.textRow().endpos() != cur.lastpos() &&
+				   !cur.paragraph().isNewline(cur.pos()) &&
+				   !cur.paragraph().isEnvSeparator(cur.pos()) &&
+				   !cur.paragraph().isLineSeparator(cur.pos()) &&
+				   !cur.paragraph().isSeparator(cur.pos())) {
+				return setCursor(cur, cur.pit(), cur.pos() + 1, true, true);
+			}
 		}
 		
 		// in front of RTL boundary? Stay on this side of the boundary because:
@@ -791,7 +790,7 @@ bool Text::cursorDownParagraph(Cursor & cur)
 void Text::fixCursorAfterDelete(CursorSlice & cur, CursorSlice const & where)
 {
 	// Do nothing if cursor is not in the paragraph where the
-	// deletion occured,
+	// deletion occurred,
 	if (cur.pit() != where.pit())
 		return;
 
@@ -883,12 +882,11 @@ bool Text::deleteEmptyParagraphMechanism(Cursor & cur,
 
 	if (oldpar.empty() || (oldpar.size() == 1 && oldpar.isLineSeparator(0))) {
 		// Delete old par.
-		old.recordUndo(ATOMIC_UNDO,
-			   max(old.pit() - 1, pit_type(0)),
-			   min(old.pit() + 1, old.lastpit()));
+		old.recordUndo(max(old.pit() - 1, pit_type(0)),
+		               min(old.pit() + 1, old.lastpit()));
 		ParagraphList & plist = old.text()->paragraphs();
 		bool const soa = oldpar.params().startOfAppendix();
-		plist.erase(boost::next(plist.begin(), old.pit()));
+		plist.erase(lyx::next(plist.begin(), old.pit()));
 		// do not lose start of appendix marker (bug 4212)
 		if (soa && old.pit() < pit_type(plist.size()))
 			plist[old.pit()].params().startOfAppendix(true);
@@ -952,7 +950,7 @@ void Text::deleteEmptyParagraphMechanism(pit_type first, pit_type last, bool tra
 			continue;
 
 		if (par.empty() || (par.size() == 1 && par.isLineSeparator(0))) {
-			pars_.erase(boost::next(pars_.begin(), pit));
+			pars_.erase(lyx::next(pars_.begin(), pit));
 			--pit;
 			--last;
 			continue;
@@ -963,15 +961,4 @@ void Text::deleteEmptyParagraphMechanism(pit_type first, pit_type last, bool tra
 }
 
 
-void Text::recUndo(Cursor & cur, pit_type first, pit_type last) const
-{
-	cur.recordUndo(ATOMIC_UNDO, first, last);
-}
-
-
-void Text::recUndo(Cursor & cur, pit_type par) const
-{
-	cur.recordUndo(ATOMIC_UNDO, par, par);
-}
-
 } // namespace lyx