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

diff --git a/src/mathed/math_hullinset.C b/src/mathed/math_hullinset.C
index 4f5a81d29b..f307e21454 100644
--- a/src/mathed/math_hullinset.C
+++ b/src/mathed/math_hullinset.C
@@ -1,35 +1,43 @@
-#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.
+ */
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
+#include <config.h>
 
 #include "math_hullinset.h"
 #include "math_mathmlstream.h"
 #include "math_streamstr.h"
+#include "math_cursor.h"
 #include "math_support.h"
 #include "math_extern.h"
 #include "math_charinset.h"
 #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)
@@ -38,6 +46,8 @@ namespace {
 			return 3;
 		if (type == "align")
 			return 2;
+		if (type == "flalign")
+			return 2;
 		if (type == "alignat")
 			return 2;
 		if (type == "xalignat")
@@ -77,7 +87,8 @@ namespace {
 		if (s == "xxalignat") return 7;
 		if (s == "multline")  return 8;
 		if (s == "gather")    return 9;
-		lyxerr << "unknown hull type '" << s << "'\n";
+		if (s == "flalign")   return 10;
+		lyxerr << "unknown hull type '" << s << "'" << endl;
 		return 0;
 	}
 
@@ -104,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));
 }
 
 
@@ -151,7 +162,7 @@ int MathHullInset::defaultColSpace(col_type col)
 		return 0;
 	if (type_ == "xalignat")
 		return (col & 1) ? 20 : 0;
-	if (type_ == "xxalignat")
+	if (type_ == "xxalignat" || type_ == "flalign")
 		return (col & 1) ? 40 : 0;
 	return 0;
 }
@@ -165,52 +176,53 @@ char const * MathHullInset::standardFont() const
 }
 
 
-void MathHullInset::metrics(MathMetricsInfo & mi) const
+void MathHullInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	MathFontSetChanger dummy1(mi.base, standardFont());
-	MathStyleChanger dummy2(mi.base, display() ? LM_ST_DISPLAY : LM_ST_TEXT);
+	FontSetChanger dummy1(mi.base, standardFont());
+	StyleChanger dummy2(mi.base, display() ? LM_ST_DISPLAY : LM_ST_TEXT);
 
 	// let the cells adjust themselves
 	MathGridInset::metrics(mi);
 
 	if (display()) {
-		dim_.a += 12;
-		dim_.d += 12;
+		dim_.asc += 12;
+		dim_.des += 12;
 	}
 
 	if (numberedType()) {
-		MathFontSetChanger dummy(mi.base, "mathbf");
+		FontSetChanger dummy(mi.base, "mathbf");
 		int l = 0;
 		for (row_type row = 0; row < nrows(); ++row)
 			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_;
 }
 
 
-void MathHullInset::draw(MathPainterInfo & pi, int x, int y) const
+void MathHullInset::draw(PainterInfo & pi, int x, int y) const
 {
-	MathFontSetChanger dummy1(pi.base, standardFont());
-	MathStyleChanger dummy2(pi.base, display() ? LM_ST_DISPLAY : LM_ST_TEXT);
+	FontSetChanger dummy1(pi.base, standardFont());
+	StyleChanger dummy2(pi.base, display() ? LM_ST_DISPLAY : LM_ST_TEXT);
 	MathGridInset::draw(pi, x + 1, y);
 
 	if (numberedType()) {
 		int const xx = x + colinfo_.back().offset_ + colinfo_.back().width_ + 20;
 		for (row_type row = 0; row < nrows(); ++row) {
 			int const yy = y + rowinfo_[row].offset_;
-			MathFontSetChanger dummy(pi.base, "mathrm");
+			FontSetChanger dummy(pi.base, "mathrm");
 			drawStr(pi, pi.base.font, xx, yy, nicelabel(row));
 		}
 	}
@@ -219,17 +231,17 @@ void MathHullInset::draw(MathPainterInfo & 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;
 	}
 }
 
@@ -250,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];
 }
 
