Fix drawing of empty boxes

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

diff --git a/src/mathed/InsetMathSplit.cpp b/src/mathed/InsetMathSplit.cpp
index 2adb84522b40392ec63b6257572a0df1ee59419c..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"
 
@@ -50,22 +51,61 @@ Inset * InsetMathSplit::clone() const
 
 char InsetMathSplit::defaultColAlign(col_type col)
 {
-       if (name_ == "split")
+       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);
+       return 'l';
+}
+
+
+char InsetMathSplit::displayColAlign(idx_type idx) const
+{
        if (name_ == "gathered")
                return 'c';
-       if (name_ == "aligned" || name_ == "align")
-               return (col & 1) ? 'l' : 'r';
+       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 (col & 1) ? 'l' : 'r';
-       return 'l';
+               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);
 }
 
 
@@ -82,6 +122,10 @@ bool InsetMathSplit::getStatus(Cursor & cur, FuncRequest const & cmd,
                        flag.setEnabled(false);
                        return true;
                }
+               if (s == "align-left" || s == "align-center" || s == "align-right") {
+                       flag.setEnabled(false);
+                       return true;
+               }
                break;
        }
        default:
@@ -101,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())