backport 40700

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40704 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/mathed/InsetMathNest.cpp b/src/mathed/InsetMathNest.cpp
index 287cc8d9d3900f3e16e0b66abe9fbb714dcbe71e..a3d167b66416a7d4de29db5ac73094e3004ddaeb 100644 (file)
--- a/src/mathed/InsetMathNest.cpp
+++ b/src/mathed/InsetMathNest.cpp
@@ -1344,7 +1344,6 @@ bool InsetMathNest::getStatus(Cursor & cur, FuncRequest const & cmd,
        // 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;

diff --git a/src/mathed/InsetMathScript.cpp b/src/mathed/InsetMathScript.cpp
index 5970af9a9d637fe6b6c62bcb33264c2250c52adc..046b6791521638b6c3a07a84f768f3c466a89a75 100644 (file)
--- a/src/mathed/InsetMathScript.cpp
+++ b/src/mathed/InsetMathScript.cpp
@@ -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 @@ void InsetMathScript::doDispatch(Cursor & cur, FuncRequest & cmd)
        //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 @@ void InsetMathScript::doDispatch(Cursor & cur, FuncRequest & cmd)
 }
 
 
+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
 {

diff --git a/src/mathed/InsetMathScript.h b/src/mathed/InsetMathScript.h
index ecdda3b5a71e9262b335133e1a88cf282aece5e7..e84886b7d3bf922a8d42cae1e0beff345cc5de53 100644 (file)
--- a/src/mathed/InsetMathScript.h
+++ b/src/mathed/InsetMathScript.h
@@ -110,6 +110,9 @@ public:
        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

diff --git a/status.20x b/status.20x
index 8e7469b171f4feba9ae371209f50458864cb4a6d..2ec56276e94e6e72a440d139fcd9b8a4e9c4a068 100644 (file)
--- a/status.20x
+++ b/status.20x
@@ -87,6 +87,7 @@ What's new
 - 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 @@ What's new
 
 - 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 @@ What's new
   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 @@ What's new
 
 - 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).