@@ -278,6 +290,7 @@ bool MathHullInset::ams() const
 {
 	return
 		type_ == "align" ||
+		type_ == "flalign" ||
 		type_ == "multline" ||
 		type_ == "gather" ||
 		type_ == "alignat" ||
@@ -329,7 +342,7 @@ void MathHullInset::validate(LaTeXFeatures & features) const
 	features.require("boldsymbol");
 	//features.binom      = true;
 
-	MathNestInset::validate(features);
+	MathGridInset::validate(features);
 }
 
 
@@ -353,22 +366,20 @@ void MathHullInset::header_write(WriteStream & os) const
 			os << "\\[\n";
 	}
 
-	else if (type_ == "eqnarray" || type_ == "align")
+	else if (type_ == "eqnarray" || type_ == "align" || type_ == "flalign"
+		 || type_ == "gather" || type_ == "multline")
 			os << "\\begin{" << type_ << star(n) << "}\n";
 
 	else if (type_ == "alignat" || type_ == "xalignat")
-		os << "\\begin{" << type_ << star(n) << "}"
-		  << "{" << static_cast<unsigned int>((ncols() + 1)/2) << "}\n";
+		os << "\\begin{" << type_ << star(n) << '}'
+		  << '{' << static_cast<unsigned int>((ncols() + 1)/2) << "}\n";
 
 	else if (type_ == "xxalignat")
-		os << "\\begin{" << type_ << "}"
-		  << "{" << static_cast<unsigned int>((ncols() + 1)/2) << "}\n";
-
-	else if (type_ == "multline" || type_ == "gather")
-		os << "\\begin{" << type_ << "}\n";
+		os << "\\begin{" << type_ << '}'
+		  << '{' << static_cast<unsigned int>((ncols() + 1)/2) << "}\n";
 
 	else
-		os << "\\begin{unknown" << star(n) << "}";
+		os << "\\begin{unknown" << star(n) << '}';
 }
 
 
@@ -388,22 +399,23 @@ void MathHullInset::footer_write(WriteStream & os) const
 		else
 			os << "\\]\n";
 
-	else if (type_ == "eqnarray" || type_ == "align" || type_ == "alignat"
-	      || type_ == "xalignat")
-		os << "\n\\end{" << type_ << star(n) << "}\n";
+	else if (type_ == "eqnarray" || type_ == "align" || type_ == "flalign"
+		 || type_ == "alignat" || type_ == "xalignat"
+		 || type_ == "gather" || type_ == "multline")
+		os << "\\end{" << type_ << star(n) << "}\n";
 
-	else if (type_ == "xxalignat" || type_ == "multline" || type_ == "gather")
-		os << "\n\\end{" << type_ << "}\n";
+	else if (type_ == "xxalignat")
+		os << "\\end{" << type_ << "}\n";
 
 	else
-		os << "\\end{unknown" << star(n) << "}";
+		os << "\\end{unknown" << star(n) << '}';
 }
 
 
 bool MathHullInset::colChangeOK() const
 {
 	return
-		type_ == "align" || type_ == "alignat" ||
+		type_ == "align" || type_ == "flalign" ||type_ == "alignat" ||
 		type_ == "xalignat" || type_ == "xxalignat";
 }
 
@@ -428,19 +440,19 @@ void MathHullInset::delRow(row_type row)
 
 void MathHullInset::addCol(col_type col)
 {
-	if (colChangeOK()) 
+	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;
 }
 
 
 void MathHullInset::delCol(col_type col)
 {
-	if (colChangeOK()) 
+	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;
 }
 
 
@@ -450,7 +462,7 @@ string MathHullInset::nicelabel(row_type row) const
 		return string();
 	if (label_[row].empty())
 		return string("(#)");
-	return "(" + label_[row] + ")";
+	return '(' + label_[row] + ')';
 }
 
 
