X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_hullinset.C;h=f307e21454111c5e9d29b378d8abfdc86bfa23b7;hb=cd03e2b7db8379a91f3d31eac2c5bc25b159c541;hp=4712712de2fab7ea129741ad9ef6d237f0811ce8;hpb=a8e8e755fc32233e91bf787d5032fd81147d0909;p=lyx.git

diff --git a/src/mathed/math_hullinset.C b/src/mathed/math_hullinset.C
index 4712712de2..f307e21454 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"
@@ -11,23 +20,24 @@
 #include "debug.h"
 #include "textpainter.h"
 #include "funcrequest.h"
-#include "Lsstream.h"
+#include "support/std_sstream.h"
 #include "LaTeXFeatures.h"
-#include "support/LAssert.h"
-#include "frontends/Painter.h"
 
 #include "frontends/Alert.h"
 #include "lyxrc.h"
 #include "gettext.h"
-#include "BufferView.h"
 
-#include <vector>
+using lyx::support::trim;
 
-using std::vector;
-using std::max;
 using std::endl;
+using std::max;
+
+using std::auto_ptr;
+using std::istringstream;
+using std::ostringstream;
 using std::pair;
 
+
 namespace {
 
 	int getCols(string const & type)
@@ -78,7 +88,7 @@ namespace {
 		if (s == "multline")  return 8;
 		if (s == "gather")    return 9;
 		if (s == "flalign")   return 10;
-		lyxerr << "unknown hull type '" << s << "'\n";
+		lyxerr << "unknown hull type '" << s << "'" << endl;
 		return 0;
 	}
 
@@ -105,9 +115,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));
 }
 
 
@@ -166,7 +176,7 @@ char const * MathHullInset::standardFont() const
 }
 
 
-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);
@@ -198,6 +208,7 @@ void MathHullInset::metrics(MetricsInfo & mi) const
 
 	// for markers
 	metricsMarkers2();
+	dim = dim_;
 }
 
 
@@ -220,17 +231,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_.wid = os.str().size();
-		dim_.asc = 1;
-		dim_.des = 0;
+		dim.wid = os.str().size();
+		dim.asc = 1;
+		dim.des = 0;
 	}
 }
 
@@ -251,7 +262,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];
 }
 
@@ -432,7 +443,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;
 }
 
 
@@ -441,7 +452,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;
 }
 
 
@@ -482,7 +493,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
@@ -660,8 +671,8 @@ 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());
 }
 
 
@@ -680,7 +691,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;
 	//}
@@ -697,13 +708,13 @@ void MathHullInset::doExtern
 		size_type pos = cell(idx).find_last(eq);
 		MathArray ar;
 		if (mathcursor && mathcursor->selection()) {
-			ar = asArray(mathcursor->grabAndEraseSelection());
+			asArray(mathcursor->grabAndEraseSelection(), ar);
 		} else if (pos == cell(idx).size()) {
 			ar = cell(idx);
-			lyxerr << "use whole cell: " << ar << "\n";
+			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";
+			lyxerr << "use partial cell form pos: " << pos << endl;
 		}
 		cell(idx).append(eq);
 		cell(idx).append(pipeThroughExtern(lang, extra, ar));
@@ -712,10 +723,10 @@ void MathHullInset::doExtern
 	}
 
 	if (getType() == "equation") {
-		lyxerr << "use equation inset\n";
+		lyxerr << "use equation inset" << endl;
 		mutate("eqnarray");
 		MathArray & ar = cell(idx);
-		lyxerr << "use cell: " << ar << "\n";
+		lyxerr << "use cell: " << ar << endl;
 		cell(idx + 1) = eq;
 		cell(idx + 2) = pipeThroughExtern(lang, extra, ar);
 		// move to end of line
@@ -725,12 +736,12 @@ void MathHullInset::doExtern
 	}
 
 	{
-		lyxerr << "use eqnarray\n";
+		lyxerr << "use eqnarray" << endl;
 		idx -= idx % ncols();
 		idx += 2;
 		pos = 0;
 		MathArray ar = cell(idx);
-		lyxerr << "use cell: " << ar << "\n";
+		lyxerr << "use cell: " << ar << endl;
 #ifdef WITH_WARNINGS
 #warning temporarily disabled
 #endif
@@ -758,9 +769,9 @@ dispatch_result MathHullInset::dispatch
 			return MathGridInset::dispatch(cmd, idx, pos);
 
 		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);
@@ -774,7 +785,7 @@ dispatch_result MathHullInset::dispatch
 		case LFUN_MATH_NONUMBER:
 			if (display()) {
 				row_type r = (type_ == "multline") ? nrows() - 1 : row(idx);
-				//bv->lockedInsetStoreUndo(Undo::INSERT);
+				//recordUndo(bv, Undo::INSERT);
 				bool old = numbered(r);
 				//bv->owner()->message(old ? _("No number") : _("Number"));
 				numbered(r, !old);
@@ -793,7 +804,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 UNDISPATCHED;
 				new_label = trim(res.second);
 			}
 
@@ -802,13 +813,6 @@ 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;
 		}
@@ -838,9 +842,7 @@ dispatch_result MathHullInset::dispatch
 
 		default:
 			return MathGridInset::dispatch(cmd, idx, pos);
-
 	}
-	return UNDISPATCHED;
 }