]> git.lyx.org Git - lyx.git/blobdiff - src/lyxrc.C
more changes, read the Changelog
[lyx.git] / src / lyxrc.C
index 8cca7ea27ba409a5ca47393f9a2002d5d3c556bc..2b81b0d0c3ce94933737d1fffa88de4493a961ad 100644 (file)
@@ -4,7 +4,7 @@
  *           LyX, The Document Processor
  *      
  *         Copyright 1995 Matthias Ettrich
- *          Copyright 1995-1999 The LyX Team.
+ *          Copyright 1995-2000 The LyX Team.
  *
  * ====================================================== */
 
 
 #include <fstream>
 #include <iomanip>
-using std::ofstream;
-using std::cout;
-using std::ios;
+#include <iostream>
 
 #include "debug.h"
 
 #include "lyxrc.h"
+#include "kbmap.h"
 #include "LyXAction.h"
 #include "lyxserver.h"
 #include "lyx_main.h"
@@ -32,15 +31,20 @@ using std::ios;
 #include "support/filetools.h"
 #include "lyxtext.h"
 
+using std::ostream;
+using std::ofstream;
+using std::cout;
+using std::ios;
+using std::endl;
+
 // this is crappy... why are those colors command line arguments and
 // not in lyxrc?? (Matthias) 
 // Because nobody put them there. (Asger)
-extern int fast_selection;
-extern string background_color;
-extern char selection_color[];
+
 extern bool cursor_follows_scrollbar;
-extern kb_keymap * toplevel_keymap;
 extern LyXAction lyxaction;
