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

diff --git a/src/mathed/math_hullinset.C b/src/mathed/math_hullinset.C
index 76b4a91845..f307e21454 100644
--- a/src/mathed/math_hullinset.C
+++ b/src/mathed/math_hullinset.C
@@ -1,3 +1,13 @@
+/**
+ * \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"
@@ -10,25 +20,23 @@
 #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 namespace lyx::support;
+using lyx::support::trim;
 
-using std::vector;
-using std::max;
 using std::endl;
-using std::pair;
+using std::max;
+
 using std::auto_ptr;
+using std::istringstream;
+using std::ostringstream;
+using std::pair;
+
 
 namespace {
 
@@ -80,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;
 	}
 
@@ -254,7 +262,7 @@ void MathHullInset::drawT(TextPainter & pain, int x, int y) const
 string MathHullInset::label(row_type row) const
 {
 	row_type n = nrows();
-	Assert(row < n);
+	BOOST_ASSERT(row < n);
 	return label_[row];
 }
 
@@ -435,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;
 }
 
 
@@ -444,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;
 }
 
 
@@ -485,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
@@ -663,8 +671,8 @@ void MathHullInset::infoize(std::ostream & os) const
 
 void MathHullInset::check() const
 {
-	Assert(nonum_.size() == nrows());
-	Assert(label_.size() == nrows());
+	BOOST_ASSERT(nonum_.size() == nrows());
+	BOOST_ASSERT(label_.size() == nrows());
 }
 
 
@@ -683,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;
 	//}
@@ -703,10 +711,10 @@ void MathHullInset::doExtern
 			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));
@@ -715,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
@@ -728,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
@@ -761,7 +769,7 @@ 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()) {
 				//recordUndo(bv, Undo::INSERT);
 				bool old = numberedType();