Fix bug #6041: "tabular-feature align-" in a math-matrix.

Also fix display of centered vertical alignment status and smash
unnecessary debug output.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@30374 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Enrico Forestieri 2009-07-05 14:01:53 +00:00
parent a12dd5880d
commit 09eb90bd3e
2 changed files with 8 additions and 4 deletions

View File

@ -1243,7 +1243,7 @@ void InsetMathGrid::doDispatch(Cursor & cur, FuncRequest & cmd)
break; break;
} }
// perhaps this should be FINISHED_BACKWARD -- just for clarity? // perhaps this should be FINISHED_BACKWARD -- just for clarity?
lyxerr << "returning FINISHED_LEFT" << endl; //lyxerr << "returning FINISHED_LEFT" << endl;
break; break;
} }
@ -1406,7 +1406,8 @@ bool InsetMathGrid::getStatus(Cursor & cur, FuncRequest const & cmd,
|| (s == "align-center" && ha == 'c') || (s == "align-center" && ha == 'c')
|| (s == "valign-top" && va == 't') || (s == "valign-top" && va == 't')
|| (s == "valign-bottom" && va == 'b') || (s == "valign-bottom" && va == 'b')
|| (s == "valign-middle" && va == 'm')); || (s == "valign-middle" && va == 'c'));
return true;
} }
if (s == "append-row" || s == "delete-row" || if (s == "append-row" || s == "delete-row" ||
s == "copy-row" || s == "swap-row" || s == "copy-row" || s == "swap-row" ||
@ -1415,9 +1416,9 @@ bool InsetMathGrid::getStatus(Cursor & cur, FuncRequest const & cmd,
s == "append-column" || s == "delete-column" || s == "append-column" || s == "delete-column" ||
s == "copy-column" || s == "swap-column" || s == "copy-column" || s == "swap-column" ||
s == "add-vline-left" || s == "add-vline-right" || s == "add-vline-left" || s == "add-vline-right" ||
s == "delete-vline-left" || s == "delete-vline-right") s == "delete-vline-left" || s == "delete-vline-right") {
status.setEnabled(true); status.setEnabled(true);
else { } else {
status.setEnabled(false); status.setEnabled(false);
status.message(bformat( status.message(bformat(
from_utf8(N_("Unknown tabular feature '%1$s'")), lyx::from_ascii(s))); from_utf8(N_("Unknown tabular feature '%1$s'")), lyx::from_ascii(s)));

View File

@ -166,6 +166,9 @@ What's new
- Fix context menu for insets inside a branch inset (bug 6022). - Fix context menu for insets inside a branch inset (bug 6022).
- Fix command "tabular-feature align-(left|right|center)" which was
inadvertently disabled for a math matrix (bug 6041).
* DOCUMENTATION AND LOCALIZATION * DOCUMENTATION AND LOCALIZATION