X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FCursorSlice.cpp;h=105df9685b5f68267bb239b14c6214da4339496a;hb=a4d9315bc49445e4419b3b59fd238a13c5f7be31;hp=f4319dcf01532da242081211ae6a7a0ad2187f10;hpb=9abb7db46800e554f57e865a3e768602ffd9d6f1;p=lyx.git

diff --git a/src/CursorSlice.cpp b/src/CursorSlice.cpp
index f4319dcf01..105df9685b 100644
--- a/src/CursorSlice.cpp
+++ b/src/CursorSlice.cpp
@@ -3,10 +3,10 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author Matthias Ettrich
- * \author André Pönitz
- * \author Jürgen Vigna
+ * \author André Pönitz
+ * \author Jürgen Vigna
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -17,15 +17,15 @@
 
 #include "Text.h"
 #include "Paragraph.h"
+#include "ParagraphList.h"
 
 #include "support/debug.h"
 
-#include "insets/Inset.h"
-
 #include "mathed/InsetMath.h"
+#include "mathed/InsetMathMacro.h"
 #include "mathed/MathData.h"
 
-#include <boost/assert.hpp>
+#include "support/lassert.h"
 
 #include <ostream>
 
@@ -35,14 +35,14 @@ namespace lyx {
 
 
 CursorSlice::CursorSlice()
-	: inset_(0), idx_(0), pit_(0), pos_(0)
+	: inset_(nullptr), idx_(0), pit_(0), pos_(0)
 {}
 
 
 CursorSlice::CursorSlice(Inset & p)
 	: inset_(&p), idx_(0), pit_(0), pos_(0)
 {
-	BOOST_ASSERT(inset_);
+	LBUFERR(inset_);
 }
 
 
@@ -60,137 +60,175 @@ Paragraph & CursorSlice::paragraph() const
 
 pos_type CursorSlice::lastpos() const
 {
-	BOOST_ASSERT(inset_);
-	return inset_->asInsetMath() ? cell().size() : paragraph().size();
+	LBUFERR(inset_);
+	InsetMath const * math = inset_->asInsetMath();
+	bool paramless_macro = math && math->asMacro() && !math->asMacro()->nargs();
+	return math ? (paramless_macro ? 0 : cell().size())
+		    : (text()->empty() ? 0 : paragraph().size());
 }
 
 
 pit_type CursorSlice::lastpit() const
 {
-	if (inset().inMathed())
+	if (inset_->inMathed())
 		return 0;
 	return text()->paragraphs().size() - 1;
 }
 
 
-CursorSlice::row_type CursorSlice::row() const
+row_type CursorSlice::row() const
+{
+	LASSERT(inset_, return 0);
+	return inset_->row(idx_);
+}
+
+
+col_type CursorSlice::col() const
 {
-	BOOST_ASSERT(asInsetMath());
-	return asInsetMath()->row(idx_);
+	LASSERT(inset_, return 0);
+	return inset_->col(idx_);
 }
 
 
-CursorSlice::col_type CursorSlice::col() const
+void CursorSlice::setPitPos(pit_type pit, pos_type pos)
 {
-	BOOST_ASSERT(asInsetMath());
-	return asInsetMath()->col(idx_);
+	LASSERT(pit != int(text()->paragraphs().size()), return);
+	pit_ = pit;
+	pos_ = pos;
+
+	// Now some strict checking. None of these should happen, but
+	// we're scaredy-cats
+	if (pos < 0) {
+		LYXERR0("Don't like -1!");
+		LATTEST(false);
+	}
+
+	if (pos > paragraph().size()) {
+		LYXERR0("Don't like 1, pos: " << pos
+				<< " size: " << paragraph().size()
+		       << " par: " << pit);
+		LATTEST(false);
+	}
 }
 
 
 void CursorSlice::forwardPos()
 {
 	//  move on one position if possible
-	if (pos() < lastpos()) {
+	if (pos_ < lastpos()) {
 		//lyxerr << "... next pos" << endl;
-		++pos();
+		++pos_;
 		return;
 	}
 
 	// otherwise move on one paragraph if possible
-	if (pit() < lastpit()) {
+	if (pit_ < lastpit()) {
 		//lyxerr << "... next par" << endl;
-		++pit();
-		pos() = 0;
+		++pit_;
+		pos_ = 0;
 		return;
 	}
 
 	// otherwise move on one cell
 	//lyxerr << "... next idx" << endl;
 
-	BOOST_ASSERT(idx() < nargs());
+	LASSERT(idx_ < nargs(), return);
 
-	++idx();
-	pit() = 0;
-	pos() = 0;
+	++idx_;
+	pit_ = 0;
+	pos_ = 0;
 }
 
 
 void CursorSlice::forwardIdx()
 {
-	BOOST_ASSERT(idx() < nargs());
+	LASSERT(idx_ < nargs(), return);
 
-	++idx();
-	pit() = 0;
-	pos() = 0;
+	++idx_;
+	pit_ = 0;
+	pos_ = 0;
 }
 
 
 void CursorSlice::backwardPos()
 {
-	if (pos() != 0) {
-		--pos();
+	if (pos_ != 0) {
+		--pos_;
 		return;
 	}
 
-	if (pit() != 0) {
-		--pit();
-		pos() = lastpos();
+	if (pit_ != 0) {
+		--pit_;
+		pos_ = lastpos();
 		return;
 	}
 
-	if (idx() != 0) {
-		--idx();
-		pit() = lastpit();
-		pos() = lastpos();
+	if (idx_ != 0) {
+		--idx_;
+		pit_ = lastpit();
+		pos_ = lastpos();
 		return;
 	}
 
-	BOOST_ASSERT(false);
+	LATTEST(false);
+}
+
+
+bool CursorSlice::at_cell_end() const
+{
+	return pit_ == lastpit() && pos_ == lastpos();
+}
+
+
+bool CursorSlice::at_cell_begin() const
+{
+	return pit_ == 0 && pos_ == 0;
 }
 
 
-bool CursorSlice::at_end() const 
+bool CursorSlice::at_end() const
 {
-	return idx() == lastidx() && pit() == lastpit() && pos() == lastpos();
+	return idx_ == lastidx() && at_cell_end();
 }
 
 
 bool CursorSlice::at_begin() const
 {
-	return idx() == 0 && pit() == 0 && pos() == 0;
+	return idx_ == 0 && at_cell_begin();
 }
 
 
 bool operator==(CursorSlice const & p, CursorSlice const & q)
 {
-	return &p.inset() == &q.inset()
-	       && p.idx() == q.idx()
-	       && p.pit() == q.pit()
-	       && p.pos() == q.pos();
+	return p.inset_ == q.inset_
+	       && p.idx_ == q.idx_
+	       && p.pit_ == q.pit_
+	       && p.pos_ == q.pos_;
 }
 
 
 bool operator!=(CursorSlice const & p, CursorSlice const & q)
 {
-	return &p.inset() != &q.inset()
-	       || p.idx() != q.idx()
-	       || p.pit() != q.pit()
-	       || p.pos() != q.pos();
+	return p.inset_ != q.inset_
+	       || p.idx_ != q.idx_
+	       || p.pit_ != q.pit_
+	       || p.pos_ != q.pos_;
 }
 
 
 bool operator<(CursorSlice const & p, CursorSlice const & q)
 {
-	if (&p.inset() != &q.inset()) {
+	if (p.inset_ != q.inset_) {
 		LYXERR0("can't compare cursor and anchor in different insets\n"
 		       << "p: " << p << '\n' << "q: " << q);
-		BOOST_ASSERT(false);
+		// It should be safe to continue, just registering the error.
+		LASSERT(false, return false);
 	}
-	if (p.idx() != q.idx())
-		return p.idx() < q.idx();
-	if (p.pit() != q.pit())
-		return p.pit() < q.pit();
-	return p.pos() < q.pos();
+	if (p.idx_ != q.idx_)
+		return p.idx_ < q.idx_;
+	if (p.pit_ != q.pit_)
+		return p.pit_ < q.pit_;
+	return p.pos_ < q.pos_;
 }
 
 
@@ -209,13 +247,13 @@ bool operator<=(CursorSlice const & p, CursorSlice const & q)
 ostream & operator<<(ostream & os, CursorSlice const & item)
 {
 	return os
-	   << "inset: " << (void *)&item.inset()
+	   << "inset: " << (void *)item.inset_
 //	   << " text: " << item.text()
-	   << " idx: " << item.idx()
-	   << " par: " << item.pit()
-	   << " pos: " << item.pos()
-//	   << " x: " << item.inset().x()
-//	   << " y: " << item.inset().y()
+	   << " idx: " << item.idx_
+	   << " par: " << item.pit_
+	   << " pos: " << item.pos_
+//	   << " x: " << item.inset_->x()
+//	   << " y: " << item.inset_->y()
 ;
 }