make math-extern a bit more visible in Edit->Math,

revamp some math key bindings
add \boxed to the list of known things

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4815 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/ChangeLog b/lib/ChangeLog
index eb94a6b6e4402d08e56325b5be0fa73e2926a433..5f322309035a976504b17a83f216ac09a810c73a 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,10 @@
+2002-07-30  André Pönitz <poenitz@gmx.net>
+       
+       * configure.m4:
+       * ui/default.ui: make math-extern a bit more visible in Edit->Math
+
+       * bind/math.bind: remove some strange bindings for Ø and Å
+
 2002-07-30  Angus Leeming  <leeming@lyx.org>
 
        * scripts/lyxpreview2ppm.sh: rename bbox.sed so that multiple runs

diff --git a/lib/bind/math.bind b/lib/bind/math.bind
index 440009ce5b0a87d2302d9b0eea4691087daec071..39e57bf9898d0ea406d44c3e52d080965d243bdc 100644 (file)
--- a/lib/bind/math.bind
+++ b/lib/bind/math.bind
@@ -31,10 +31,6 @@
 \bind "M-m e"                  "math-superscript"
 \bind "M-m x"                  "math-subscript"
 
-\bind "M-m S-A"                "command-sequence math-mode; font-roman; math-insert Å;"
-\bind "M-m S-O"                "command-sequence math-mode; font-roman; math-insert Ø;"
-\bind "M-m S-T"                "command-sequence math-mode; math-insert \mathrm; math-insert T;"
-
 \bind "M-m u"                  "math-insert \sum"
 \bind "M-m i"                  "math-insert \int"
 \bind "M-m m"                  "math-mode"
@@ -59,11 +55,13 @@
 \bind "M-m o 8"   "self-insert \#8"
 \bind "M-m o 9"   "self-insert \#9"
 
+\bind "M-m t n"   "math-mutate none"
 \bind "M-m t t"   "math-mutate dump"
 \bind "M-m t a"   "math-mutate align"
-\bind "M-m t i"   "math-mutate inline"
-\bind "M-m t d"   "math-mutate display"
+\bind "M-m t i"   "math-mutate simple"
+\bind "M-m t d"   "math-mutate equation"
 \bind "M-m t e"   "math-mutate eqnarray"
+\bind "M-m t m"   "math-mutate multline"
 
 \bind "M-m c i"   "math-column-insert"
 \bind "M-m c d"   "math-column-delete"

diff --git a/lib/configure.m4 b/lib/configure.m4
index b0c7a2b1fb6d45d22bf79b7dc6a9f020018c5631..b085e49e6957d7b6270d25728591dd3f0cfbfafb 100644 (file)
--- a/lib/configure.m4
+++ b/lib/configure.m4
@@ -285,6 +285,10 @@ LYXRC_PROG([for ChkTeX], \chktex_command,dnl
 # Search for a spellchecker
 LYXRC_PROG([for a spell-checker], \spell_command, ispell)
 
+# Search for computer algebra systems
+SEARCH_PROG([for Octave],OCTAVE,octave)
+SEARCH_PROG([for Maple],MAPLE,maple)
+
 dnl # Search a Fax handling program
 dnl SEARCH_PROG([for a fax driver], FAX, sendfax faxsend fax)
 dnl if test $FAX = sendfax ; then

diff --git a/lib/symbols b/lib/symbols
index ba9a6be21b8a7a14a9e498e85b034b2fcdc1eddb..932b5dc09d3c31d96e6c66659cbea9b2a8649dcd 100644 (file)
--- a/lib/symbols
+++ b/lib/symbols
@@ -111,6 +111,7 @@ label             label       none
 left              left        none
 end               end         none
 fbox              fbox        none
+boxed             fbox        none
 
 
 #

diff --git a/lib/ui/default.ui b/lib/ui/default.ui
index 7e21b5911541250269b84ecb654f47ae903cf0f8..25ca9b63ed39e3d7dd333b47d0c8305a23f64afa 100644 (file)
--- a/lib/ui/default.ui
+++ b/lib/ui/default.ui
@@ -126,13 +126,9 @@ Menuset
        Item "Toggle numbering of line|u" "math-nonumber"
        Item "Toggle limits|l" "math-limits"
        Separator
-       Item "Inline formula|I" "math-mutate simple"
-       Item "Displayed formula|D" "math-mutate equation"
-       Item "Eqnarray environment|q" "math-mutate eqnarray"
-       Item "Align environment|A" "math-mutate align"
-       Item "AlignAt environment" "math-mutate alignat"
-       Item "XAlignAt environment" "math-mutate xalignat"
-       Item "XXAlignAt environment" "math-mutate xxalignat"
+       Submenu "Change formula type...|t" "edit_math_mutate"
+       Separator
+       Submenu "Call external CAS...|t" "edit_math_extern"
        Separator
        Item "Align Left|f" "math-halign left"
        Item "Align Center|C" "math-halign center"
@@ -149,6 +145,26 @@ Menuset
        Item "Delete Column" "math-column-delete"
     End
 
+    Menu "edit_math_extern"
+       Item "Octave" "math-extern octave"
+       Separator
+       Item "Maple, simplify" "math-extern maple simplify"
+       Item "Maple, factor" "math-extern maple factor"
+       Item "Maple, evalm" "math-extern maple evalm"
+       Item "Maple, evalf" "math-extern maple evalf"
+    End
+
+    Menu "edit_math_mutate"
+       Item "Inline formula|I" "math-mutate simple"
+       Item "Displayed formula|D" "math-mutate equation"
+       Item "Eqnarray environment|q" "math-mutate eqnarray"
+       Item "Align environment|A" "math-mutate align"
+       Item "AlignAt environment" "math-mutate alignat"
+       Item "XAlignAt environment" "math-mutate xalignat"
+       Item "XXAlignAt environment" "math-mutate xxalignat"
+       Item "Multline environment" "math-mutate multline"
+    End
+
 #
 # INSERT MENU
 #
@@ -199,6 +215,7 @@ Menuset
        Item "AMS alignat environment|t" "command-sequence math-mode; math-mutate alignat;"
        Item "AMS xalignat environment|x" "command-sequence math-mode; math-mutate xalignat;"
        Item "AMS xxalignat environment" "command-sequence math-mode; math-mutate xxalignat;"
+       Item "AMS multline environment" "command-sequence math-mode; math-mutate multline;"
   Separator
        Item "Array environment|y" "math-insert matrix 2 2"
        Item "Cases environment|C" "math-insert cases 2"