John's Layout Tabular UI improvements and Martins fixes to clearing the

[lyx.git] / src / lyxrc.C

diff --git a/src/lyxrc.C b/src/lyxrc.C
index 050875af93c3021262004e701c520e6079b285df..857c2d96f0ad7c4a75b050978da802a236109e21 100644 (file)
--- a/src/lyxrc.C
+++ b/src/lyxrc.C
@@ -23,10 +23,8 @@
 #include "lyxrc.h"
 #include "kbmap.h"
 #include "LyXAction.h"
-#include "lyxserver.h"
 #include "lyx_main.h"
 #include "intl.h"
-#include "tex-strings.h"
 #include "support/path.h"
 #include "support/filetools.h"
 #include "lyxtext.h"
@@ -52,6 +50,7 @@ keyword_item lyxrcTags[] = {
        { "\\ascii_roff_command", LyXRC::RC_ASCIIROFF_COMMAND },
        { "\\auto_number", LyXRC::RC_AUTO_NUMBER },
        { "\\auto_region_delete", LyXRC::RC_AUTOREGIONDELETE },
+       { "\\auto_reset_options", LyXRC::RC_AUTORESET_OPTIONS },
        { "\\autosave", LyXRC::RC_AUTOSAVE },
        { "\\backupdir_path", LyXRC::RC_BACKUPDIR_PATH },
        { "\\bind", LyXRC::RC_BIND },
@@ -213,6 +212,7 @@ void LyXRC::setDefaults() {
        override_x_deadkeys = true;
        autosave = 300;
        auto_region_delete = true;
+       auto_reset_options = false;
        ascii_linelen = 65;
        num_lastfiles = 4;
        check_lastfiles = true;
@@ -241,7 +241,6 @@ void LyXRC::setDefaults() {
        language_use_babel = true;
        language_package = "\\usepackage{babel}";
        language_command_begin = "\\selectlanguage{$$lang}";
-       language_command_end = "\\selectlanguage{$$lang}";
        language_command_local = "\\foreignlanguage{$$lang}{";
        default_language = "english";
        //
@@ -347,16 +346,21 @@ int LyXRC::read(string const & filename)
                                exit_confirmation = lexrc.getBool();
                        break;
                        
+               case RC_AUTORESET_OPTIONS:
+                       if (lexrc.next())
+                               auto_reset_options = lexrc.getBool();
+                       break;
+
                case RC_DISPLAY_GRAPHICS:
                        if (lexrc.next())
                                display_graphics = lexrc.getString();
                        break;
-                       
+
                case RC_DISPLAY_SHORTCUTS:
                        if (lexrc.next())
                                display_shortcuts = lexrc.getBool();
                        break;
-                       
+
                case RC_KBMAP:
                        if (lexrc.next())
                                use_kbmap = lexrc.getBool();
@@ -707,7 +711,8 @@ int LyXRC::read(string const & filename)
                        readBindFileIfNeeded();
 
                        // !!!chb, dynamic key binding...
-                       int action, res = 0;
+                       int action = 0;
+                       string::size_type res = 0;
                        string seq, cmd;
                        
                        if (lexrc.next()) {
@@ -731,8 +736,8 @@ int LyXRC::read(string const & filename)
                                               << cmd << "' Action `"
                                               << action << '\'' << endl;
                                }
-                               res = toplevel_keymap->bind(seq, action);
-                               if (res != 0
+                               res = toplevel_keymap->bind(seq, kb_action(action));
+                               if (res != string::npos
                                    && lyxerr.debugging(Debug::LYXRC)) {
                                        lexrc.printError(
                                                "RC_BIND: "
@@ -1022,6 +1027,13 @@ void LyXRC::output(ostream & os) const
                           << "\\auto_region_delete " << tostr(auto_region_delete)
                           << "\n";
                }
+       case RC_AUTORESET_OPTIONS:
+               if (auto_reset_options != system_lyxrc.auto_reset_options) {
+                       os << "# Set to false to inhibit automatic reset of\n"
+                          << "# the class options to defaults on class change.\n"
+                          << "\\auto_reset_options " << tostr(auto_reset_options)
+                          << "\n";
+               }
        case RC_AUTOSAVE:
                if (autosave != system_lyxrc.autosave) {
                        os << "# The time interval between auto-saves in seconds.\n"
@@ -1635,6 +1647,10 @@ void LyXRC::set_font_norm_type()
                font_norm_type = ISO_10646_1;
        else if (font_norm == "iso8859-1")
                font_norm_type = ISO_8859_1;
+       else if (font_norm == "iso8859-3")
+               font_norm_type = ISO_8859_3;
+       else if (font_norm == "iso8859-4")
+               font_norm_type = ISO_8859_4;
        else if (font_norm == "iso8859-6.8x")
                font_norm_type = ISO_8859_6_8;
        else if (font_norm == "iso8859-9")
@@ -1792,20 +1808,24 @@ string const LyXRC::getDescription(LyXRCTags tag)
        case RC_AUTOREGIONDELETE:
                str = N_("De-select if you don't want the current selection to be replaced automatically by what you type.");
                break;
+
+       case RC_AUTORESET_OPTIONS:
+               str = N_("De-select if you don't want the class options to be reset to defaults after class change.");
+               break;
                
        case RC_OVERRIDE_X_DEADKEYS:
                str = N_("Select if LyX is to take over the handling of the dead keys (a.k.a. accent keys) that may be defined for your keyboard.");
                break;
-               
+
 
        case RC_SERVERPIPE:
                str = N_("This starts the lyxserver. The pipes get an additional extension \".in\" and \".out\". Only for advanced users.");
                break;
-               
+
        case RC_BINDFILE:
                str = N_("Keybindings file. Can either specify an absolute path, or LyX will look in its global and local bind/ directories.");
                break;
-               
+
        case RC_UIFILE:
                str = N_("The  UI (user interface) file. Can either specify an absolute path, or LyX will look in its global and local ui/ directories.");
                break;