Author: lasgouttes
Date: Thu Feb 2 23:39:26 2012
New Revision: 40704
URL: http://www.lyx.org/trac/changeset/40704
Log:
backport 40700
Modified:
lyx-devel/branches/BRANCH_2_0_X/src/mathed/InsetMathNest.cpp
lyx-devel/branches/BRANCH_2_0_X/src/mathed/InsetMathScript.cpp
lyx-devel/branches/BRANCH_2_0_X/src/mathed/InsetMathScript.h
lyx-devel/branches/BRANCH_2_0_X/status.20x
Modified: lyx-devel/branches/BRANCH_2_0_X/src/mathed/InsetMathNest.cpp
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/src/mathed/InsetMathNest.cpp Thu Feb
2 23:30:38 2012 (r40703)
+++ lyx-devel/branches/BRANCH_2_0_X/src/mathed/InsetMathNest.cpp Thu Feb
2 23:39:26 2012 (r40704)
@@ -1344,7 +1344,6 @@
// we just need to be in math mode to enable that
case LFUN_MATH_SIZE:
case LFUN_MATH_SPACE:
- case LFUN_MATH_LIMITS:
case LFUN_MATH_EXTERN:
flag.setEnabled(true);
break;
Modified: lyx-devel/branches/BRANCH_2_0_X/src/mathed/InsetMathScript.cpp
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/src/mathed/InsetMathScript.cpp Thu Feb
2 23:30:38 2012 (r40703)
+++ lyx-devel/branches/BRANCH_2_0_X/src/mathed/InsetMathScript.cpp Thu Feb
2 23:39:26 2012 (r40704)
@@ -14,6 +14,7 @@
#include "Cursor.h"
#include "DispatchResult.h"
#include "FuncRequest.h"
+#include "FuncStatus.h"
#include "InsetMathFont.h"
#include "InsetMathScript.h"
#include "InsetMathSymbol.h"
@@ -754,6 +755,7 @@
//LYXERR("InsetMathScript: request: " << cmd);
if (cmd.action() == LFUN_MATH_LIMITS) {
+ cur.recordUndoInset();
if (!cmd.argument().empty()) {
if (cmd.argument() == "limits")
limits_ = 1;
@@ -772,6 +774,26 @@
}
+bool InsetMathScript::getStatus(Cursor & cur, FuncRequest const & cmd,
+ FuncStatus & flag) const
+{
+ if (cmd.action() == LFUN_MATH_LIMITS) {
+ if (!cmd.argument().empty()) {
+ if (cmd.argument() == "limits")
+ flag.setOnOff(limits_ == 1);
+ else if (cmd.argument() == "nolimits")
+ flag.setOnOff(limits_ == -1);
+ else
+ flag.setOnOff(limits_ == 0);
+ }
+ flag.setEnabled(true);
+ return true;
+ }
+
+ return InsetMathNest::getStatus(cur, cmd, flag);
+}
+
+
// the idea for dual scripts came from the eLyXer code
void InsetMathScript::validate(LaTeXFeatures & features) const
{
Modified: lyx-devel/branches/BRANCH_2_0_X/src/mathed/InsetMathScript.h
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/src/mathed/InsetMathScript.h Thu Feb
2 23:30:38 2012 (r40703)
+++ lyx-devel/branches/BRANCH_2_0_X/src/mathed/InsetMathScript.h Thu Feb
2 23:39:26 2012 (r40704)
@@ -110,6 +110,9 @@
void validate(LaTeXFeatures &features) const;
protected:
virtual void doDispatch(Cursor & cur, FuncRequest & cmd);
+ /// do we want to handle this event?
+ bool getStatus(Cursor & cur, FuncRequest const & cmd,
+ FuncStatus & status) const;
private:
virtual Inset * clone() const;
/// returns x offset for main part
Modified: lyx-devel/branches/BRANCH_2_0_X/status.20x
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/status.20x Thu Feb 2 23:30:38 2012
(r40703)
+++ lyx-devel/branches/BRANCH_2_0_X/status.20x Thu Feb 2 23:39:26 2012
(r40704)
@@ -87,6 +87,7 @@
- We now use the display string as a tooltip in the Outliner, if no
other tooltip is given.
+- Show check mark on current math limit type in Edit>Math submenu.
* DOCUMENTATION AND LOCALIZATION
@@ -121,7 +122,7 @@
- Support configure --with-packaging=posix on Mac OS X (bug 7927).
-- Improved disk image creation:
+- Improved disk image creationi on Mac OS X:
* Provide translation of the application menu.
* Enhanced background image.
* Package with hunspell dictionaries is default.
@@ -199,6 +200,8 @@
this does not work properly if the branches are in a master document that is
hidden, but this is a larger issue.
+- Fix undo after changing limit type of a subscript in math mode (bug 8007).
+
- Fix inconsistent state of horizontal space dialog on start up (bug 7906).
- Unify display of theorem headings (bug 7883).
@@ -208,7 +211,7 @@
- Correctly display and handle the math commands \pod and \mod (bug 7962).
-- Fix tabbar visibility in fullscreen mode when opening/closing files (bug
7963).
+- Fix tabbar visibility in fullscreen mode when opening/closing files (bug
7G963).
- Show a message box if the current spell checker has no dictionaries (bug
7884).
