Better fix for bug #8679

[lyx.git] / src / mathed / InsetMathCases.cpp

diff --git a/src/mathed/InsetMathCases.cpp b/src/mathed/InsetMathCases.cpp
index 4edc6e8125dea33c6bc73dc7f53a268ff5b92189..d6f7133e2a1c33cbb0bda78ebd55ac1ddb36125c 100644 (file)
--- 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,103 +11,125 @@
 #include <config.h>
 
 #include "InsetMathCases.h"
-#include "MathArray.h"
-#include "MathStream.h"
-#include "MathSupport.h"
+
+#include "Cursor.h"
+#include "FuncRequest.h"
 #include "FuncStatus.h"
+#include "support/gettext.h"
 #include "LaTeXFeatures.h"
-#include "support/std_ostream.h"
-#include "LCursor.h"
-#include "FuncRequest.h"
-#include "gettext.h"
-#include "Undo.h"
+#include "MathData.h"
+#include "MathStream.h"
+#include "MathSupport.h"
+#include "MetricsInfo.h"
 
 #include "support/lstrings.h"
 
+#include <ostream>
+
+using namespace std;
+using namespace lyx::support;
 
 namespace lyx {
 
-using support::bformat;
 
-using std::endl;
-using std::max;
-using std::min;
-using std::swap;
-using std::auto_ptr;
+InsetMathCases::InsetMathCases(Buffer * buf, row_type n)
+       : InsetMathGrid(buf, 2, n, 'c', from_ascii("ll"))
+{}
 
 
-InsetMathCases::InsetMathCases(row_type n)
-       : InsetMathGrid(2, n, 'c', from_ascii("ll"))
-{}
+Inset * InsetMathCases::clone() const
+{
+       return new InsetMathCases(*this);
+}
 
 
-auto_ptr<InsetBase> InsetMathCases::doClone() const
+void InsetMathCases::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       return auto_ptr<InsetBase>(new InsetMathCases(*this));
+       InsetMathGrid::metrics(mi, dim);
+       dim.wid += 8;
 }
 
 
-bool InsetMathCases::metrics(MetricsInfo & mi, Dimension & dim) const
+Dimension const InsetMathCases::dimension(BufferView const & bv) const
 {
-       dim = dim_;
-       InsetMathGrid::metrics(mi);
-       dim_.wid += 8;
-
-       if (dim_ == dim)
-               return false;
-       dim = dim_;
-       return true;
+       Dimension dim = InsetMathGrid::dimension(bv);
+       dim.wid += 8;
+       return 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("{"));
+       Dimension const dim = dimension(*pi.base.bv);
+       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);
 }
 
 
-void InsetMathCases::doDispatch(LCursor & cur, FuncRequest & cmd)
+void InsetMathCases::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
        //lyxerr << "*** InsetMathCases: request: " << cmd << endl;
-       switch (cmd.action) {
-       case LFUN_TABULAR_FEATURE: {
-               recordUndo(cur);
-               docstring const & s = cmd.argument();
-               if (s == "add-vline-left" || s == "add-vline-right") {
+       switch (cmd.action()) {
+       case LFUN_INSET_MODIFY: {
+               istringstream is(to_utf8(cmd.argument()));
+               string s;
+               is >> s;
+               if (s != "tabular")
+                       break;
+               is >> s;
+               // vertical lines and adding/deleting columns is not allowed for \cases
+               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(LCursor & cur, FuncRequest const & cmd,
+bool InsetMathCases::getStatus(Cursor & cur, FuncRequest const & cmd,
                FuncStatus & flag) const
 {
-       switch (cmd.action) {
-       case LFUN_TABULAR_FEATURE: {
-               docstring const & s = cmd.argument();
+       switch (cmd.action()) {
+       case LFUN_INSET_MODIFY: {
+               istringstream is(to_utf8(cmd.argument()));
+               string s;
+               is >> s;
+               if (s != "tabular")
+                       break;
+               is >> s;
                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 '%1$s'")),
-                               s));
+                               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_("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";
        os << "\\begin{cases}\n";
@@ -134,6 +156,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 +181,12 @@ void InsetMathCases::validate(LaTeXFeatures & features) const
 {
        features.require("amsmath");
        InsetMathGrid::validate(features);
+       if (features.runparams().math_flavor == OutputParams::MathAsHTML)
+               // CSS based on eLyXer's
+               features.addCSSSnippet(
+                       "table.cases{display: inline-block; text-align: center;"
+                       "border-left: thin solid black; vertical-align: middle; padding-left: 0.5ex;}\n"
+                       "table.cases td {text-align: left;}");
 }