@@ -481,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
@@ -587,8 +599,8 @@ void MathHullInset::mutate(string const & newtype)
 	}
 
 	else if (type_ == "multline") {
-		if (newtype == "gather" || newtype == "align" ||	
-		           newtype == "xalign" || newtype == "xxalign")
+		if (newtype == "gather" || newtype == "align" ||
+		    newtype == "xalignat" || newtype == "xxalignat" || newtype == "flalign")
 			setType(newtype);
 		else if (newtype == "eqnarray") {
 			MathGridInset::addCol(1);
@@ -620,9 +632,9 @@ string MathHullInset::eolString(row_type row, bool fragile) const
 {
 	string res;
 	if (numberedType()) {
-		if (!label_[row].empty())
-			res += "\\label{" + label_[row] + "}";
-		if (nonum_[row])
+		if (!label_[row].empty() && !nonum_[row])
+			res += "\\label{" + label_[row] + '}';
+		if (nonum_[row] && (type_ != "multline"))
 			res += "\\nonumber ";
 	}
 	return res + MathGridInset::eolString(row, fragile);
@@ -639,7 +651,7 @@ void MathHullInset::write(WriteStream & os) const
 
 void MathHullInset::normalize(NormalStream & os) const
 {
-	os << "[formula " << type_ << " ";
+	os << "[formula " << type_ << ' ';
 	MathGridInset::normalize(os);
 	os << "] ";
 }
@@ -659,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());
 }
 
 
@@ -679,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;
 	//}
@@ -695,12 +707,14 @@ void MathHullInset::doExtern
 	if (getType() == "simple") {
 		size_type pos = cell(idx).find_last(eq);
 		MathArray ar;
-		if (pos == cell(idx).size()) {
+		if (mathcursor && mathcursor->selection()) {
+			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));
@@ -709,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
@@ -722,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
@@ -740,7 +754,7 @@ void MathHullInset::doExtern
 }
 
 
-MathInset::result_type MathHullInset::dispatch
+dispatch_result MathHullInset::dispatch
 	(FuncRequest const & cmd, idx_type & idx, pos_type & pos)
 {
 	switch (cmd.action) {
@@ -755,29 +769,31 @@ MathInset::result_type 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();
-				for (row_type row = 0; row < nrows(); ++row)
-					numbered(row, !old);
+				if (type_ == "multline")
+					numbered(nrows() - 1, !old);
+				else
+					for (row_type row = 0; row < nrows(); ++row)
+						numbered(row, !old);
 				//bv->owner()->message(old ? _("No number") : _("Number"));
-				//updateLocal(bv, true);
 			}
 			return DISPATCHED;
 
 		case LFUN_MATH_NONUMBER:
 			if (display()) {
-				//bv->lockedInsetStoreUndo(Undo::INSERT);
-				bool old = numbered(row(idx));
+				row_type r = (type_ == "multline") ? nrows() - 1 : row(idx);
+				//recordUndo(bv, Undo::INSERT);
+				bool old = numbered(r);
 				//bv->owner()->message(old ? _("No number") : _("Number"));
-				numbered(row(idx), !old);
-				//updateLocal(bv, true);
+				numbered(r, !old);
 			}
 			return DISPATCHED;
 
 		case LFUN_INSERT_LABEL: {
-			row_type r = row(idx);
+			row_type r = (type_ == "multline") ? nrows() - 1 : row(idx);
 			string old_label = label(r);
 			string new_label = cmd.argument;
 
@@ -788,7 +804,7 @@ MathInset::result_type 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);
 			}
 
@@ -797,13 +813,6 @@ MathInset::result_type 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;
 		}
@@ -819,7 +828,7 @@ MathInset::result_type MathHullInset::dispatch
 			idx = r * ncols() + c;
 			if (idx >= nargs())
 				idx = nargs() - 1;
-			if (pos > cell(idx).size()) 
+			if (pos > cell(idx).size())
 				pos = cell(idx).size();
 			return DISPATCHED_POP;
 		}
@@ -833,7 +842,11 @@ MathInset::result_type MathHullInset::dispatch
 
 		default:
 			return MathGridInset::dispatch(cmd, idx, pos);
-
 	}
-	return UNDISPATCHED;
+}
+
+
+string MathHullInset::fileInsetLabel() const
+{
+	return "Formula";
 }