anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-26 06:15:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

backport 40700

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40704 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jean-Marc Lasgouttes 2012-02-02 22:39:26 +00:00
parent 7f9e3f470d
commit b0721c5c2f
4 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/mathed/InsetMathNest.cpp
View File

@ -1344,7 +1344,6 @@ bool InsetMathNest::getStatus(Cursor & cur, FuncRequest const & cmd,
// we just need to be in math mode to enable that // we just need to be in math mode to enable that
case LFUN_MATH_SIZE: case LFUN_MATH_SIZE:
case LFUN_MATH_SPACE: case LFUN_MATH_SPACE:
case LFUN_MATH_LIMITS:
case LFUN_MATH_EXTERN: case LFUN_MATH_EXTERN:
flag.setEnabled(true); flag.setEnabled(true);
break; break;

22
src/mathed/InsetMathScript.cpp
View File

@ -14,6 +14,7 @@
#include "Cursor.h" #include "Cursor.h"
#include "DispatchResult.h" #include "DispatchResult.h"
#include "FuncRequest.h" #include "FuncRequest.h"
#include "FuncStatus.h"
#include "InsetMathFont.h" #include "InsetMathFont.h"
#include "InsetMathScript.h" #include "InsetMathScript.h"
#include "InsetMathSymbol.h" #include "InsetMathSymbol.h"
@ -754,6 +755,7 @@ void InsetMathScript::doDispatch(Cursor & cur, FuncRequest & cmd)
//LYXERR("InsetMathScript: request: " << cmd); //LYXERR("InsetMathScript: request: " << cmd);
if (cmd.action() == LFUN_MATH_LIMITS) { if (cmd.action() == LFUN_MATH_LIMITS) {
cur.recordUndoInset();
if (!cmd.argument().empty()) { if (!cmd.argument().empty()) {
if (cmd.argument() == "limits") if (cmd.argument() == "limits")
limits_ = 1; 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 // the idea for dual scripts came from the eLyXer code
void InsetMathScript::validate(LaTeXFeatures & features) const void InsetMathScript::validate(LaTeXFeatures & features) const
{ {

3
src/mathed/InsetMathScript.h
View File

@ -110,6 +110,9 @@ public:
void validate(LaTeXFeatures &features) const; void validate(LaTeXFeatures &features) const;
protected: protected:
virtual void doDispatch(Cursor & cur, FuncRequest & cmd); 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: private:
virtual Inset * clone() const; virtual Inset * clone() const;
/// returns x offset for main part /// returns x offset for main part

7
status.20x
View File

@ -87,6 +87,7 @@ What's new
- We now use the display string as a tooltip in the Outliner, if no - We now use the display string as a tooltip in the Outliner, if no
other tooltip is given. other tooltip is given.
- Show check mark on current math limit type in Edit>Math submenu.
* DOCUMENTATION AND LOCALIZATION * DOCUMENTATION AND LOCALIZATION
@ -121,7 +122,7 @@ What's new
- Support configure --with-packaging=posix on Mac OS X (bug 7927). - 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. * Provide translation of the application menu.
* Enhanced background image. * Enhanced background image.
* Package with hunspell dictionaries is default. * 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 this does not work properly if the branches are in a master document that is
hidden, but this is a larger issue. 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). - Fix inconsistent state of horizontal space dialog on start up (bug 7906).
- Unify display of theorem headings (bug 7883). - 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). - 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). - Show a message box if the current spell checker has no dictionaries (bug 7884).