+extern kb_keymap * toplevel_keymap;
+
 
 enum LyXRCTags {
        RC_BEGINTOOLBAR = 1,
@@ -80,8 +84,9 @@ enum LyXRCTags {
        RC_SCREEN_FONT_MENU,
        RC_SCREEN_FONT_POPUP,
        RC_SCREEN_FONT_ENCODING,
+       RC_SCREEN_FONT_ENCODING_MENU,
+       RC_SET_COLOR,
        RC_AUTOSAVE,
-       RC_SGML_EXTRA_OPTIONS,
        RC_DOCUMENTPATH,
        RC_TEMPLATEPATH,
        RC_TEMPDIRPATH,
@@ -89,16 +94,13 @@ enum LyXRCTags {
        RC_LASTFILES,
        RC_AUTOREGIONDELETE,
        RC_BIND,
+       RC_OVERRIDE_X_DEADKEYS,
        RC_SERVERPIPE,
-       RC_NOMENUACCELERATORS,
        RC_INPUT,
        RC_BINDFILE,
        RC_KBMAP,
        RC_KBMAP_PRIMARY,
        RC_KBMAP_SECONDARY,
-       RC_FAST_SELECTION,
-       RC_SELECTION_COLOR,
-       RC_BACKGROUND_COLOR,
        RC_FAX_COMMAND,
        RC_PHONEBOOK,
        RC_FAXPROGRAM,
@@ -107,6 +109,7 @@ enum LyXRCTags {
        RC_NUMLASTFILES,
        RC_CHECKLASTFILES,
        RC_VIEWDVI_COMMAND,
+       RC_VIEWDVI_PAPEROPTION,
        RC_DEFAULT_PAPERSIZE,
        RC_PS_COMMAND,
        RC_VIEWPS_COMMAND,
@@ -128,40 +131,63 @@ enum LyXRCTags {
        RC_RELYX_COMMAND,
        RC_HTML_COMMAND,
        RC_MAKE_BACKUP,
+       RC_BACKUPDIR_PATH,
+       RC_RTL_SUPPORT,
+       RC_AUTO_NUMBER,
+       RC_MARK_FOREIGN_LANGUAGE,
+       RC_LANGUAGE_PACKAGE,
+       RC_LANGUAGE_AUTO_BEGIN,
+       RC_LANGUAGE_AUTO_END,
+       RC_LANGUAGE_COMMAND_BEGIN,
+       RC_LANGUAGE_COMMAND_END,
        RC_PDFLATEX_COMMAND,
        RC_PDF_MODE,
        RC_VIEWPDF_COMMAND,
        RC_PDF_TO_PS_COMMAND,
        RC_DVI_TO_PS_COMMAND,
+       RC_DATE_INSERT_FORMAT,
+       RC_SHOW_BANNER,
+       RC_USE_GUI,
+       RC_LINUXDOC_TO_LYX_COMMAND,
+       RC_LINUXDOC_TO_HTML_COMMAND,
+       RC_LINUXDOC_TO_LATEX_COMMAND,
+       RC_DOCBOOK_TO_DVI_COMMAND,
+       RC_DOCBOOK_TO_HTML_COMMAND,
+       RC_DOCBOOK_TO_PDF_COMMAND,
        RC_LAST
 };
 
 
-static keyword_item lyxrcTags[] = {
+static
+keyword_item lyxrcTags[] = {
        { "\\accept_compound", RC_ACCEPT_COMPOUND },
        { "\\alternate_language", RC_ALT_LANG },
        { "\\ascii_linelen", RC_ASCII_LINELEN },
        { "\\ascii_roff_command", RC_ASCIIROFF_COMMAND },
+       { "\\auto_number", RC_AUTO_NUMBER },
        { "\\auto_region_delete", RC_AUTOREGIONDELETE },
        { "\\autosave", RC_AUTOSAVE },
-       { "\\background_color", RC_BACKGROUND_COLOR },
+       { "\\backupdir_path", RC_BACKUPDIR_PATH },
        { "\\begin_toolbar", RC_BEGINTOOLBAR },
        { "\\bind", RC_BIND },
        { "\\bind_file", RC_BINDFILE },
-        { "\\build_command", RC_BUILD_COMMAND },
-        { "\\build_error_filter", RC_BUILD_ERROR_FILTER },
+       { "\\build_command", RC_BUILD_COMMAND },
+       { "\\build_error_filter", RC_BUILD_ERROR_FILTER },
        { "\\check_lastfiles", RC_CHECKLASTFILES },
        { "\\chktex_command", RC_CHKTEX_COMMAND },
        { "\\cursor_follows_scrollbar", RC_CURSOR_FOLLOWS_SCROLLBAR },
        { "\\custom_export_command", RC_CUSTOM_EXPORT_COMMAND },
        { "\\custom_export_format", RC_CUSTOM_EXPORT_FORMAT },
+       { "\\date_insert_format", RC_DATE_INSERT_FORMAT },
        { "\\default_papersize", RC_DEFAULT_PAPERSIZE },
        { "\\display_shortcuts", RC_DISPLAY_SHORTCUTS },
+       { "\\docbook_to_dvi_command", RC_DOCBOOK_TO_DVI_COMMAND },
+       { "\\docbook_to_html_command", RC_DOCBOOK_TO_HTML_COMMAND },
+       { "\\docbook_to_pdf_command", RC_DOCBOOK_TO_PDF_COMMAND },
        { "\\document_path", RC_DOCUMENTPATH },
        { "\\dvi_to_ps_command", RC_DVI_TO_PS_COMMAND },
        { "\\escape_chars", RC_ESC_CHARS },
        { "\\exit_confirmation", RC_EXIT_CONFIRMATION },
-       { "\\fast_selection", RC_FAST_SELECTION },
        { "\\fax_command", RC_FAX_COMMAND },
        { "\\fax_program", RC_FAXPROGRAM },
        { "\\font_encoding", RC_FONT_ENCODING },
@@ -170,13 +196,23 @@ static keyword_item lyxrcTags[] = {
        { "\\kbmap", RC_KBMAP },
        { "\\kbmap_primary", RC_KBMAP_PRIMARY },
        { "\\kbmap_secondary", RC_KBMAP_SECONDARY },
+       { "\\language_auto_begin", RC_LANGUAGE_AUTO_BEGIN },
+       { "\\language_auto_end", RC_LANGUAGE_AUTO_END },
+       { "\\language_command_begin", RC_LANGUAGE_COMMAND_BEGIN },
+       { "\\language_command_end", RC_LANGUAGE_COMMAND_END },
+       { "\\language_package", RC_LANGUAGE_PACKAGE },
        { "\\lastfiles", RC_LASTFILES },
        { "\\latex_command", RC_LATEX_COMMAND },
+       { "\\linuxdoc_to_html_command", RC_LINUXDOC_TO_HTML_COMMAND },
+       { "\\linuxdoc_to_latex_command", RC_LINUXDOC_TO_LATEX_COMMAND },
+       { "\\linuxdoc_to_lyx_command", RC_LINUXDOC_TO_LYX_COMMAND },
         { "\\literate_command", RC_LITERATE_COMMAND },
         { "\\literate_error_filter", RC_LITERATE_ERROR_FILTER },
         { "\\literate_extension", RC_LITERATE_EXTENSION },
        { "\\make_backup", RC_MAKE_BACKUP },
+       { "\\mark_foreign_language", RC_MARK_FOREIGN_LANGUAGE },
        { "\\num_lastfiles", RC_NUMLASTFILES },
+       { "\\override_x_deadkeys", RC_OVERRIDE_X_DEADKEYS },
        { "\\pdf_mode", RC_PDF_MODE },
        { "\\pdf_to_ps_command", RC_PDF_TO_PS_COMMAND },
        { "\\pdflatex_command", RC_PDFLATEX_COMMAND },
@@ -202,8 +238,10 @@ static keyword_item lyxrcTags[] = {
        { "\\printer", RC_PRINTER },
        { "\\ps_command", RC_PS_COMMAND },
        { "\\relyx_command", RC_RELYX_COMMAND },
+       { "\\rtl", RC_RTL_SUPPORT },
        { "\\screen_dpi", RC_SCREEN_DPI },
        { "\\screen_font_encoding", RC_SCREEN_FONT_ENCODING },
+       { "\\screen_font_encoding_menu", RC_SCREEN_FONT_ENCODING_MENU },
        { "\\screen_font_menu", RC_SCREEN_FONT_MENU },
        { "\\screen_font_popup", RC_SCREEN_FONT_POPUP },
        { "\\screen_font_roman", RC_SCREEN_FONT_ROMAN },
@@ -212,18 +250,20 @@ static keyword_item lyxrcTags[] = {
        { "\\screen_font_sizes", RC_SCREEN_FONT_SIZES },
        { "\\screen_font_typewriter", RC_SCREEN_FONT_TYPEWRITER },
        { "\\screen_zoom", RC_SCREEN_ZOOM },
-       { "\\selection_color", RC_SELECTION_COLOR },
        { "\\serverpipe", RC_SERVERPIPE },
-       { "\\sgml_extra_options", RC_SGML_EXTRA_OPTIONS },
+       { "\\set_color", RC_SET_COLOR },
+       { "\\show_banner", RC_SHOW_BANNER },
        { "\\spell_command", RC_SPELL_COMMAND },
        { "\\tempdir_path", RC_TEMPDIRPATH },
        { "\\template_path", RC_TEMPLATEPATH },
        { "\\use_alt_language", RC_USE_ALT_LANG },
        { "\\use_escape_chars", RC_USE_ESC_CHARS },
+       { "\\use_gui", RC_USE_GUI },
        { "\\use_input_encoding", RC_USE_INP_ENC },
        { "\\use_personal_dictionary", RC_USE_PERS_DICT },
        { "\\use_tempdir", RC_USETEMPDIR },
        { "\\view_dvi_command", RC_VIEWDVI_COMMAND },
+       { "\\view_dvi_paper_option", RC_VIEWDVI_PAPEROPTION },
        { "\\view_pdf_command", RC_VIEWPDF_COMMAND },
        { "\\view_ps_command", RC_VIEWPS_COMMAND },
         { "\\view_pspic_command", RC_VIEWPSPIC_COMMAND }
@@ -232,16 +272,14 @@ static keyword_item lyxrcTags[] = {
 /* Let the range depend of the size of lyxrcTags.  Alejandro 240596 */
 static const int lyxrcCount = sizeof(lyxrcTags) / sizeof(keyword_item);
 
-// Should this be moved inside LyXAction? 
-static inline
-int bindKey(char const * seq, int action)
-{ 
-       return toplevel_keymap->bind(seq, action); 
+
+LyXRC::LyXRC() 
+{
+       setDefaults();
 }
 
 
-LyXRC::LyXRC()
-{
+void LyXRC::setDefaults() {
        // Get printer from the environment. If fail, use default "",
        // assuming that everything is set up correctly.
        printer = GetEnv("PRINTER");
@@ -257,7 +295,7 @@ LyXRC::LyXRC()
        print_to_printer = "-P";
        print_to_file = "-o ";
        print_file_extension = ".ps";
-        print_paper_flag = "-t";
+       print_paper_flag = "-t";
        print_paper_dimension_flag = "-T";
        document_path = GetEnvPath("HOME");
        tempdir_path = "/tmp";
@@ -277,6 +315,7 @@ LyXRC::LyXRC()
        view_ps_command = "ghostview -swap";
        view_pspic_command = "ghostview";
        view_dvi_command = "xdvi";
+       view_dvi_paper_option = "-paper";
        view_pdf_command = "xpdf";
        default_papersize = BufferParams::PAPER_USLETTER;
        custom_export_format = "ps";
@@ -304,12 +343,15 @@ LyXRC::LyXRC()
        menu_font_name = "-*-helvetica-bold-r";
        popup_font_name = "-*-helvetica-medium-r";
        font_norm = "iso8859-1";
+       font_norm_menu = "";
+       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;
+       backupdir_path = "";
        exit_confirmation = true;
        display_shortcuts = true;
        // Spellchecker settings:
@@ -321,7 +363,28 @@ LyXRC::LyXRC()
        isp_use_esc_chars = false;
        use_kbmap = false;
        hasBindFile = false;
-       defaultKeyBindings();
+       rtl_support = false;
+       auto_number = true;
+       mark_foreign_language = true;
+       language_package = "\\usepackage{babel}";
+       language_auto_begin = true;
+       language_auto_end = true;
+       language_command_begin = "\\selectlanguage{$$lang}";
+       language_command_end = "\\selectlanguage{$$lang}";
+
+       ///
+       date_insert_format = "%A, %e %B %Y";
+       show_banner = true;
+       use_gui = true;
+
+       ///
+       linuxdoc_to_latex_command="none";
+       linuxdoc_to_lyx_command="none";
+       linuxdoc_to_html_command="none";
+
+       docbook_to_dvi_command="none";
+       docbook_to_html_command="none";
+       docbook_to_pdf_command="none";
 }
 
 
@@ -345,7 +408,7 @@ int LyXRC::read(string const & filename)
        
        LyXLex lexrc(lyxrcTags, lyxrcCount);
        if (lyxerr.debugging(Debug::PARSER))
-               lexrc.printTable();
+               lexrc.printTable(lyxerr);
        
        lexrc.setFile(filename);
        if (!lexrc.IsOK()) return -2;
@@ -382,14 +445,21 @@ int LyXRC::read(string const & filename)
                        break;
                case RC_BINDFILE:                     // RVDK_PATCH_5
                        if (lexrc.next()) {
-                               ReadBindFile(lexrc.GetString());
+                               string tmp(lexrc.GetString());
+                               if (bind_file.empty()) {
+                                       // we only need the name of the first
+                                       // bind file since that (usually)
+                                       // includes several others.
+                                       bind_file = tmp;
+                               }
+                               ReadBindFile(tmp);
                        }
                        break;
                        
                case RC_BEGINTOOLBAR:
                        // this toolbar should be changed to be a completely
                        // non gui toolbar. (Lgb)
-                       toolbar.read(lexrc);
+                       toolbardefaults.read(lexrc);
                        break;
                        
                case RC_KBMAP:
@@ -408,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:
@@ -608,6 +686,13 @@ int LyXRC::read(string const & filename)
                                view_dvi_command = lexrc.GetString();
                        break;
 
+               case RC_VIEWDVI_PAPEROPTION:
+                       if (lexrc.next())
+                               view_dvi_paper_option = lexrc.GetString();
+                       else 
+                               view_dvi_paper_option = "";
+                       break;
+
                case RC_VIEWPDF_COMMAND:
                        if (lexrc.next())
                                view_pdf_command = lexrc.GetString();
@@ -691,11 +776,6 @@ int LyXRC::read(string const & filename)
                                autosave = lexrc.GetInteger();
                        break;
                        
-               case RC_SGML_EXTRA_OPTIONS:
-                       if (lexrc.next())
-                               sgml_extra_options = lexrc.GetString();
-                       break;
-                       
                case RC_DOCUMENTPATH:
                        if (lexrc.next()) {
                                document_path = ExpandPath(lexrc.GetString());
@@ -761,7 +841,36 @@ int LyXRC::read(string const & filename)
                        if (lexrc.next())
                                font_norm = lexrc.GetString();
                        break;
+
+               case RC_SCREEN_FONT_ENCODING_MENU:
+                       if (lexrc.next())
+                               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())
@@ -773,9 +882,10 @@ int LyXRC::read(string const & filename)
                        // we should not do an explicit binding before
                        // loading a bind file. So, in this case, load
                        // the default bind file.
-                       if (!hasBindFile)
+                       if (!hasBindFile) {
                                ReadBindFile();
-                       
+                               bind_file = bindFile;
+                       }
                        // !!!chb, dynamic key binding...
                        int action, res = 0;
                        string seq, cmd;
@@ -801,7 +911,8 @@ int LyXRC::read(string const & filename)
                                               << cmd << "' Action `"
                                               << action << '\'' << endl;
                                }
-                               res = bindKey(seq.c_str(), action);
+                               res = toplevel_keymap->bind(seq.c_str(),
+                                                           action);
                                if (res != 0) {
                                        lexrc.printError(
                                                "Invalid key sequence `"
@@ -813,6 +924,11 @@ int LyXRC::read(string const & filename)
                        }
                        break;
                }
+               case RC_OVERRIDE_X_DEADKEYS:
+                       if (lexrc.next())
+                               override_x_deadkeys = lexrc.GetBool();
+                       break;
+
                case RC_SERVERPIPE:
                        if (lexrc.next())
                                lyxpipes = ExpandPath(lexrc.GetString());
@@ -822,19 +938,7 @@ int LyXRC::read(string const & filename)
                        if (lexrc.next())
                                cursor_follows_scrollbar = lexrc.GetBool();
                        break;
-               case RC_FAST_SELECTION:
-                       if (lexrc.next())
-                               fast_selection = lexrc.GetBool();
-                       break;
-               case RC_BACKGROUND_COLOR:
-                       if (lexrc.next())
-                               background_color = lexrc.GetString();
-                       break;
-               case RC_SELECTION_COLOR:
-                       if (lexrc.next())
-                               strncpy(selection_color,
-                                       lexrc.GetString().c_str(), 31);
-                       break;
+
                case RC_FAX_COMMAND:
                        if (lexrc.next())
                                fax_command = lexrc.GetString();
@@ -901,6 +1005,79 @@ int LyXRC::read(string const & filename)
                        if (lexrc.next())
                                make_backup = lexrc.GetBool();
                        break;
+               case RC_BACKUPDIR_PATH:
+                       if (lexrc.next())
+                               backupdir_path = ExpandPath(lexrc.GetString());
+                       break;
+               case RC_DATE_INSERT_FORMAT:
+                       if (lexrc.next())
+                               date_insert_format = lexrc.GetString();
+                       break;
+               case RC_LANGUAGE_PACKAGE:
+                       if (lexrc.next())
+                               language_package = lexrc.GetString();
+                       break;
+               case RC_LANGUAGE_AUTO_BEGIN:
+                       if (lexrc.next())
+                               language_auto_begin = lexrc.GetBool();
+                       break;
+               case RC_LANGUAGE_AUTO_END:
+                       if (lexrc.next())
+                               language_auto_end = lexrc.GetBool();
+                       break;
+               case RC_LANGUAGE_COMMAND_BEGIN:
+                       if (lexrc.next())
+                               language_command_begin = lexrc.GetString();
+                       break;
+               case RC_LANGUAGE_COMMAND_END:
+                       if (lexrc.next())
+                               language_command_end = lexrc.GetString();
+                       break;
+               case RC_RTL_SUPPORT:
+                       if (lexrc.next())
+                               rtl_support = lexrc.GetBool();
+                       break;
+               case RC_AUTO_NUMBER:
+                       if (lexrc.next())
+                               auto_number = lexrc.GetBool();
+                       break;
+               case RC_MARK_FOREIGN_LANGUAGE:
+                       if (lexrc.next())
+                               mark_foreign_language = lexrc.GetBool();
+                       break;
+               case RC_SHOW_BANNER:
+                       if (lexrc.next())
+                               show_banner = lexrc.GetBool();
+                       break;
+               case RC_USE_GUI:
+                       if (lexrc.next())
+                               use_gui = lexrc.GetBool();
+                       break;
+               case RC_LINUXDOC_TO_LYX_COMMAND:
+                       if ( lexrc.next())
+                               linuxdoc_to_lyx_command = lexrc.GetString();
+                       break;
+               case RC_LINUXDOC_TO_HTML_COMMAND:
+                       if ( lexrc.next())
+                               linuxdoc_to_html_command = lexrc.GetString();
+                       break;
+               case RC_LINUXDOC_TO_LATEX_COMMAND:
+                       if ( lexrc.next())
+                               linuxdoc_to_latex_command = lexrc.GetString();
+                       break;
+               case RC_DOCBOOK_TO_DVI_COMMAND:
+                       if ( lexrc.next())
+                               docbook_to_dvi_command = lexrc.GetString();
+                       break;
+               case RC_DOCBOOK_TO_HTML_COMMAND:
+                       if ( lexrc.next())
+                               docbook_to_html_command = lexrc.GetString();
+                       break;
+               case RC_DOCBOOK_TO_PDF_COMMAND:
+                       if ( lexrc.next())
+                               docbook_to_pdf_command = lexrc.GetString();
+                       break;
+
                case RC_LAST: break; // this is just a dummy
                }
        }
@@ -959,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:
@@ -1057,6 +1237,9 @@ void LyXRC::output(ostream & os) const
                os << " " << font_sizes[LyXFont::SIZE_HUGE];
                os << " " << font_sizes[LyXFont::SIZE_HUGER];
                os << "\n";
+       case RC_OVERRIDE_X_DEADKEYS:
+               os << "\\override_x_deadkeys " 
+                  << override_x_deadkeys << "\n";
        case RC_AUTOREGIONDELETE:
                os << "\\auto_region_delete " << tostr(auto_region_delete)
                   << "\n";
@@ -1070,6 +1253,8 @@ void LyXRC::output(ostream & os) const
                   << "\n";
        case RC_VIEWDVI_COMMAND:
                os << "\\view_dvi_command \"" << view_dvi_command << "\"\n";
+       case RC_VIEWDVI_PAPEROPTION:
+               os << "\\view_dvi_paper_option \"" << view_dvi_paper_option << "\"\n";
        case RC_VIEWPDF_COMMAND:
                os << "\\view_pdf_command \"" << view_pdf_command << "\"\n";
        case RC_DEFAULT_PAPERSIZE:
@@ -1103,9 +1288,6 @@ void LyXRC::output(ostream & os) const
                os << "\\chktex_command \"" << chktex_command << "\"\n";
        case RC_HTML_COMMAND:
                os << "\\html_command \"" << html_command << "\"\n";
-       case RC_SGML_EXTRA_OPTIONS:
-               os << "\\sgml_extra_options \"" << sgml_extra_options
-                  << "\"\n";
        case RC_KBMAP:
                os << "\\kbmap " << tostr(use_kbmap) << "\n";
        case RC_KBMAP_PRIMARY:
@@ -1143,19 +1325,15 @@ void LyXRC::output(ostream & os) const
                os << "\\screen_font_popup \"" << popup_font_name << "\"\n";
        case RC_SCREEN_FONT_ENCODING:
                os << "\\screen_font_encoding \"" << font_norm << "\"\n";
+       case RC_SCREEN_FONT_ENCODING_MENU:
+               os << "\\screen_font_encoding_menu \"" << font_norm_menu
+                  << "\"\n";
        case RC_SCREEN_FONT_SCALABLE:
                os << "\\screen_font_scalable " << tostr(use_scalable_fonts)
                   << "\n";
        case RC_CURSOR_FOLLOWS_SCROLLBAR:
                os << "\\cursor_follows_scrollbar "
                   << tostr(cursor_follows_scrollbar) << "\n";
-       case RC_FAST_SELECTION:
-               os << "\\fast_selection "
-                  << tostr(static_cast<bool>(fast_selection)) << "\n";
-       case RC_BACKGROUND_COLOR:
-               os << "\\background_color \"" << background_color << "\"\n";
-       case RC_SELECTION_COLOR:
-               os << "\\selection_color \"" << selection_color << "\"\n";
        case RC_FAX_COMMAND:
                os << "\\fax_command \"" << fax_command << "\"\n";
        case RC_FAXPROGRAM:
@@ -1189,78 +1367,60 @@ void LyXRC::output(ostream & os) const
                os << "\\personal_dictionary \"" << isp_pers_dict << "\"\n";
        case RC_ESC_CHARS:
                os << "\\escape_chars \"" << isp_esc_chars << "\"\n";
+       case RC_RTL_SUPPORT:
+               os << "\\rtl " << tostr(rtl_support) << "\n";
+       case RC_AUTO_NUMBER:
+               os << "\\auto_number " << tostr(auto_number) << "\n";
+       case RC_MARK_FOREIGN_LANGUAGE:
+               os << "\\mark_foreign_language " << 
+                       tostr(mark_foreign_language) << "\n";
+       case RC_LANGUAGE_AUTO_BEGIN:
+               os << "\\language_auto_begin " 
+                  << tostr(language_auto_begin) << "\n";
+       case RC_LANGUAGE_AUTO_END:
+               os << "\\language_auto_end " 
+                  << tostr(language_auto_end) << "\n";
+       case RC_LANGUAGE_PACKAGE:
+               os << "\\language_package \"" << language_package << "\"\n";
+       case RC_LANGUAGE_COMMAND_BEGIN:
+               os << "\\language_command_begin \"" << language_command_begin
+                  << "\"\n";
+       case RC_LANGUAGE_COMMAND_END:
+               os << "\\language_command_end \"" << language_command_end
+                  << "\"\n";
        case RC_MAKE_BACKUP:
                os << "\\make_backup " << tostr(make_backup) << "\n";
+       case RC_BACKUPDIR_PATH:
+               os << "\\backupdir_path \"" << backupdir_path << "\"\n";
+       case RC_DATE_INSERT_FORMAT:
+               os << "\\date_insert_format \"" << date_insert_format
+                  << "\"\n";
+       case RC_SHOW_BANNER:
+               os << "\\show_banner " << tostr(show_banner) << "\n";
+       case RC_USE_GUI:
+               os << "\\use_gui " << tostr(show_banner) << "\n";
+       case RC_LINUXDOC_TO_LYX_COMMAND:
+               os << "\\linuxdoc_to_lyx_command \"" << linuxdoc_to_lyx_command
+                  << "\"\n";
+       case RC_LINUXDOC_TO_HTML_COMMAND:
+               os << "\\linuxdoc_to_html_command \"" << linuxdoc_to_html_command
+                  << "\"\n";
+       case RC_LINUXDOC_TO_LATEX_COMMAND:
+               os << "\\linuxdoc_to_latex_command \"" << linuxdoc_to_latex_command
+                  << "\"\n";
+       case RC_DOCBOOK_TO_DVI_COMMAND:
+               os << "\\docbook_to_dvi_command \"" << docbook_to_dvi_command
+                  << "\"\n";
+       case RC_DOCBOOK_TO_HTML_COMMAND:
+               os << "\\docbook_to_html_command \"" << docbook_to_html_command
+                  << "\"\n";
+       case RC_DOCBOOK_TO_PDF_COMMAND:
+               os << "\\docbook_to_pdf_command \"" << docbook_to_pdf_command
+                  << "\"\n";
        }
        os.flush();
 }
 
 
-/// define the default key bindings for LyX.
-void LyXRC::defaultKeyBindings()
-{
-       bindKey("Right",   LFUN_RIGHT);
-       bindKey("Left",    LFUN_LEFT);
-       bindKey("Up",      LFUN_UP);
-       bindKey("Down",    LFUN_DOWN);
-       
-       bindKey("Tab",  LFUN_TAB);
-       
-       bindKey("Home",    LFUN_HOME);
-       bindKey("End",     LFUN_END);
-       bindKey("Prior",   LFUN_PRIOR);
-       bindKey("Next",    LFUN_NEXT);
-       
-       bindKey("Return",  LFUN_BREAKPARAGRAPH);
-       bindKey("~C-~S-~M-nobreakspace", LFUN_PROTECTEDSPACE);
-       
-       bindKey("Delete",  LFUN_DELETE);
-       bindKey("BackSpace",    LFUN_BACKSPACE);
-       // bindKeyings for transparent handling of deadkeys
-       // The keysyms are gotten from XFree86 X11R6
-       bindKey("~C-~S-~M-dead_acute",           LFUN_ACUTE);
-       bindKey("~C-~S-~M-dead_breve",           LFUN_BREVE);
-       bindKey("~C-~S-~M-dead_caron",           LFUN_CARON);
-       bindKey("~C-~S-~M-dead_cedilla",         LFUN_CEDILLA);
-       bindKey("~C-~S-~M-dead_abovering",          LFUN_CIRCLE);
-       bindKey("~C-~S-~M-dead_circumflex",      LFUN_CIRCUMFLEX);
-       bindKey("~C-~S-~M-dead_abovedot",             LFUN_DOT);
-       bindKey("~C-~S-~M-dead_grave",           LFUN_GRAVE);
-       bindKey("~C-~S-~M-dead_doubleacute",     LFUN_HUNG_UMLAUT);
-       bindKey("~C-~S-~M-dead_macron",          LFUN_MACRON);
-       // nothing with this name
-       // bindKey("~C-~S-~M-dead_special_caron",   LFUN_SPECIAL_CARON);
-       bindKey("~C-~S-~M-dead_tilde",           LFUN_TILDE);
-       bindKey("~C-~S-~M-dead_diaeresis",       LFUN_UMLAUT);
-       // nothing with this name either...
-       //bindKey("~C-~S-~M-dead_underbar",        LFUN_UNDERBAR);
-       bindKey("~C-~S-~M-dead_belowdot",        LFUN_UNDERDOT);
-       bindKey("~C-~S-~M-dead_tie",             LFUN_TIE);
-       bindKey("~C-~S-~M-dead_ogonek",           LFUN_OGONEK);
-       
-       // bindings to utilize the use of the numeric keypad
-       // e.g. Num Lock set
-       bindKey("KP_0",        LFUN_SELFINSERT);
-       bindKey("KP_Decimal",  LFUN_SELFINSERT);
-       bindKey("KP_Enter",    LFUN_SELFINSERT);
-       bindKey("KP_1",        LFUN_SELFINSERT);
-       bindKey("KP_2",        LFUN_SELFINSERT);
-       bindKey("KP_3",        LFUN_SELFINSERT);
-       bindKey("KP_4",        LFUN_SELFINSERT);
-       bindKey("KP_5",        LFUN_SELFINSERT);
-       bindKey("KP_6",        LFUN_SELFINSERT);
-       bindKey("KP_Add",      LFUN_SELFINSERT);
-       bindKey("KP_7",        LFUN_SELFINSERT);
-       bindKey("KP_8",        LFUN_SELFINSERT);
-       bindKey("KP_9",        LFUN_SELFINSERT);
-       bindKey("KP_Divide",   LFUN_SELFINSERT);
-       bindKey("KP_Multiply", LFUN_SELFINSERT);
-       bindKey("KP_Subtract", LFUN_SELFINSERT);
-       
-       /* Most self-insert keys are handled in the 'default:' section of
-        * WorkAreaKeyPress - so we don't have to define them all.
-        * However keys explicit decleared as self-insert are
-        * handled seperatly (LFUN_SELFINSERT.) Lgb. */
-       
-        bindKey("C-Tab",  LFUN_TABINSERT);  // ale970515
-}
+// The global instance
+LyXRC lyxrc;