From 09eb90bd3e4e21d33a3e428058b1e66029b3cd02 Mon Sep 17 00:00:00 2001
From: Enrico Forestieri <forenr@lyx.org>
Date: Sun, 5 Jul 2009 14:01:53 +0000
Subject: [PATCH] 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
---
 src/mathed/InsetMathGrid.cpp | 9 +++++----
 status.16x                   | 3 +++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/mathed/InsetMathGrid.cpp b/src/mathed/InsetMathGrid.cpp
index d4ac3b1b19..a6f19b5bea 100644
--- a/src/mathed/InsetMathGrid.cpp
+++ b/src/mathed/InsetMathGrid.cpp
@@ -1243,7 +1243,7 @@ void InsetMathGrid::doDispatch(Cursor & cur, FuncRequest & cmd)
 			break;
 		}
 		// perhaps this should be FINISHED_BACKWARD -- just for clarity?
-		lyxerr << "returning FINISHED_LEFT" << endl;
+		//lyxerr << "returning FINISHED_LEFT" << endl;
 		break;
 	}
 
@@ -1406,7 +1406,8 @@ bool InsetMathGrid::getStatus(Cursor & cur, FuncRequest const & cmd,
 					|| (s == "align-center"  && ha == 'c')
 					|| (s == "valign-top"    && va == 't')
 					|| (s == "valign-bottom" && va == 'b')
-					|| (s == "valign-middle" && va == 'm'));
+					|| (s == "valign-middle" && va == 'c'));
+			return true;
 		}
 		if (s == "append-row" || s == "delete-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 == "copy-column" || s == "swap-column" ||
 		    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);
-		else {
+		} else {
 			status.setEnabled(false);
 			status.message(bformat(
 				from_utf8(N_("Unknown tabular feature '%1$s'")), lyx::from_ascii(s)));
diff --git a/status.16x b/status.16x
index e83076a468..c7e1319119 100644
--- a/status.16x
+++ b/status.16x
@@ -166,6 +166,9 @@ What's new
 
 - 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