add missing writeNormal() methods to some insets

[lyx.git] / src / lyxrc.C

diff --git a/src/lyxrc.C b/src/lyxrc.C
index 3051e62531cd1688abc1ced382ab92e7827441b4..f0d70852e3fe5d4991e659acddcf5baa9608cdcd 100644 (file)
--- a/src/lyxrc.C
+++ b/src/lyxrc.C
@@ -52,6 +52,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 },
@@ -66,6 +67,7 @@ keyword_item lyxrcTags[] = {
        { "\\default_language", LyXRC::RC_DEFAULT_LANGUAGE },
        { "\\default_papersize", LyXRC::RC_DEFAULT_PAPERSIZE },
        { "\\dialogs_iconify_with_main", LyXRC::RC_DIALOGS_ICONIFY_WITH_MAIN },
+       { "\\display_graphics", LyXRC::RC_DISPLAY_GRAPHICS },
        { "\\display_shortcuts", LyXRC::RC_DISPLAY_SHORTCUTS },
        { "\\document_path", LyXRC::RC_DOCUMENTPATH },
        { "\\escape_chars", LyXRC::RC_ESC_CHARS },
@@ -212,12 +214,14 @@ 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;
        make_backup = true;
        backupdir_path = "";
        exit_confirmation = true;
+       display_graphics = "mono";
        display_shortcuts = true;
        // Spellchecker settings:
 #ifdef USE_PSPELL      
@@ -345,11 +349,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();
@@ -700,7 +714,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()) {
@@ -1015,6 +1030,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"
@@ -1027,6 +1049,14 @@ void LyXRC::output(ostream & os) const
                           << "\\exit_confirmation " << tostr(exit_confirmation)
                           << "\n";
                }
+       case RC_DISPLAY_GRAPHICS:
+               if (display_graphics != system_lyxrc.display_graphics) {
+                       os << "# Display graphics within LyX\n"
+                          << "# no|mono|gray|color\n"
+                          << "\\display_graphics " << display_graphics
+                          << "\n";
+               }
+                       
        case RC_DISPLAY_SHORTCUTS:
                if (display_shortcuts != system_lyxrc.display_shortcuts) {
                        os << "# Display name of the last command executed,\n"
@@ -1620,6 +1650,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")
@@ -1777,20 +1811,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;
@@ -1875,6 +1913,10 @@ string const LyXRC::getDescription(LyXRCTags tag)
                str = N_("Sets whether LyX asks for a second confirmation to exit when you have changed documents. (LyX will still ask to save changed documents.)");
                break;
                
+       case RC_DISPLAY_GRAPHICS:
+               str = N_("Select how LyX will display any graphics.");
+               break;
+               
        case RC_DISPLAY_SHORTCUTS:
                str = N_("LyX continously displays names of last command executed, along with a list of defined short-cuts for it in the minibuffer. Set to false if LyX seems slow.");
                break;