* src/text3.C: disable MATH_INSERT in text mode

* lib/ui/stdmenus.ui: move math text styles from
        menu "insert" to menu "edit"


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15246 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Michael Schmitt 2006-10-04 19:29:15 +00:00
parent 90867eff0d
commit c1bea68c0f
2 changed files with 32 additions and 32 deletions

View File

@ -180,6 +180,8 @@ Menuset
Separator
Submenu "Change Formula Type|F" "edit_math_mutate"
Separator
Submenu "Text Style|T" "edit_math_textstyles"
Separator
Submenu "Use Computer Algebra System|S" "edit_math_extern"
Separator
Item "Split Cell|C" "cell-split"
@ -201,6 +203,31 @@ Menuset
Item "Inline|I" "math-limits nolimits"
End
Menu "edit_math_textstyles"
Item "Math Normal Font" "math-insert \mathnormal"
Separator
Item "Math Calligraphic Family" "math-insert \mathcal"
Item "Math Fraktur Family" "math-insert \mathfrak"
Item "Math Roman Family" "math-insert \mathrm"
Item "Math Sans Serif Family" "math-insert \mathsf"
Separator
Item "Math Bold Series" "math-insert \mathbf"
Separator
Item "Text Normal Font" "math-insert \textnormal"
Separator
Item "Text Roman Family" "math-insert \textrm"
Item "Text Sans Serif Family" "math-insert \textsf"
Item "Text Typewriter Family" "math-insert \texttt"
Separator
Item "Text Bold Series" "math-insert \textbf"
Item "Text Medium Series" "math-insert \textmd"
Separator
Item "Text Italic Shape" "math-insert \textit"
Item "Text Small Caps Shape" "math-insert \textsc"
Item "Text Slanted Shape" "math-insert \textsl"
Item "Text Upright Shape" "math-insert \textup"
End
Menu "edit_math_extern"
Item "Octave" "math-extern octave"
Item "Maxima" "math-extern maxima"
@ -315,41 +342,15 @@ Menuset
Item "AMS multline Environment|m" "command-sequence math-mode on; math-mutate multline;"
Separator
Item "Array Environment|y" "math-matrix 2 2"
Item "Cases Environment|C" "math-insert \cases"
Item "Aligned Environment" "command-sequence math-insert \aligned; tabular-feature append-column"
Item "AlignedAt Environment" "command-sequence math-insert \alignedat; tabular-feature append-column"
Item "Gathered Environment" "math-insert \gathered"
Item "Split Environment|S" "command-sequence math-insert \split; tabular-feature append-column"
Item "Cases Environment|C" "command-sequence math-mode on; math-insert \cases"
Item "Aligned Environment" "command-sequence math-mode on; math-insert \aligned; tabular-feature append-column"
Item "AlignedAt Environment" "command-sequence math-mode on; math-insert \alignedat; tabular-feature append-column"
Item "Gathered Environment" "command-sequence math-mode on; math-insert \gathered"
Item "Split Environment|S" "command-sequence math-mode on; math-insert \split; tabular-feature append-column"
Separator
Submenu "Font Change|o" "insert_math_font"
Item "Math Panel|P" "dialog-show mathpanel"
End
Menu "insert_math_font"
Item "Math Normal Font" "math-insert \mathnormal"
Separator
Item "Math Calligraphic Family" "math-insert \mathcal"
Item "Math Fraktur Family" "math-insert \mathfrak"
Item "Math Roman Family" "math-insert \mathrm"
Item "Math Sans Serif Family" "math-insert \mathsf"
Separator
Item "Math Bold Series" "math-insert \mathbf"
Separator
Item "Text Normal Font" "math-insert \textnormal"
Separator
Item "Text Roman Family" "math-insert \textrm"
Item "Text Sans Serif Family" "math-insert \textsf"
Item "Text Typewriter Family" "math-insert \texttt"
Separator
Item "Text Bold Series" "math-insert \textbf"
Item "Text Medium Series" "math-insert \textmd"
Separator
Item "Text Italic Shape" "math-insert \textit"
Item "Text Small Caps Shape" "math-insert \textsc"
Item "Text Slanted Shape" "math-insert \textsl"
Item "Text Upright Shape" "math-insert \textup"
End
Menu "insert_float"
FloatInsert
# This has got to be better than "Wrap", anyway

View File

@ -1763,7 +1763,6 @@ bool LyXText::getStatus(LCursor & cur, FuncRequest const & cmd,
case LFUN_MATH_IMPORT_SELECTION:
case LFUN_MATH_MODE:
case LFUN_MATH_MACRO:
case LFUN_MATH_INSERT:
case LFUN_MATH_MATRIX:
case LFUN_MATH_DELIM:
case LFUN_MATH_BIGDELIM: