#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"
}
-// FIXME: InsetMathGrid should be changed to let the real column alignment be
-// given by a virtual method like displayColAlign, because the values produced
-// by defaultColAlign can be invalidated by lfuns such as add-column. I suspect
-// that for the moment the values produced by defaultColAlign are not used,
-// notably because alignment is not implemented in the LyXHTML output.
char InsetMathSplit::defaultColAlign(col_type col)
{
if (name_ == "gathered")
}
+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);
}
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())