more changes, read the Changelog

[lyx.git] / src / lyxrc.C

diff --git a/src/lyxrc.C b/src/lyxrc.C
index f7359f6e5acf58bae776f9c1f6303552637db5c3..2b81b0d0c3ce94933737d1fffa88de4493a961ad 100644 (file)
--- a/src/lyxrc.C
+++ b/src/lyxrc.C
@@ -85,6 +85,7 @@ enum LyXRCTags {
        RC_SCREEN_FONT_POPUP,
        RC_SCREEN_FONT_ENCODING,
        RC_SCREEN_FONT_ENCODING_MENU,
+       RC_SET_COLOR,
        RC_AUTOSAVE,
        RC_DOCUMENTPATH,
        RC_TEMPLATEPATH,
@@ -250,6 +251,7 @@ keyword_item lyxrcTags[] = {
        { "\\screen_font_typewriter", RC_SCREEN_FONT_TYPEWRITER },
        { "\\screen_zoom", RC_SCREEN_ZOOM },
        { "\\serverpipe", RC_SERVERPIPE },
+       { "\\set_color", RC_SET_COLOR },
        { "\\show_banner", RC_SHOW_BANNER },
        { "\\spell_command", RC_SPELL_COMMAND },
        { "\\tempdir_path", RC_TEMPDIRPATH },
@@ -345,7 +347,7 @@ void LyXRC::setDefaults() {
        override_x_deadkeys = true;
        autosave = 300;
        auto_region_delete = true;
-       ascii_linelen = 75;
+       ascii_linelen = 65;
        num_lastfiles = 4;
        check_lastfiles = true;
        make_backup = true;
@@ -476,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:
@@ -837,6 +847,30 @@ int LyXRC::read(string const & filename)
                                font_norm_menu = lexrc.GetString();
                        break;
 
+               case RC_SET_COLOR:
+               {
+                       string lyx_name, x11_name;
+
+                       if (lexrc.lex() == LyXLex::LEX_DATA)  {
+                               lyx_name = lexrc.GetString();
+                       } else {
+                               lexrc.printError("Bad color tag: `$$Token'");
+                               break;
+                       }
+                       
+                       if (lexrc.lex() == LyXLex::LEX_DATA) {
+                               x11_name = lexrc.GetString();
+                       } else {
+                               lexrc.printError("Bad color name: `$$Token'");
+                               break;
+                       }
+
+                       if (!lcolor.setColor(lyx_name, x11_name))
+                               lyxerr << "Bad lyxrc set_color for "
+                                       << lyx_name << endl;
+
+                       break;
+               }
                case RC_AUTOREGIONDELETE:
                        // Auto region delete defaults to true
                        if (lexrc.next())
@@ -1043,6 +1077,7 @@ int LyXRC::read(string const & filename)
                        if ( lexrc.next())
                                docbook_to_pdf_command = lexrc.GetString();
                        break;
+
                case RC_LAST: break; // this is just a dummy
                }
        }
@@ -1101,6 +1136,9 @@ void LyXRC::output(ostream & os) const
                // bind files are not done here.
        case RC_BEGINTOOLBAR:
                // Toolbar is not written here (yet).
+       //case RC_SET_COLOR:
+               // color bindings not written to preference file.
+               // And we want to be warned about that. (Lgb)
        case RC_FONT_ENCODING:
                os << "\\font_encoding \"" << fontenc << "\"\n";
        case RC_PRINTER: