Make sure primary|secondary_keymap are correct.

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

diff --git a/ChangeLog b/ChangeLog
index 2cbca03ac224991f84905809a0b33c06f46e6dfc..3015d594dd2f74c11d501ccaa9358e3dc6002831 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2000-06-27  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
+       * src/lyxrc.C (read): make sure the .kmap files exist when a keymap
+       is specified (adapted from a patch from edscott <edscott@imp.mx>).
+
        * Makefile.am (bindist): new target.
 
        * INSTALL: add instructions for doing a binary distribution.

diff --git a/src/lyxrc.C b/src/lyxrc.C
index fdef9a3dcb602ad298ac09c2cf65df99edd19203..2758bba5aee883e08542fd299efb1af223567d91 100644 (file)
--- a/src/lyxrc.C
+++ b/src/lyxrc.C
@@ -478,13 +478,21 @@ int LyXRC::read(string const & filename)
                        break;
                        
                case RC_KBMAP_PRIMARY:
-                       if (lexrc.next())
-                               primary_kbmap = lexrc.GetString();
+                       if (lexrc.next()) 
+                               if (!LibFileSearch("kbd", lexrc.GetString(), 
+                                                  "kmap").empty()) 
+                                       primary_kbmap = lexrc.GetString();
+                               else 
+                                       lexrc.printError("LyX: Keymap `$$Token' not found");
                        break;
                        
                case RC_KBMAP_SECONDARY:
-                       if (lexrc.next())
-                               secondary_kbmap = lexrc.GetString();
+                       if (lexrc.next()) 
+                               if (!LibFileSearch("kbd", lexrc.GetString(), 
+                                                  "kmap").empty()) 
+                                       secondary_kbmap = lexrc.GetString();
+                               else 
+                                       lexrc.printError("LyX: Keymap `$$Token' not found");
                        break;
                        
                case RC_FONT_ENCODING: