]> git.lyx.org Git - lyx.git/blobdiff - src/lyxrc.C
latin3 support ; latin9 improvements
[lyx.git] / src / lyxrc.C
index 6770a634365f09f370a918369f1ed63049bd5bcf..8a6173fad1998ce3c7e7e69149448649f6971045 100644 (file)
@@ -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 },
@@ -65,6 +66,8 @@ keyword_item lyxrcTags[] = {
        { "\\date_insert_format", LyXRC::RC_DATE_INSERT_FORMAT },
        { "\\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 },
@@ -179,7 +182,7 @@ void LyXRC::setDefaults() {
        tempdir_path = "/tmp";
        use_tempdir = true;
        ps_command = "gs";
-       view_dvi_paper_option = "-paper";
+       view_dvi_paper_option = "";
        default_papersize = BufferParams::PAPER_USLETTER;
        custom_export_format = "ps";
        chktex_command = "chktex -n1 -n3 -n6 -n9 -n22 -n25 -n30 -n38";
@@ -211,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      
@@ -248,6 +253,7 @@ void LyXRC::setDefaults() {
        date_insert_format = "%A, %e %B %Y";
        show_banner = true;
        cursor_follows_scrollbar = false;
+       dialogs_iconify_with_main = false;
        label_init_length = 3;
 
        /// These variables are not stored on disk (perhaps they
@@ -283,11 +289,11 @@ int LyXRC::read(string const & filename)
                lexrc.printTable(lyxerr);
        
        lexrc.setFile(filename);
-       if (!lexrc.IsOK()) return -2;
+       if (!lexrc.isOK()) return -2;
        
        lyxerr[Debug::LYXRC] << "Reading '" << filename << "'..." << endl;
        
-       while (lexrc.IsOK()) {
+       while (lexrc.isOK()) {
                // By using two switches we take advantage of the compiler
                // telling us if we have missed a LyXRCTags element in
                // the second switch.
@@ -309,7 +315,7 @@ int LyXRC::read(string const & filename)
                        if (lexrc.next()) {
                                string const tmp =
                                        LibFileSearch(string(),
-                                                     lexrc.GetString()); 
+                                                     lexrc.getString()); 
                                if (read(tmp)) {
                                        lexrc.printError("Error reading "
                                                         "included file: "+tmp);
@@ -318,7 +324,7 @@ int LyXRC::read(string const & filename)
                        break;
                case RC_BINDFILE:                     // RVDK_PATCH_5
                        if (lexrc.next()) {
-                               string const tmp(lexrc.GetString());
+                               string const tmp(lexrc.getString());
                                if (hasBindFile)
                                        // We are already in the
                                        // "actually read bind file"
@@ -334,28 +340,38 @@ int LyXRC::read(string const & filename)
                        
                case RC_UIFILE: 
                        if (lexrc.next()) {
-                               ui_file = lexrc.GetString();
+                               ui_file = lexrc.getString();
                        }
                        break;
                        
                case RC_EXIT_CONFIRMATION:
                        if (lexrc.next())
-                               exit_confirmation = lexrc.GetBool();
+                               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();
+                               display_shortcuts = lexrc.getBool();
                        break;
-                       
+
                case RC_KBMAP:
                        if (lexrc.next())
-                               use_kbmap = lexrc.GetBool();
+                               use_kbmap = lexrc.getBool();
                        break;
                        
                case RC_KBMAP_PRIMARY:
                        if (lexrc.next()) {
-                               string const kmap(lexrc.GetString());
+                               string const kmap(lexrc.getString());
                                if (kmap.empty()) {
                                        // nothing
                                } else if (!LibFileSearch("kbd", kmap, 
@@ -368,7 +384,7 @@ int LyXRC::read(string const & filename)
                        
                case RC_KBMAP_SECONDARY:
                        if (lexrc.next()) {
-                               string const kmap(lexrc.GetString());
+                               string const kmap(lexrc.getString());
                                if (kmap.empty()) {
                                        // nothing
                                } else if (!LibFileSearch("kbd", kmap, 
@@ -381,113 +397,113 @@ int LyXRC::read(string const & filename)
                        
                case RC_FONT_ENCODING:
                        if (lexrc.next())
-                               fontenc = lexrc.GetString();
+                               fontenc = lexrc.getString();
                        break;
                        
                case RC_PRINTER:
                        if (lexrc.next())
-                               printer = lexrc.GetString();
+                               printer = lexrc.getString();
                        break;
                        
                case RC_PRINT_COMMAND:
                        if (lexrc.next())
-                               print_command = lexrc.GetString();
+                               print_command = lexrc.getString();
                        break;
                        
                case RC_PRINTEVENPAGEFLAG:
                        if (lexrc.next())
-                               print_evenpage_flag = lexrc.GetString();
+                               print_evenpage_flag = lexrc.getString();
                        break;
                        
                case RC_PRINTODDPAGEFLAG:
                        if (lexrc.next())
-                               print_oddpage_flag = lexrc.GetString();
+                               print_oddpage_flag = lexrc.getString();
                        break;
                        
                case RC_PRINTPAGERANGEFLAG:
                        if (lexrc.next())
-                               print_pagerange_flag = lexrc.GetString();
+                               print_pagerange_flag = lexrc.getString();
                        break;
                        
                case RC_PRINTCOPIESFLAG:
                        if (lexrc.next())
-                               print_copies_flag = lexrc.GetString();
+                               print_copies_flag = lexrc.getString();
                        break;
                        
                case RC_PRINTCOLLCOPIESFLAG:
                        if (lexrc.next())
-                               print_collcopies_flag = lexrc.GetString();
+                               print_collcopies_flag = lexrc.getString();
                        break;
                        
                case RC_PRINTREVERSEFLAG:
                        if (lexrc.next())
-                               print_reverse_flag = lexrc.GetString();
+                               print_reverse_flag = lexrc.getString();
                        break;
                        
                case RC_PRINTLANDSCAPEFLAG:
                        if (lexrc.next())
-                               print_landscape_flag = lexrc.GetString();
+                               print_landscape_flag = lexrc.getString();
                        break;
                        
                case RC_PRINTTOPRINTER:
                        if (lexrc.next())
-                               print_to_printer = lexrc.GetString();
+                               print_to_printer = lexrc.getString();
                        break;
                        
                case RC_PRINT_ADAPTOUTPUT:
                        if (lexrc.next())
-                               print_adapt_output = lexrc.GetBool();
+                               print_adapt_output = lexrc.getBool();
                        break;
                        
                case RC_PRINTTOFILE:
                        if (lexrc.next())
-                               print_to_file = lexrc.GetString();
+                               print_to_file = lexrc.getString();
                        break;
                        
                case RC_PRINTFILEEXTENSION:
                        if (lexrc.next())
-                               print_file_extension = lexrc.GetString();
+                               print_file_extension = lexrc.getString();
                        break;
                        
                case RC_PRINTEXSTRAOPTIONS:
                        if (lexrc.next())
-                               print_extra_options = lexrc.GetString();
+                               print_extra_options = lexrc.getString();
                        break;
                        
                case RC_PRINTSPOOL_COMMAND:
                        if (lexrc.next())
-                               print_spool_command = lexrc.GetString();
+                               print_spool_command = lexrc.getString();
                        break;
                        
                case RC_PRINTSPOOL_PRINTERPREFIX:
                        if (lexrc.next())
-                               print_spool_printerprefix = lexrc.GetString();
+                               print_spool_printerprefix = lexrc.getString();
                        break;
                        
                 case RC_PRINTPAPERDIMENSIONFLAG:
                        if (lexrc.next())
-                               print_paper_dimension_flag = lexrc.GetString();
+                               print_paper_dimension_flag = lexrc.getString();
                        break;
                        
                 case RC_PRINTPAPERFLAG:
                        if (lexrc.next())
-                               print_paper_flag = lexrc.GetString();
+                               print_paper_flag = lexrc.getString();
                        break;
                        
                case RC_CUSTOM_EXPORT_COMMAND:
                        if (lexrc.next())
-                               custom_export_command = lexrc.GetString();
+                               custom_export_command = lexrc.getString();
                        break;
                        
                case RC_CUSTOM_EXPORT_FORMAT:
                        if (lexrc.next())
-                               custom_export_format = lexrc.GetString();
+                               custom_export_format = lexrc.getString();
                        break;
 
                case RC_DEFAULT_PAPERSIZE:
                         if (lexrc.next()) {
                                string const size =
-                                       lowercase(lexrc.GetString());
+                                       lowercase(lexrc.getString());
                                if (size == "usletter")
                                        default_papersize =
                                                BufferParams::PAPER_USLETTER;
@@ -514,150 +530,150 @@ int LyXRC::read(string const & filename)
 
                case RC_VIEWDVI_PAPEROPTION:
                        if (lexrc.next())
-                               view_dvi_paper_option = lexrc.GetString();
+                               view_dvi_paper_option = lexrc.getString();
                        else 
                                view_dvi_paper_option = "";
                        break;
 
                case RC_PS_COMMAND:
                        if (lexrc.next())
-                               ps_command = lexrc.GetString();
+                               ps_command = lexrc.getString();
                        break;
                        
                case RC_CHKTEX_COMMAND:
                        if (lexrc.next())
-                               chktex_command = lexrc.GetString();
+                               chktex_command = lexrc.getString();
                        break;
                        
                case RC_SCREEN_DPI:
                        if (lexrc.next())
-                               dpi = lexrc.GetInteger();
+                               dpi = lexrc.getInteger();
                        break;
                        
                case RC_SCREEN_ZOOM:
                        if (lexrc.next())
-                               zoom = lexrc.GetInteger();
+                               zoom = lexrc.getInteger();
                        break;
 
                case RC_WHEEL_JUMP:
                        if (lexrc.next())
-                               wheel_jump = lexrc.GetInteger();
+                               wheel_jump = lexrc.getInteger();
                        break;
                        
                case RC_SCREEN_FONT_SIZES:
                        if (lexrc.next())
                                font_sizes[LyXFont::SIZE_TINY] =
-                                       lexrc.GetFloat();
+                                       lexrc.getFloat();
                        if (lexrc.next())
                                font_sizes[LyXFont::SIZE_SCRIPT] =
-                                       lexrc.GetFloat();
+                                       lexrc.getFloat();
                        if (lexrc.next())
                                font_sizes[LyXFont::SIZE_FOOTNOTE] =
-                                       lexrc.GetFloat();
+                                       lexrc.getFloat();
                        if (lexrc.next())
                                font_sizes[LyXFont::SIZE_SMALL] =
-                                       lexrc.GetFloat();
+                                       lexrc.getFloat();
                        if (lexrc.next())
                                font_sizes[LyXFont::SIZE_NORMAL] =
-                                       lexrc.GetFloat();
+                                       lexrc.getFloat();
                        if (lexrc.next())
                                font_sizes[LyXFont::SIZE_LARGE] =
-                                       lexrc.GetFloat();
+                                       lexrc.getFloat();
                        if (lexrc.next())
                                font_sizes[LyXFont::SIZE_LARGER] =
-                                       lexrc.GetFloat();
+                                       lexrc.getFloat();
                        if (lexrc.next())
                                font_sizes[LyXFont::SIZE_LARGEST] =
-                                       lexrc.GetFloat();
+                                       lexrc.getFloat();
                        if (lexrc.next())
                                font_sizes[LyXFont::SIZE_HUGE] =
-                                       lexrc.GetFloat();
+                                       lexrc.getFloat();
                        if (lexrc.next())
                                font_sizes[LyXFont::SIZE_HUGER] =
-                                       lexrc.GetFloat();
+                                       lexrc.getFloat();
                        break;
                        
                 case RC_SCREEN_FONT_SCALABLE:
                         if (lexrc.next())
-                                use_scalable_fonts = lexrc.GetBool();
+                                use_scalable_fonts = lexrc.getBool();
                        break;
                        
                case RC_AUTOSAVE:
                        if (lexrc.next())
-                               autosave = lexrc.GetInteger();
+                               autosave = lexrc.getInteger();
                        break;
                        
                case RC_DOCUMENTPATH:
                        if (lexrc.next()) {
-                               document_path = ExpandPath(lexrc.GetString());
+                               document_path = ExpandPath(lexrc.getString());
                        }
                        break;
                        
                case RC_TEMPLATEPATH:
                        if (lexrc.next())
-                               template_path = ExpandPath(lexrc.GetString());
+                               template_path = ExpandPath(lexrc.getString());
                        break;
                        
                case RC_TEMPDIRPATH:
                        if (lexrc.next())
-                               tempdir_path = ExpandPath(lexrc.GetString());
+                               tempdir_path = ExpandPath(lexrc.getString());
                        break;
                        
                case RC_USETEMPDIR:
                        if (lexrc.next())
-                               use_tempdir = lexrc.GetBool();
+                               use_tempdir = lexrc.getBool();
                        break;
                        
                case RC_LASTFILES:
                        if (lexrc.next())
-                               lastfiles = ExpandPath(lexrc.GetString());
+                               lastfiles = ExpandPath(lexrc.getString());
                        break;
                        
                 case RC_NUMLASTFILES:
                         if (lexrc.next())
-                                num_lastfiles = lexrc.GetInteger();
+                                num_lastfiles = lexrc.getInteger();
                        break;
                        
                 case RC_CHECKLASTFILES:
                         if (lexrc.next())
-                                check_lastfiles = lexrc.GetBool();
+                                check_lastfiles = lexrc.getBool();
                        break;
                        
                case RC_SCREEN_FONT_ROMAN:
                        if (lexrc.next())
-                               roman_font_name = lexrc.GetString();
+                               roman_font_name = lexrc.getString();
                        break;
                        
                case RC_SCREEN_FONT_SANS:
                        if (lexrc.next())
-                               sans_font_name = lexrc.GetString();
+                               sans_font_name = lexrc.getString();
                        break;
                        
                case RC_SCREEN_FONT_TYPEWRITER:
                        if (lexrc.next())
-                               typewriter_font_name = lexrc.GetString();
+                               typewriter_font_name = lexrc.getString();
                        break;
                        
                case RC_SCREEN_FONT_MENU:
                        if (lexrc.next())
-                               menu_font_name = lexrc.GetString();
+                               menu_font_name = lexrc.getString();
                        break;
                        
                case RC_SCREEN_FONT_POPUP:
                        if (lexrc.next())
-                               popup_font_name = lexrc.GetString();
+                               popup_font_name = lexrc.getString();
                        break;
                        
                case RC_SCREEN_FONT_ENCODING:
                        if (lexrc.next()) {
-                               font_norm = lexrc.GetString();
+                               font_norm = lexrc.getString();
                                set_font_norm_type();
                        }
                        break;
 
                case RC_SCREEN_FONT_ENCODING_MENU:
                        if (lexrc.next())
-                               font_norm_menu = lexrc.GetString();
+                               font_norm_menu = lexrc.getString();
                        break;
 
                case RC_SET_COLOR:
@@ -665,14 +681,14 @@ int LyXRC::read(string const & filename)
                        string lyx_name, x11_name;
 
                        if (lexrc.next())  {
-                               lyx_name = lexrc.GetString();
+                               lyx_name = lexrc.getString();
                        } else {
                                lexrc.printError("Missing color tag.");
                                break;
                        }
                        
                        if (lexrc.next()) {
-                               x11_name = lexrc.GetString();
+                               x11_name = lexrc.getString();
                        } else {
                                lexrc.printError("Missing color name for color : `$$Token'");
                                break;
@@ -687,7 +703,7 @@ int LyXRC::read(string const & filename)
                case RC_AUTOREGIONDELETE:
                        // Auto region delete defaults to true
                        if (lexrc.next())
-                               auto_region_delete = lexrc.GetBool();
+                               auto_region_delete = lexrc.getBool();
                        break;
                        
                case RC_BIND:
@@ -698,18 +714,19 @@ 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()) {
-                               seq = lexrc.GetString();
+                               seq = lexrc.getString();
                        } else {
                                lexrc.printError("RC_BIND: Missing key sequence");
                                break;
                        }
                        
                        if (lexrc.next(true)) {
-                               cmd = lexrc.GetString();
+                               cmd = lexrc.getString();
                        } else {
                                lexrc.printError("RC_BIND: missing command");
                                break;
@@ -738,145 +755,150 @@ int LyXRC::read(string const & filename)
                }
                case RC_OVERRIDE_X_DEADKEYS:
                        if (lexrc.next())
-                               override_x_deadkeys = lexrc.GetBool();
+                               override_x_deadkeys = lexrc.getBool();
                        break;
 
                case RC_SERVERPIPE:
                        if (lexrc.next())
-                               lyxpipes = ExpandPath(lexrc.GetString());
+                               lyxpipes = ExpandPath(lexrc.getString());
                        break;
                        
                case RC_CURSOR_FOLLOWS_SCROLLBAR:
                        if (lexrc.next())
-                               cursor_follows_scrollbar = lexrc.GetBool();
+                               cursor_follows_scrollbar = lexrc.getBool();
+                       break;
+
+               case RC_DIALOGS_ICONIFY_WITH_MAIN:
+                       if (lexrc.next())
+                               dialogs_iconify_with_main = lexrc.getBool();
                        break;
 
                case RC_ASCIIROFF_COMMAND:
                        if (lexrc.next())
-                               ascii_roff_command = lexrc.GetString();
+                               ascii_roff_command = lexrc.getString();
                        break;
                case RC_ASCII_LINELEN:
                        if (lexrc.next())
-                               ascii_linelen = lexrc.GetInteger();
+                               ascii_linelen = lexrc.getInteger();
                        break;
                        // Spellchecker settings:
 #ifdef USE_PSPELL
                case RC_USE_PSPELL:
                        if (lexrc.next())
-                               use_pspell = lexrc.GetBool();
+                               use_pspell = lexrc.getBool();
                        break;
 #endif
                case RC_SPELL_COMMAND:
                        if (lexrc.next())
-                               isp_command = lexrc.GetString();
+                               isp_command = lexrc.getString();
                        break;
                case RC_ACCEPT_COMPOUND:
                        if (lexrc.next())
-                               isp_accept_compound = lexrc.GetBool();
+                               isp_accept_compound = lexrc.getBool();
                        break;
                case RC_USE_INP_ENC:
                        if (lexrc.next())
-                               isp_use_input_encoding = lexrc.GetBool();
+                               isp_use_input_encoding = lexrc.getBool();
                        break;
                case RC_USE_ALT_LANG:
                        if (lexrc.next())
-                               isp_use_alt_lang = lexrc.GetBool();
+                               isp_use_alt_lang = lexrc.getBool();
                        break;
                case RC_USE_PERS_DICT:
                        if (lexrc.next())
-                               isp_use_pers_dict = lexrc.GetBool();
+                               isp_use_pers_dict = lexrc.getBool();
                        break;
                case RC_USE_ESC_CHARS:
                        if (lexrc.next())
-                               isp_use_esc_chars = lexrc.GetBool();
+                               isp_use_esc_chars = lexrc.getBool();
                        break;
                case RC_ALT_LANG:
                        if (lexrc.next())
-                               isp_alt_lang = lexrc.GetString();
+                               isp_alt_lang = lexrc.getString();
                        break;
                case RC_PERS_DICT:
                        if (lexrc.next())
-                               isp_pers_dict = lexrc.GetString();
+                               isp_pers_dict = lexrc.getString();
                        break;
                case RC_ESC_CHARS:
                        if (lexrc.next())
-                               isp_esc_chars = lexrc.GetString();
+                               isp_esc_chars = lexrc.getString();
                        break;
                case RC_MAKE_BACKUP:
                        if (lexrc.next())
-                               make_backup = lexrc.GetBool();
+                               make_backup = lexrc.getBool();
                        break;
                case RC_BACKUPDIR_PATH:
                        if (lexrc.next())
-                               backupdir_path = ExpandPath(lexrc.GetString());
+                               backupdir_path = ExpandPath(lexrc.getString());
                        break;
                case RC_DATE_INSERT_FORMAT:
                        if (lexrc.next())
-                               date_insert_format = lexrc.GetString();
+                               date_insert_format = lexrc.getString();
                        break;
                case RC_LANGUAGE_PACKAGE:
                        if (lexrc.next())
-                               language_package = lexrc.GetString();
+                               language_package = lexrc.getString();
                        break;
                case RC_LANGUAGE_AUTO_BEGIN:
                        if (lexrc.next())
-                               language_auto_begin = lexrc.GetBool();
+                               language_auto_begin = lexrc.getBool();
                        break;
                case RC_LANGUAGE_AUTO_END:
                        if (lexrc.next())
-                               language_auto_end = lexrc.GetBool();
+                               language_auto_end = lexrc.getBool();
                        break;
                case RC_LANGUAGE_GLOBAL_OPTIONS:
                        if (lexrc.next())
-                               language_global_options = lexrc.GetBool();
+                               language_global_options = lexrc.getBool();
                        break;
                case RC_LANGUAGE_USE_BABEL:
                        if (lexrc.next())
-                               language_use_babel = lexrc.GetBool();
+                               language_use_babel = lexrc.getBool();
                        break;
                case RC_LANGUAGE_COMMAND_BEGIN:
                        if (lexrc.next())
-                               language_command_begin = lexrc.GetString();
+                               language_command_begin = lexrc.getString();
                        break;
                case RC_LANGUAGE_COMMAND_END:
                        if (lexrc.next())
-                               language_command_end = lexrc.GetString();
+                               language_command_end = lexrc.getString();
                        break;
                case RC_LANGUAGE_COMMAND_LOCAL:
                        if (lexrc.next())
-                               language_command_local = lexrc.GetString();
+                               language_command_local = lexrc.getString();
                        break;
                case RC_RTL_SUPPORT:
                        if (lexrc.next())
-                               rtl_support = lexrc.GetBool();
+                               rtl_support = lexrc.getBool();
                        break;
                case RC_AUTO_NUMBER:
                        if (lexrc.next())
-                               auto_number = lexrc.GetBool();
+                               auto_number = lexrc.getBool();
                        break;
                case RC_MARK_FOREIGN_LANGUAGE:
                        if (lexrc.next())
-                               mark_foreign_language = lexrc.GetBool();
+                               mark_foreign_language = lexrc.getBool();
                        break;
                case RC_SHOW_BANNER:
                        if (lexrc.next())
-                               show_banner = lexrc.GetBool();
+                               show_banner = lexrc.getBool();
                        break;
                        
                case RC_NEW_ASK_FILENAME:
                        if (lexrc.next())
-                               new_ask_filename = lexrc.GetBool();
+                               new_ask_filename = lexrc.getBool();
                        break;
                case RC_CONVERTER: {
                        string from, to, command, flags;
                        if (lexrc.next())
-                               from = lexrc.GetString();
+                               from = lexrc.getString();
                        if (lexrc.next())
-                               to = lexrc.GetString();
+                               to = lexrc.getString();
                        if (lexrc.next())
-                               command = lexrc.GetString();
+                               command = lexrc.getString();
                        if (lexrc.next())
-                               flags = lexrc.GetString();
+                               flags = lexrc.getString();
                        if (command.empty() || command == "none")
                                converters.erase(from, to);
                        else
@@ -886,22 +908,22 @@ int LyXRC::read(string const & filename)
                case RC_VIEWER: {
                        string format, command;
                        if (lexrc.next())
-                               format = lexrc.GetString();
+                               format = lexrc.getString();
                        if (lexrc.next())
-                               command = lexrc.GetString();
+                               command = lexrc.getString();
                        formats.setViewer(format, command);
                        break;
                }
                case RC_FORMAT: {
                        string format, extension, prettyname, shortcut;
                        if (lexrc.next())
-                               format = lexrc.GetString();
+                               format = lexrc.getString();
                        if (lexrc.next())
-                               extension = lexrc.GetString();
+                               extension = lexrc.getString();
                        if (lexrc.next())
-                               prettyname = lexrc.GetString();
+                               prettyname = lexrc.getString();
                        if (lexrc.next())
-                               shortcut = lexrc.GetString();
+                               shortcut = lexrc.getString();
                        if (prettyname.empty()) {
                                if (converters.formatIsUsed(format))
                                        lyxerr << "Can't delete format "
@@ -916,12 +938,12 @@ int LyXRC::read(string const & filename)
                }
                case RC_DEFAULT_LANGUAGE:
                        if (lexrc.next())
-                               default_language = lexrc.GetString();
+                               default_language = lexrc.getString();
                        break;
 
                case RC_LABEL_INIT_LENGTH:
                        if (lexrc.next())
-                               label_init_length = lexrc.GetInteger();
+                               label_init_length = lexrc.getInteger();
                        break;
 
                case RC_LAST: break; // this is just a dummy
@@ -1008,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"
@@ -1020,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"
@@ -1031,7 +1068,7 @@ void LyXRC::output(ostream & os) const
                if (view_dvi_paper_option 
                    != system_lyxrc.view_dvi_paper_option) {
                        os << "# Options used to specify paper size to the\n"
-                          << "# view_dvi_command\n"
+                          << "# view_dvi_command (e.g. -paper)\n"
                           << "\\view_dvi_paper_option \""
                           << view_dvi_paper_option << "\"\n";
                }
@@ -1117,6 +1154,12 @@ void LyXRC::output(ostream & os) const
                        os << "\\cursor_follows_scrollbar "
                           << tostr(cursor_follows_scrollbar) << "\n";
                }
+       case RC_DIALOGS_ICONIFY_WITH_MAIN:
+               if (dialogs_iconify_with_main
+                  != system_lyxrc.dialogs_iconify_with_main) {
+                       os << "\\dialogs_iconify_with_main "
+                         <<  tostr(dialogs_iconify_with_main) << "\n";
+               }
        case RC_SCREEN_FONT_ROMAN:
                if (roman_font_name != system_lyxrc.roman_font_name) {
                        os << "\\screen_font_roman \"" << roman_font_name
@@ -1607,6 +1650,8 @@ 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-6.8x")
                font_norm_type = ISO_8859_6_8;
        else if (font_norm == "iso8859-9")
@@ -1764,20 +1809,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;
@@ -1805,6 +1854,7 @@ string const LyXRC::getDescription(LyXRCTags tag)
                break;
                
        case RC_VIEWDVI_PAPEROPTION:
+               str = N_("Specify the paper command to DVI viewer (leave empty or use \"-paper\")");
                break;
                
        case RC_DEFAULT_PAPERSIZE:
@@ -1853,10 +1903,18 @@ string const LyXRC::getDescription(LyXRCTags tag)
                str = N_("LyX normally doesn't update the cursor position if you move the scrollbar. Set to true if you'd prefer to always have the cursor on screen.");
                break;
                
+       case RC_DIALOGS_ICONIFY_WITH_MAIN:
+               str = N_("Iconify the dialogs when the main window is iconified. (Affects only dialogs shown after the change has been made.)");
+               break;
+               
        case RC_EXIT_CONFIRMATION:
                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;