}
-//FIXME: This has probably no effect and can be removed.\r
+// 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")
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
+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::draw(PainterInfo & pi, int x, int y) const
{
InsetMathGrid::draw(pi, x, y);
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: