fix bug 662 (remove accent-vector)

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

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 262cfea8f05420b8f8f8168ab0d76be91427ef18..465f6e4fbf0e48d12239f97fc9412206cae8b31d 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-22  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * bind/sciword.bind: big update: use menus.bind and maths.bind and
+       make sure we do not use accent-vector
+
 2002-11-25  Dekel Tsur  <dekelts@tau.ac.il>
 
        * kbd/arabic.kmap: Fix map (patch from Isam Bayazidi).

diff --git a/lib/bind/sciword.bind b/lib/bind/sciword.bind
index db4a56ab6c5f08dc95c2fb2b2a9066bd85b54127..5e14e7f7a0256abcc23042e4ba78123e3e6c3597 100644 (file)
--- a/lib/bind/sciword.bind
+++ b/lib/bind/sciword.bind
@@ -2,6 +2,8 @@
 
 # LyX keyboard definitions similar to those of Scientific Word.
 # Prepared by Serge Winitzki. Version 1.2
+# Somewhat updated by Jean-Marc Lasgouttes (I'm sure that I simplified it, 
+#    but I'm not sure that I did not break it :)
 
 # Tip: to find the "LyX name" for a key, look at the status bar after
 # typing some non-existent key combination. E.g. to find how "Ctrl-&" is
@@ -99,7 +101,7 @@
 \bind "S-C-quotedbl"   "accent-umlaut"
 \bind "C-apostrophe"   "accent-acute"
 \bind "S-C-asciicircum" "accent-circumflex"
-\bind "C-equal"                "accent-vector"
+\bind "C-equal"                "math-insert \vec"
 # Why is it not "accent-bar"?
 \bind "C-minus"        "math-insert \bar"
 # What is "accent-underbar"?
@@ -124,20 +126,6 @@
 #\bind "F9"                     "------"
 #\bind "F10"                    "------"
 
-#
-# Math menu (unmodified)
-#
-
-\bind "M-m f"                  "math-insert \frac"
-\bind "M-m i"                  "math-insert \int"
-\bind "M-m o"                  "math-insert \oint"
-\bind "M-m p"                  "math-insert \partial"
-\bind "M-m s"                  "math-insert \sqrt"
-\bind "M-m S-S"                "math-insert \sum"
-\bind "M-m l"                  "math-limits"
-\bind "M-m n"                  "math-number"
-\bind "M-m v"                  "accent-vector"
-
 # Sciword mnemonics for math editing:
 
 \bind "M-apostrophe"   "math-insert \prime"
@@ -164,6 +152,9 @@
 \bind "C-s S-less"     "math-insert \ll"
 \bind "C-s S-greater"  "math-insert \gg"
 
+# usual math bindings
+\bind_file maths.bind
+
        ############################
 ######### Almost no changes below. #########
        ############################
@@ -232,6 +223,7 @@
 \bind "S-KP_Insert"             "paste"
 \bind "S-KP_Delete"             "cut"
 
+
 #
 # Edit group
 #
@@ -249,113 +241,12 @@
 \bind "F9"                     "meta-prefix"
 
 
-
-#
-# Font size menu
-#
-
-\bind "M-s S-A"                "font-size largest"             # \LARGE
-\bind "M-s g"                  "font-size giant"               # \Huge
-\bind "M-s h"                  "font-size huge"                # \huge
-\bind "M-s S-H"                "font-size giant"               # \Huge
-\bind "M-s l"                  "font-size large"               # \large
-\bind "M-s S-L"                "font-size larger"              # \Large
-\bind "M-s n"                  "font-size normal"              # \normalsize
-\bind "M-s s"                  "font-size small"               # \small
-\bind "M-s t"                  "font-size tiny"                # \tiny
-
-\bind "M-s 1"                  "font-size tiny"
-\bind "M-s 2"                  "font-size small"
-\bind "M-s 3"                  "font-size normal"
-\bind "M-s 4"                  "font-size large"
-\bind "M-s 5"                  "font-size larger"
-\bind "M-s 6"                  "font-size largest"
-\bind "M-s 7"                  "font-size huge"
-\bind "M-s 8"                  "font-size giant"
-
-
-
-#
-# Alignment menu
-#
-
-#\bind "M-a l"                  "para-align left"               # Not yet implemented!
-#\bind "M-a r"                  "para-align right"              # Not yet implemented!
-#\bind "M-a c"                  "para-align center"             # Not yet implemented!
-#\bind "M-a b"                  "para-align block"              # Not yet implemented!
-#\bind "M-a f"                  "para-align block"              # Not yet implemented!
-#\bind "M-a d"                  "para-align default"            # Not yet implemented!
-
-
-
-#
-# Paragraph style menu
-#
-
-\bind "M-p c"                  "drop-layouts-choice"
-\bind "M-p 1"                  "layout Chapter"
-\bind "M-p 2"                  "layout Section"
-\bind "M-p 3"                  "layout Subsection"
-\bind "M-p 4"                  "layout Subsubsection"
-\bind "M-p 5"                  "layout Paragraph"
-\bind "M-p 6"                  "layout Subparagraph"
-\bind "M-p b"                  "layout Itemize"                        # bulleted list
-\bind "M-p d"                  "layout Description"
-\bind "M-p e"                  "layout Enumerate"                      # numbered list
-\bind "M-p i"                  "layout Itemize"                        # bulleted list
-\bind "M-p l"                  "layout List"
-\bind "M-p n"                  "layout Enumerate"                      # numbered list
-\bind "M-p p"                  "layout Lyx-Code"
-\bind "M-p q"                  "layout Quote"
-\bind "M-p S-Q"                "layout Quotation"
-\bind "M-p s"                  "layout Standard"
-\bind "M-p t"                  "layout Title"
-\bind "M-p S-at"               "layout Section*"                       # M-p S-2
-\bind "M-p S-dollar"           "layout Subsubsection*"                 # M-p S-4
-\bind "M-p S-numbersign"       "layout Subsection*"                    # M-p S-3
-
-\bind "M-p Left"               "depth-decrement"
-\bind "M-p Right"              "depth-increment"
-
-
-
-#
-# Character style menu
 #
-
-\bind "M-c b"                  "font-bold"
-#\bind "M-c c"                  "font-smallcaps"
-\bind "M-c e"                  "font-emph"
-\bind "M-c i"                  "font-emph"                                             # italics
-\bind "M-c m"                  "math-mode"
-\bind "M-c p"                  "font-code"
-\bind "M-c r"                  "font-roman"
-\bind "M-c s"                  "font-sans"
-\bind "M-c t"                  "ert-insert"
-\bind "M-c u"                  "font-underline"
-
-\bind "M-c Down"               "word-lowcase"
-\bind "M-c Up"                 "word-upcase"
-\bind "M-c Right"              "word-capitalize"
-
-\bind "M-c space"              "font-default"
-
-
-
-#
-# Keyboard menu
+# The menus
 #
 
-\bind "M-k 1"                  "keymap-primary"
-\bind "M-k 2"                  "keymap-secondary"
-\bind "M-k o"                  "keymap-off"
-\bind "M-k t"                  "keymap-toggle"
-\bind "M-k x"                  "keymap-off"
+\bind_file menus.bind
 
-#
-# Misc menu
-#
- 
 # this clashes with M-x so we can't use it. M-x is more
 # important (reported by Serge Winitzki <winitzki@yahoo.com>)
 # \bind "M-x c"                  "screen-recenter"

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 441d85f4ad0fd67cb9ba0bcdc089f5df06674d5f..303206cd780cb5158af3f9eb3af53740d85cb4b2 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,16 +1,20 @@
-src/buffer.C
-src/bufferlist.C
 src/BufferView.C
-src/bufferview_funcs.C
 src/BufferView_pimpl.C
 src/Chktex.C
-src/converter.C
 src/CutAndPaste.C
+src/LColor.C
+src/LaTeX.C
+src/LyXAction.C
+src/MenuBackend.C
+src/buffer.C
+src/bufferlist.C
+src/bufferview_funcs.C
+src/converter.C
 src/debug.C
 src/exporter.C
-src/frontends/controllers/biblio.C
+src/ext_l10n.h
+src/frontends/LyXView.C
 src/frontends/controllers/ButtonController.h
-src/frontends/controllers/character.C
 src/frontends/controllers/ControlAboutlyx.C
 src/frontends/controllers/ControlBibtex.C
 src/frontends/controllers/ControlCharacter.C
@@ -26,13 +30,13 @@ src/frontends/controllers/ControlSearch.C
 src/frontends/controllers/ControlSpellchecker.C
 src/frontends/controllers/ControlThesaurus.C
 src/frontends/controllers/ControlVCLog.C
+src/frontends/controllers/biblio.C
+src/frontends/controllers/character.C
 src/frontends/controllers/frnt_lang.C
 src/frontends/controllers/helper_funcs.C
 src/frontends/gnome/GLog.C
-src/frontends/LyXView.C
 src/frontends/qt2/Alert_pimpl.C
 src/frontends/qt2/FileDialog.C
-src/frontends/qt2/lengthcombo.C
 src/frontends/qt2/QAbout.C
 src/frontends/qt2/QBibitem.C
 src/frontends/qt2/QBibtex.C
@@ -44,8 +48,8 @@ src/frontends/qt2/QCommandBuffer.C
 src/frontends/qt2/QDelimiterDialog.C
 src/frontends/qt2/QDocument.C
 src/frontends/qt2/QDocumentDialog.C
-src/frontends/qt2/QError.C
 src/frontends/qt2/QERT.C
+src/frontends/qt2/QError.C
 src/frontends/qt2/QExternal.C
 src/frontends/qt2/QExternalDialog.C
 src/frontends/qt2/QFloat.C
@@ -53,8 +57,8 @@ src/frontends/qt2/QGraphics.C
 src/frontends/qt2/QGraphicsDialog.C
 src/frontends/qt2/QInclude.C
 src/frontends/qt2/QIndex.C
-src/frontends/qt2/QLog.C
 src/frontends/qt2/QLPrintDialog.C
+src/frontends/qt2/QLog.C
 src/frontends/qt2/QMathDialog.C
 src/frontends/qt2/QMathMatrixDialog.C
 src/frontends/qt2/QMinipage.C
@@ -77,9 +81,9 @@ src/frontends/qt2/QToc.C
 src/frontends/qt2/QURL.C
 src/frontends/qt2/QVCLog.C
 src/frontends/qt2/QWrap.C
+src/frontends/qt2/lengthcombo.C
 src/frontends/xforms/Alert_pimpl.C
 src/frontends/xforms/ColorHandler.C
-src/frontends/xforms/combox.C
 src/frontends/xforms/FileDialog.C
 src/frontends/xforms/FormAboutlyx.C
 src/frontends/xforms/FormBase.C
@@ -88,8 +92,8 @@ src/frontends/xforms/FormBibtex.C
 src/frontends/xforms/FormCharacter.C
 src/frontends/xforms/FormCitation.C
 src/frontends/xforms/FormDocument.C
-src/frontends/xforms/FormError.C
 src/frontends/xforms/FormERT.C
+src/frontends/xforms/FormError.C
 src/frontends/xforms/FormExternal.C
 src/frontends/xforms/FormFiledialog.C
 src/frontends/xforms/FormFloat.C
@@ -123,14 +127,15 @@ src/frontends/xforms/FormToc.C
 src/frontends/xforms/FormUrl.C
 src/frontends/xforms/FormVCLog.C
 src/frontends/xforms/FormWrap.C
-src/frontends/xforms/input_validators.C
 src/frontends/xforms/Menubar_pimpl.C
-src/frontends/xforms/xforms_helpers.C
 src/frontends/xforms/XMiniBuffer.C
+src/frontends/xforms/combox.C
+src/frontends/xforms/input_validators.C
+src/frontends/xforms/xforms_helpers.C
 src/gettext.h
 src/importer.C
-src/insets/insetbib.C
 src/insets/inset.C
+src/insets/insetbib.C
 src/insets/insetcaption.C
 src/insets/inseterror.C
 src/insets/insetert.C
@@ -157,15 +162,12 @@ src/insets/inseturl.C
 src/insets/insetwrap.C
 src/kbsequence.C
 src/language.C
-src/LaTeX.C
-src/LColor.C
 src/lengthcommon.C
-src/LyXAction.C
 src/lyx_cb.C
+src/lyx_main.C
 src/lyxfind.C
 src/lyxfont.C
 src/lyxfunc.C
-src/lyx_main.C
 src/lyxrc.C
 src/lyxtextclasslist.C
 src/lyxvc.C
@@ -174,11 +176,10 @@ src/mathed/formulamacro.C
 src/mathed/math_hullinset.C
 src/mathed/math_parboxinset.C
 src/mathed/ref_inset.C
-src/MenuBackend.C
 src/paragraph.C
 src/support/filetools.C
 src/tabular.C
+src/text.C
 src/text2.C
 src/text3.C
-src/text.C
 src/ext_l10n.h

diff --git a/src/ChangeLog b/src/ChangeLog
index ccd94505f07faca6cad3b4809316f66ed923e546..a87d768169c40900b385ddd66d5b645049e67313 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-22  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * commandtags.h: 
+       * LyXAction.C (init): remove LFUN_VECTOR (bug 662)
+
 2002-11-27  Dekel Tsur  <dekelts@tau.ac.il>
 
        * lyxrc.[Ch]: Add {roman,sans,typewriter}_font_foundry variables.

diff --git a/src/LyXAction.C b/src/LyXAction.C
index c1579d93f542aa5463213990dccf8e3c28995b41..0d7f42f14cd38f5b23f6ea5b4bbdd07f1812563a 100644 (file)
--- a/src/LyXAction.C
+++ b/src/LyXAction.C
@@ -99,7 +99,6 @@ void LyXAction::init()
                { LFUN_UMLAUT, "accent-umlaut", "", Noop },
                { LFUN_UNDERBAR, "accent-underbar", "", Noop },
                { LFUN_UNDERDOT, "accent-underdot", "", Noop },
-               { LFUN_VECTOR, "accent-vector", "", Noop },
                { LFUN_APPENDIX, "appendix", N_("Insert appendix"), Noop },
                { LFUN_APROPOS, "apropos", N_("Describe command"),
                  NoBuffer|ReadOnly },

diff --git a/src/commandtags.h b/src/commandtags.h
index 8666699b7ad1491b82f1ae657f2ee8dcb898179d..93ec20391e19ade24bf91fffe1730db26f109ba3 100644 (file)
--- a/src/commandtags.h
+++ b/src/commandtags.h
@@ -112,8 +112,7 @@ enum kb_action {
        LFUN_UMLAUT,
        LFUN_DOT,
        LFUN_OGONEK,
-       LFUN_VECTOR, // 90              //  Alejandro 040696
-       LFUN_SELFINSERT,
+       LFUN_SELFINSERT, // 90
        LFUN_GETBUFNAME,
        LFUN_GETXY,
        LFUN_SETXY,