X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_hullinset.C;h=4926e1456eeaf65ee99c3adcc6538477eac9a3bc;hb=69bee02a8901793b34ac5ca6d07e93910cef4005;hp=ad5080ffc02b112ff700bdfeee05080561168ef4;hpb=defe8051ab83f9a728c78ae1d183466c8b8b5396;p=lyx.git

diff --git a/src/mathed/math_hullinset.C b/src/mathed/math_hullinset.C
index ad5080ffc0..4926e1456e 100644
--- a/src/mathed/math_hullinset.C
+++ b/src/mathed/math_hullinset.C
@@ -1,5 +1,14 @@
-#include <config.h>
+/**
+ * \file math_hullinset.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
 
+#include <config.h>
 
 #include "math_hullinset.h"
 #include "math_mathmlstream.h"
@@ -8,26 +17,32 @@
 #include "math_support.h"
 #include "math_extern.h"
 #include "math_charinset.h"
-#include "debug.h"
 #include "textpainter.h"
+#include "dispatchresult.h"
+#include "debug.h"
 #include "funcrequest.h"
-#include "Lsstream.h"
+#include "gettext.h"
 #include "LaTeXFeatures.h"
-#include "support/LAssert.h"
-#include "frontends/Painter.h"
+#include "LColor.h"
+#include "lyxrc.h"
 
 #include "frontends/Alert.h"
-#include "lyxrc.h"
-#include "gettext.h"
-#include "BufferView.h"
 
-#include <vector>
+#include "support/std_sstream.h"
+
+
+using lyx::support::trim;
 
-using std::vector;
-using std::max;
 using std::endl;
+using std::max;
+
+using std::string;
+using std::auto_ptr;
+using std::istringstream;
+using std::ostringstream;
 using std::pair;
 
+
 namespace {
 
 	int getCols(string const & type)
@@ -69,17 +84,16 @@ namespace {
 	{
 		if (s == "none")      return 0;
 		if (s == "simple")    return 1;
-		if (s == "chemistry") return 2;
-		if (s == "equation")  return 3;
-		if (s == "eqnarray")  return 4;
-		if (s == "align")     return 5;
-		if (s == "alignat")   return 6;
-		if (s == "xalignat")  return 7;
-		if (s == "xxalignat") return 8;
-		if (s == "multline")  return 9;
-		if (s == "gather")    return 10;
-		if (s == "flalign")   return 11;
-		lyxerr << "unknown hull type '" << s << "'\n";
+		if (s == "equation")  return 2;
+		if (s == "eqnarray")  return 3;
+		if (s == "align")     return 4;
+		if (s == "alignat")   return 5;
+		if (s == "xalignat")  return 6;
+		if (s == "xxalignat") return 7;
+		if (s == "multline")  return 8;
+		if (s == "gather")    return 9;
+		if (s == "flalign")   return 10;
+		lyxerr << "unknown hull type '" << s << "'" << endl;
 		return 0;
 	}
 
@@ -106,9 +120,9 @@ MathHullInset::MathHullInset(string const & type)
 }
 
 
-MathInset * MathHullInset::clone() const
+auto_ptr<InsetBase> MathHullInset::clone() const
 {
-	return new MathHullInset(*this);
+	return auto_ptr<InsetBase>(new MathHullInset(*this));
 }
 
 
@@ -121,18 +135,20 @@ MathInset::mode_type MathHullInset::currentMode() const
 }
 
 
-bool MathHullInset::idxFirst(idx_type & idx, pos_type & pos) const
+bool MathHullInset::idxFirst(BufferView & bv) const
 {
-	idx = 0;
-	pos = 0;
+	CursorSlice & cur = cursorTip(bv);
+	cur.idx() = 0;
+	cur.pos() = 0;
 	return true;
 }
 
 
-bool MathHullInset::idxLast(idx_type & idx, pos_type & pos) const
+bool MathHullInset::idxLast(BufferView & bv) const
 {
-	idx = nargs() - 1;
-	pos = cell(idx).size();
+	CursorSlice & cur = cursorTip(bv);
+	cur.idx() = nargs() - 1;
+	cur.pos() = cur.lastpos();
 	return true;
 }
 
@@ -163,13 +179,11 @@ char const * MathHullInset::standardFont() const
 {
 	if (type_ == "none")
 		return "lyxnochange";
-	if (type_ == "chemistry")
-		return "mathrm";
 	return "mathnormal";
 }
 
 
-void MathHullInset::metrics(MetricsInfo & mi) const
+void MathHullInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
 	FontSetChanger dummy1(mi.base, standardFont());
 	StyleChanger dummy2(mi.base, display() ? LM_ST_DISPLAY : LM_ST_TEXT);
@@ -178,8 +192,8 @@ void MathHullInset::metrics(MetricsInfo & mi) const
 	MathGridInset::metrics(mi);
 
 	if (display()) {
-		dim_.a += 12;
-		dim_.d += 12;
+		dim_.asc += 12;
+		dim_.des += 12;
 	}
 
 	if (numberedType()) {
@@ -189,18 +203,19 @@ void MathHullInset::metrics(MetricsInfo & mi) const
 			l = max(l, mathed_string_width(mi.base.font, nicelabel(row)));
 
 		if (l)
-			dim_.w += 30 + l;
+			dim_.wid += 30 + l;
 	}
 
 	// make it at least as high as the current font
 	int asc = 0;
 	int des = 0;
 	math_font_max_dim(mi.base.font, asc, des);
-	dim_.a = max(dim_.a, asc);
-	dim_.d = max(dim_.d, des);
+	dim_.asc = max(dim_.asc, asc);
+	dim_.des = max(dim_.des, des);
 
 	// for markers
 	metricsMarkers2();
+	dim = dim_;
 }
 
 
@@ -223,17 +238,17 @@ void MathHullInset::draw(PainterInfo & pi, int x, int y) const
 }
 
 
-void MathHullInset::metricsT(TextMetricsInfo const & mi) const
+void MathHullInset::metricsT(TextMetricsInfo const & mi, Dimension & dim) const
 {
 	if (display()) {
-		MathGridInset::metricsT(mi);
+		MathGridInset::metricsT(mi, dim);
 	} else {
 		ostringstream os;
 		WriteStream wi(os, false, true);
 		write(wi);
-		dim_.w = os.str().size();
-		dim_.a = 1;
-		dim_.d = 0;
+		dim.wid = os.str().size();
+		dim.asc = 1;
+		dim.des = 0;
 	}
 }
 
@@ -254,7 +269,7 @@ void MathHullInset::drawT(TextPainter & pain, int x, int y) const
 string MathHullInset::label(row_type row) const
 {
 	row_type n = nrows();
-	lyx::Assert(row < n);
+	BOOST_ASSERT(row < n);
 	return label_[row];
 }
 
@@ -293,11 +308,12 @@ bool MathHullInset::ams() const
 
 bool MathHullInset::display() const
 {
-	return type_ != "simple" && type_ != "none" && type_ != "chemistry";
+	return type_ != "simple" && type_ != "none";
 }
 
 
-void MathHullInset::getLabelList(std::vector<string> & labels) const
+void MathHullInset::getLabelList(Buffer const &,
+				 std::vector<string> & labels) const
 {
 	for (row_type row = 0; row < nrows(); ++row)
 		if (!label_[row].empty() && nonum_[row] != 1)
@@ -309,8 +325,6 @@ bool MathHullInset::numberedType() const
 {
 	if (type_ == "none")
 		return false;
-	if (type_ == "chemistry")
-		return false;
 	if (type_ == "simple")
 		return false;
 	if (type_ == "xxalignat")
@@ -353,9 +367,6 @@ void MathHullInset::header_write(WriteStream & os) const
 			os << ' ';
 	}
 
-	else if (type_ == "chemistry")
-		os << "$\\mathrm{";
-
 	else if (type_ == "equation") {
 		if (n)
 			os << "\\begin{equation" << star(n) << "}\n";
@@ -390,9 +401,6 @@ void MathHullInset::footer_write(WriteStream & os) const
 	else if (type_ == "simple")
 		os << '$';
 
-	else if (type_ == "chemistry")
-		os << "}$";
-
 	else if (type_ == "equation")
 		if (n)
 			os << "\\end{equation" << star(n) << "}\n";
@@ -428,6 +436,18 @@ void MathHullInset::addRow(row_type row)
 }
 
 
+void MathHullInset::swapRow(row_type row)
+{
+	if (nrows() == 1)
+		return;
+	if (row + 1 == nrows())
+		--row;
+	std::swap(nonum_[row], nonum_[row + 1]);
+	std::swap(label_[row], label_[row + 1]);
+	MathGridInset::swapRow(row);
+}
+
+
 void MathHullInset::delRow(row_type row)
 {
 	if (nrows() <= 1)
@@ -443,7 +463,7 @@ void MathHullInset::addCol(col_type col)
 	if (colChangeOK())
 		MathGridInset::addCol(col);
 	else
-		lyxerr << "Can't change number of columns in '" << type_ << "'\n";
+		lyxerr << "Can't change number of columns in '" << type_ << "'" << endl;
 }
 
 
@@ -452,7 +472,7 @@ void MathHullInset::delCol(col_type col)
 	if (colChangeOK())
 		MathGridInset::delCol(col);
 	else
-		lyxerr << "Can't change number of columns in '" << type_ << "'\n";
+		lyxerr << "Can't change number of columns in '" << type_ << "'" << endl;
 }
 
 
@@ -493,7 +513,7 @@ void MathHullInset::setType(string const & type)
 
 void MathHullInset::mutate(string const & newtype)
 {
-	//lyxerr << "mutating from '" << type_ << "' to '" << newtype << "'\n";
+	lyxerr << "mutating from '" << type_ << "' to '" << newtype << "'" << endl;
 
 	// we try to move along the chain
 	// none <-> simple <-> equation <-> eqnarray
@@ -506,22 +526,22 @@ void MathHullInset::mutate(string const & newtype)
 		// done
 	}
 
-	else if (newtype == "none" || newtype == "chemistry") {
-		mutate("simple");
+	else if (type_ == "none") {
+		setType("simple");
 		numbered(0, false);
+		mutate(newtype);
 	}
 
-	else if (newtype == "simple") {
-		if (type_ != "none" && type_ != "chemistry") {
-			mutate("equation");
+	else if (type_ == "simple") {
+		if (newtype == "none") {
+			setType("none");
+		} else {
+			setType("equation");
 			numbered(0, false);
+			mutate(newtype);
 		}
 	}
 
-	else if (newtype == "equation" && smaller(type_, newtype)) {
-		numbered(0, false);
-	}
-
 	else if (type_ == "equation") {
 		if (smaller(newtype, type_)) {
 			setType("simple");
@@ -625,8 +645,6 @@ void MathHullInset::mutate(string const & newtype)
 		lyxerr << "mutation from '" << type_
 					 << "' to '" << newtype << "' not implemented" << endl;
 	}
-
-	setType(newtype);
 }
 
 
@@ -673,14 +691,14 @@ void MathHullInset::infoize(std::ostream & os) const
 
 void MathHullInset::check() const
 {
-	lyx::Assert(nonum_.size() == nrows());
-	lyx::Assert(label_.size() == nrows());
+	BOOST_ASSERT(nonum_.size() == nrows());
+	BOOST_ASSERT(label_.size() == nrows());
 }
 
 
-void MathHullInset::doExtern
-	(FuncRequest const & func, idx_type & idx, pos_type & pos)
+void MathHullInset::doExtern(FuncRequest const & func, BufferView & bv)
 {
+	CursorSlice & cur = cursorTip(bv);
 	string lang;
 	string extra;
 	istringstream iss(func.argument.c_str());
@@ -693,7 +711,7 @@ void MathHullInset::doExtern
 	//if (selection()) {
 	//	MathArray ar;
 	//	selGet(ar);
-	//	lyxerr << "use selection: " << ar << "\n";
+	//	lyxerr << "use selection: " << ar << endl;
 	//	insert(pipeThroughExtern(lang, extra, ar));
 	//	return;
 	//}
@@ -703,77 +721,80 @@ void MathHullInset::doExtern
 	eq.push_back(MathAtom(new MathCharInset('=')));
 
 	// go to first item in line
-	idx -= idx % ncols();
-	pos = 0;
+	cur.idx() -= cur.idx() % ncols();
+	cur.pos() = 0;
 
 	if (getType() == "simple") {
-		size_type pos = cell(idx).find_last(eq);
+		size_type pos = cur.cell().find_last(eq);
 		MathArray ar;
 		if (mathcursor && mathcursor->selection()) {
-			ar = asArray(mathcursor->grabAndEraseSelection());
-		} else if (pos == cell(idx).size()) {
-			ar = cell(idx);
-			lyxerr << "use whole cell: " << ar << "\n";
+			asArray(mathcursor->grabAndEraseSelection(bv), ar);
+		} else if (pos == cur.cell().size()) {
+			ar = cur.cell();
+			lyxerr << "use whole cell: " << ar << endl;
 		} else {
-			ar = MathArray(cell(idx).begin() + pos + 1, cell(idx).end());
-			lyxerr << "use partial cell form pos: " << pos << "\n";
+			ar = MathArray(cur.cell().begin() + pos + 1, cur.cell().end());
+			lyxerr << "use partial cell form pos: " << pos << endl;
 		}
-		cell(idx).append(eq);
-		cell(idx).append(pipeThroughExtern(lang, extra, ar));
-		pos = cell(idx).size();
+		cur.cell().append(eq);
+		cur.cell().append(pipeThroughExtern(lang, extra, ar));
+		cur.pos() = cur.lastpos();
 		return;
 	}
 
 	if (getType() == "equation") {
-		lyxerr << "use equation inset\n";
+		lyxerr << "use equation inset" << endl;
 		mutate("eqnarray");
-		MathArray & ar = cell(idx);
-		lyxerr << "use cell: " << ar << "\n";
-		cell(idx + 1) = eq;
-		cell(idx + 2) = pipeThroughExtern(lang, extra, ar);
+		MathArray & ar = cur.cell();
+		lyxerr << "use cell: " << ar << endl;
+		++cur.idx();
+		cur.cell() = eq;
+		++cur.idx();
+		cur.cell() = pipeThroughExtern(lang, extra, ar);
 		// move to end of line
-		idx += 2;
-		pos = cell(idx).size();
+		cur.pos() = cur.lastpos();
 		return;
 	}
 
 	{
-		lyxerr << "use eqnarray\n";
-		idx -= idx % ncols();
-		idx += 2;
-		pos = 0;
-		MathArray ar = cell(idx);
-		lyxerr << "use cell: " << ar << "\n";
+		lyxerr << "use eqnarray" << endl;
+		cur.idx() += 2 - cur.idx() % ncols();
+		cur.pos() = 0;
+		MathArray ar = cur.cell();
+		lyxerr << "use cell: " << ar << endl;
 #ifdef WITH_WARNINGS
 #warning temporarily disabled
 #endif
-		addRow(row(idx));
-		cell(idx + 2) = eq;
-		cell(idx + 3) = pipeThroughExtern(lang, extra, ar);
-		idx += 3;
-		pos = cell(idx).size();
+		addRow(cur.row());
+		++cur.idx();
+		++cur.idx();
+		cur.cell() = eq;
+		++cur.idx();
+		cur.cell() = pipeThroughExtern(lang, extra, ar);
+		cur.pos() = cur.lastpos();
 	}
 }
 
 
-dispatch_result MathHullInset::dispatch
-	(FuncRequest const & cmd, idx_type & idx, pos_type & pos)
+DispatchResult
+MathHullInset::priv_dispatch(BufferView & bv, FuncRequest const & cmd)
 {
+	CursorSlice & cur = cursorTip(bv);
 	switch (cmd.action) {
 
 		case LFUN_BREAKLINE:
 			if (type_ == "simple" || type_ == "equation") {
 				mutate("eqnarray");
-				idx = 1;
-				pos = 0;
-				return DISPATCHED_POP;
+				cur.idx() = 1;
+				cur.pos() = 0;
+				return DispatchResult(true, FINISHED);
 			}
-			return MathGridInset::dispatch(cmd, idx, pos);
+			return MathGridInset::priv_dispatch(bv, cmd);
 
 		case LFUN_MATH_NUMBER:
-			//lyxerr << "toggling all numbers\n";
+			//lyxerr << "toggling all numbers" << endl;
 			if (display()) {
-				//bv->lockedInsetStoreUndo(Undo::INSERT);
+				//recordUndo(bv, Undo::INSERT);
 				bool old = numberedType();
 				if (type_ == "multline")
 					numbered(nrows() - 1, !old);
@@ -782,20 +803,20 @@ dispatch_result MathHullInset::dispatch
 						numbered(row, !old);
 				//bv->owner()->message(old ? _("No number") : _("Number"));
 			}
-			return DISPATCHED;
+			return DispatchResult(true, true);
 
 		case LFUN_MATH_NONUMBER:
 			if (display()) {
-				row_type r = (type_ == "multline") ? nrows() - 1 : row(idx);
-				//bv->lockedInsetStoreUndo(Undo::INSERT);
+				row_type r = (type_ == "multline") ? nrows() - 1 : cur.row();
+				//recordUndo(bv, Undo::INSERT);
 				bool old = numbered(r);
 				//bv->owner()->message(old ? _("No number") : _("Number"));
 				numbered(r, !old);
 			}
-			return DISPATCHED;
+			return DispatchResult(true, true);
 
 		case LFUN_INSERT_LABEL: {
-			row_type r = (type_ == "multline") ? nrows() - 1 : row(idx);
+			row_type r = (type_ == "multline") ? nrows() - 1 : cur.row();
 			string old_label = label(r);
 			string new_label = cmd.argument;
 
@@ -806,7 +827,7 @@ dispatch_result MathHullInset::dispatch
 					? Alert::askForText(_("Enter new label to insert:"), default_label)
 					: Alert::askForText(_("Enter label:"), old_label);
 				if (!res.first)
-					break;
+					return DispatchResult(false);
 				new_label = trim(res.second);
 			}
 
@@ -815,51 +836,41 @@ dispatch_result MathHullInset::dispatch
 
 			if (!new_label.empty())
 				numbered(r, true);
-
-#warning FIXME: please check you really mean repaint() ... is it needed,
-#warning and if so, should it be update() instead ?
-			if (!new_label.empty()
-					&& cmd.view()->ChangeRefsIfUnique(old_label, new_label))
-				cmd.view()->repaint();
-
 			label(r, new_label);
-			return DISPATCHED;
+			return DispatchResult(true, true);
 		}
 
 		case LFUN_MATH_EXTERN:
-			doExtern(cmd, idx, pos);
-			return DISPATCHED_POP;
+			doExtern(cmd, bv);
+			return DispatchResult(true, FINISHED);
 
 		case LFUN_MATH_MUTATE: {
-			row_type r = row(idx);
-			col_type c = col(idx);
+			lyxerr << "Hull: MUTATE: " << cmd.argument << endl;
+			row_type r = cur.row();
+			col_type c = cur.col();
 			mutate(cmd.argument);
-			idx = r * ncols() + c;
-			if (idx >= nargs())
-				idx = nargs() - 1;
-			if (pos > cell(idx).size())
-				pos = cell(idx).size();
-			return DISPATCHED_POP;
+			cur.idx() = r * ncols() + c;
+			if (cur.idx() >= nargs())
+				cur.idx() = nargs() - 1;
+			if (cur.pos() > cur.lastpos())
+				cur.pos() = cur.lastpos();
+			return DispatchResult(true, FINISHED);
 		}
 
 		case LFUN_MATH_DISPLAY: {
 			mutate(type_ == "simple" ? "equation" : "simple");
-			idx = 0;
-			pos = cell(idx).size();
-			return DISPATCHED_POP;
+			cur.idx() = 0;
+			cur.pos() = cur.lastpos();
+			return DispatchResult(true, FINISHED);
 		}
 
 		default:
-			return MathGridInset::dispatch(cmd, idx, pos);
-
+			return MathGridInset::priv_dispatch(bv, cmd);
 	}
-	return UNDISPATCHED;
 }
 
 
 string MathHullInset::fileInsetLabel() const
 {
-	if (type_ == "chemistry")
-		return "Chemistry";
 	return "Formula";
 }