X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathCases.cpp;h=0a5fa332b1ab241b7c8a278d0534755f1c335e65;hb=ebd4e25588f61c7f566be6d7800b9e6c4bbcdeb1;hp=27ec6c3b95580d6925b0ae4fd4fe4b95c5b00e40;hpb=32871c1284f15265f652ff01c438e539a7c8181f;p=lyx.git

diff --git a/src/mathed/InsetMathCases.cpp b/src/mathed/InsetMathCases.cpp
index 27ec6c3b95..0a5fa332b1 100644
--- a/src/mathed/InsetMathCases.cpp
+++ b/src/mathed/InsetMathCases.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -11,110 +11,119 @@
 #include <config.h>
 
 #include "InsetMathCases.h"
+
+#include "Cursor.h"
+#include "FuncRequest.h"
+#include "FuncStatus.h"
+#include "support/gettext.h"
+#include "LaTeXFeatures.h"
 #include "MathData.h"
 #include "MathStream.h"
 #include "MathSupport.h"
-#include "FuncStatus.h"
-#include "LaTeXFeatures.h"
-#include "support/std_ostream.h"
-#include "Cursor.h"
-#include "FuncRequest.h"
-#include "gettext.h"
-#include "Undo.h"
+#include "MetricsInfo.h"
 
 #include "support/lstrings.h"
 
+#include <ostream>
 
-namespace lyx {
-
-using support::bformat;
+using namespace std;
+using namespace lyx::support;
 
-using std::endl;
-using std::max;
-using std::min;
-using std::swap;
-using std::auto_ptr;
+namespace lyx {
 
 
-InsetMathCases::InsetMathCases(row_type n)
-	: InsetMathGrid(2, n, 'c', from_ascii("ll"))
+InsetMathCases::InsetMathCases(Buffer * buf, row_type n)
+	: InsetMathGrid(buf, 2, n, 'c', from_ascii("ll"))
 {}
 
 
-auto_ptr<Inset> InsetMathCases::doClone() const
+Inset * InsetMathCases::clone() const
 {
-	return auto_ptr<Inset>(new InsetMathCases(*this));
+	return new InsetMathCases(*this);
 }
 
 
-bool InsetMathCases::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetMathCases::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	dim = dim_;
-	InsetMathGrid::metrics(mi);
-	dim_.wid += 8;
-
-	if (dim_ == dim)
-		return false;
-	dim = dim_;
-	return true;
+	Changer dummy = mi.base.changeEnsureMath();
+	InsetMathGrid::metrics(mi, dim);
 }
 
 
 void InsetMathCases::draw(PainterInfo & pi, int x, int y) const
 {
-	mathed_draw_deco(pi, x + 1, y - dim_.ascent(), 6, dim_.height(), from_ascii("{"));
-	InsetMathGrid::drawWithMargin(pi, x, y, 8, 0);
-	setPosCache(pi, x, y);
+	Changer dummy = pi.base.changeEnsureMath();
+	Dimension const dim = dimension(*pi.base.bv);
+	mathed_draw_deco(pi, x + 1, y - dim.ascent(), 6, dim.height(), from_ascii("{"));
+	InsetMathGrid::draw(pi, x, y);
 }
 
 
 void InsetMathCases::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
 	//lyxerr << "*** InsetMathCases: request: " << cmd << endl;
-	switch (cmd.action) {
+	switch (cmd.action()) {
 	case LFUN_TABULAR_FEATURE: {
-		recordUndo(cur);
-		docstring const & s = cmd.argument();
-		if (s == "add-vline-left" || s == "add-vline-right") {
+		string s = cmd.getArg(0);
+		// vertical lines and adding/deleting columns is not allowed for \cases
+		// FIXME: "I suspect that the break after cur.undispatched() should be a
+		// return; the recordUndo seems bogus too." (lasgouttes)
+		if (s == "append-column" || s == "delete-column"
+		    || s == "add-vline-left" || s == "add-vline-right") {
 			cur.undispatched();
 			break;
 		}
+		cur.recordUndo();
 	}
 	default:
-		InsetMathGrid::doDispatch(cur, cmd);
+		break;
 	}
+	InsetMathGrid::doDispatch(cur, cmd);
 }
 
 
 bool InsetMathCases::getStatus(Cursor & cur, FuncRequest const & cmd,
 		FuncStatus & flag) const
 {
-	switch (cmd.action) {
+	switch (cmd.action()) {
 	case LFUN_TABULAR_FEATURE: {
-		docstring const & s = cmd.argument();
+		string s = cmd.getArg(0);
 		if (s == "add-vline-left" || s == "add-vline-right") {
-			flag.enabled(false);
+			flag.setEnabled(false);
+			flag.message(bformat(
+				from_utf8(N_("No vertical grid lines in 'cases': feature %1$s")),
+				from_utf8(s)));
+			return true;
+		}
+		if (s == "append-column" || s == "delete-column") {
+			flag.setEnabled(false);
 			flag.message(bformat(
-				from_utf8(N_("No vertical grid lines in '%1$s'")),
-				s));
+				from_utf8(N_("Changing number of columns not allowed in "
+					     "'cases': feature %1$s")), from_utf8(s)));
 			return true;
 		}
+		break;
 	}
 	default:
-		return InsetMathGrid::getStatus(cur, cmd, flag);
+		break;
 	}
+	return InsetMathGrid::getStatus(cur, cmd, flag);
 }
 
 
 void InsetMathCases::write(WriteStream & os) const
 {
+	MathEnsurer ensurer(os);
 	if (os.fragile())
 		os << "\\protect";
+	bool open = os.startOuterRow();
 	os << "\\begin{cases}\n";
 	InsetMathGrid::write(os);
 	if (os.fragile())
 		os << "\\protect";
 	os << "\\end{cases}";
+	if (open)
+		os.startOuterRow();
 }
 
 
@@ -134,6 +143,21 @@ void InsetMathCases::maple(MapleStream & os) const
 }
 
 
+void InsetMathCases::mathmlize(MathStream & ms) const
+{
+	ms << "<mo form='prefix' fence='true' stretchy='true' symmetric='true'>{</mo>";
+	InsetMathGrid::mathmlize(ms);
+}
+
+
+// FIXME XHTML
+// We need a brace here, somehow.
+void InsetMathCases::htmlize(HtmlStream & ms) const
+{
+	InsetMathGrid::htmlize(ms, "class='cases'");
+}
+
+
 void InsetMathCases::infoize(odocstream & os) const
 {
 	os << "Cases ";
@@ -144,6 +168,18 @@ void InsetMathCases::validate(LaTeXFeatures & features) const
 {
 	features.require("amsmath");
 	InsetMathGrid::validate(features);
+	if (features.runparams().math_flavor == OutputParams::MathAsHTML)
+		// CSS based on eLyXer's, with modifications suggested in bug #8755
+		features.addCSSSnippet(
+			"table.cases{display: inline-block; text-align: center; border: none;"
+			"border-left: thin solid black; vertical-align: middle; padding-left: 0.5ex;}\n"
+			"table.cases td {text-align: left; border: none;}");
+}
+
+
+int InsetMathCases::displayColSpace(col_type) const
+{
+	return 20;
 }