Merge branch 'master' into biblatex2

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

diff --git a/src/mathed/InsetMathSplit.cpp b/src/mathed/InsetMathSplit.cpp
index 07e78f41a2472713b92225d576e4b459fc79171f..c260e2e51eb053f159209df4c633494e1ce00e44 100644 (file)
--- a/src/mathed/InsetMathSplit.cpp
+++ b/src/mathed/InsetMathSplit.cpp
@@ -14,12 +14,13 @@
 
 #include "MathData.h"
 #include "MathStream.h"
-#include "MathStream.h"
+#include "MathSupport.h"
 
 #include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "support/gettext.h"
 #include "LaTeXFeatures.h"
+#include "MetricsInfo.h"
 
 #include "support/lstrings.h"
 
@@ -48,56 +49,63 @@ Inset * InsetMathSplit::clone() const
 }
 
 
-//FIXME: This has probably no effect and can be removed.\r
 char InsetMathSplit::defaultColAlign(col_type col)
 {
        if (name_ == "gathered")
                return 'c';
-       if (name_ == "lgathered")\r
-               return 'l';\r
-       if (name_ == "rgathered")\r
-               return 'r';\r
-       if (name_ == "split"\r
-           || name_ == "aligned"\r
-           || name_ == "align"\r
-           || name_ == "alignedat")\r
-               return colAlign(hullAlign, col);\r
+       if (name_ == "lgathered")
+               return 'l';
+       if (name_ == "rgathered")
+               return 'r';
+       if (name_ == "split"
+           || name_ == "aligned"
+           || name_ == "align"
+           || name_ == "alignedat")
+               return colAlign(hullAlign, col);
        return 'l';
 }
 
 
-char InsetMathSplit::displayColAlign(idx_type idx) const\r
-{\r
-       if (name_ == "gathered")\r
-               return 'c';\r
-       if (name_ == "lgathered")\r
-               return 'l';\r
-       if (name_ == "rgathered")\r
-               return 'r';\r
-       if (name_ == "split"\r
-           || name_ == "aligned"\r
-           || name_ == "align"\r
-           || name_ == "alignedat")\r
-               return colAlign(hullAlign, col(idx));\r
-       return InsetMathGrid::displayColAlign(idx);\r
-}\r
-\r
-\r
-int InsetMathSplit::displayColSpace(col_type col) const\r
-{\r
-       if (name_ == "split" || name_ == "aligned" || name_ == "align")\r
-               return colSpace(hullAlign, col);\r
-       if (name_ == "alignedat")\r
-               return colSpace(hullAlignAt, col);\r
-       return 0;\r
-}\r
-\r
-\r
-\r
+char InsetMathSplit::displayColAlign(idx_type idx) const
+{
+       if (name_ == "gathered")
+               return 'c';
+       if (name_ == "lgathered")
+               return 'l';
+       if (name_ == "rgathered")
+               return 'r';
+       if (name_ == "split"
+           || name_ == "aligned"
+           || name_ == "align"
+           || name_ == "alignedat")
+               return colAlign(hullAlign, col(idx));
+       return InsetMathGrid::displayColAlign(idx);
+}
+
+
+int InsetMathSplit::displayColSpace(col_type col) const
+{
+       if (name_ == "split" || name_ == "aligned" || name_ == "align")
+               return colSpace(hullAlign, col);
+       if (name_ == "alignedat")
+               return colSpace(hullAlignAt, col);
+       return 0;
+}
+
+
+
+void InsetMathSplit::metrics(MetricsInfo & mi, Dimension & dim) const
+{
+       Changer dummy = mi.base.changeEnsureMath();
+       InsetMathGrid::metrics(mi, dim);
+}
+
+
+
 void InsetMathSplit::draw(PainterInfo & pi, int x, int y) const
 {
+       Changer dummy = pi.base.changeEnsureMath();
        InsetMathGrid::draw(pi, x, y);
-       setPosCache(pi, x, y);
 }
 
 
@@ -105,23 +113,19 @@ bool InsetMathSplit::getStatus(Cursor & cur, FuncRequest const & cmd,
                FuncStatus & flag) const
 {
        switch (cmd.action()) {
-       case LFUN_INSET_MODIFY: {
-               istringstream is(to_utf8(cmd.argument()));
-               string s;
-               is >> s;
-               if (s != "tabular")
-                       break;
-               is >> s;
+       case LFUN_TABULAR_FEATURE: {
+               string s = cmd.getArg(0);
                if (s == "add-vline-left" || s == "add-vline-right") {
                        flag.message(bformat(
-                               from_utf8(N_("Can't add vertical grid lines in '%1$s'")),       name_));
+                               from_utf8(N_("Can't add vertical grid lines in '%1$s'")),
+                               name_));
+                       flag.setEnabled(false);
+                       return true;
+               }
+               if (s == "align-left" || s == "align-center" || s == "align-right") {
                        flag.setEnabled(false);
                        return true;
                }
-               if (s == "align-left" || s == "align-center" || s == "align-right") {\r
-                       flag.setEnabled(false);\r
-                       return true;\r
-               }\r
                break;
        }
        default:
@@ -141,9 +145,19 @@ void InsetMathSplit::write(WriteStream & ws) const
                suffix = from_ascii("*");
        ws << "\\begin{" << name_ << suffix << '}';
        bool open = ws.startOuterRow();
-       if (name_ != "split" && name_ != "align" && verticalAlignment() != 'c')
-               ws << '[' << verticalAlignment() << ']';
-       if (name_ == "alignedat")
+       bool const hasArg(name_ == "alignedat");
+       if (name_ != "split" && name_ != "align") {
+               if (verticalAlignment() != 'c')
+                       ws << '[' << verticalAlignment() << ']';
+               else if (!hasArg) {
+                       docstring const first(asString(cell(0)));
+                       // prevent misinterpretation of the first character of
+                       // the first cell as optional argument (bug 10361)
+                       if (!first.empty() && first[0] == '[')
+                               ws << "[]";
+               }
+       }
+       if (hasArg)
                ws << '{' << static_cast<unsigned int>((ncols() + 1)/2) << '}';
        InsetMathGrid::write(ws);
        if (ws.fragile())