more changes, read the Changelog

[lyx.git] / src / lyxrc.h

diff --git a/src/lyxrc.h b/src/lyxrc.h
index 69ce31b652c5470497756f289de9333ffcb3d254..7eec3c242fb2c7c75381b647410e836b67c298e1 100644 (file)
--- a/src/lyxrc.h
+++ b/src/lyxrc.h
@@ -16,13 +16,9 @@
 #pragma interface
 #endif
 
-#include <map>
-
 #include "ToolbarDefaults.h"
 #include "bufferparams.h"
 
-using std::map;
-
 /// This contains the runtime configuration of LyX
 class LyXRC {
 public:
@@ -36,7 +32,7 @@ public:
        ///
         void print() const;
        ///
-       void output(ostream & os) const;
+       void output(std::ostream & os) const;
        /// Is a bind file already (or currently) read?
        bool hasBindFile;
        ///
@@ -44,6 +40,8 @@ public:
        ///
        ToolbarDefaults toolbardefaults;
        ///
+       string bind_file;
+       ///
        string printer;
        ///
        string print_command;
@@ -121,8 +119,6 @@ public:
        /// command to run an html converter incl. options
        string html_command;
        ///
-       string sgml_extra_options;
-       ///
        string document_path;
        ///
        string template_path;
@@ -140,6 +136,8 @@ public:
        unsigned int num_lastfiles;
        /// shall a backup file be created
        bool make_backup;
+       /// A directory for storing backup files
+       string backupdir_path;
        /// Zoom factor for screen fonts
        unsigned int zoom;
        /// Screen font sizes in points for each font size
@@ -148,6 +146,8 @@ public:
        bool use_scalable_fonts;
        /// DPI of monitor
        float dpi;
+       /// Whether lyx should handle deadkeys by itself
+       bool override_x_deadkeys;
        ///
        string fontenc;
        ///
@@ -211,25 +211,35 @@ public:
        ///
        string language_package;
        ///
-       bool language_command_begin;
+       bool language_auto_begin;
        ///
-       bool language_command_end;
+       bool language_auto_end;
        ///
-       string language_command_rtl;
+       string language_command_begin;
        ///
-       string language_command_ltr;
-
+       string language_command_end;
        ///
        bool rtl_support;
        ///
+       bool auto_number;
+       ///
+       bool mark_foreign_language;
+       ///
        bool show_banner;
+       /// Do we have to use a GUI?
+       bool use_gui;
+       ///
+       string linuxdoc_to_lyx_command;
+       ///
+       string linuxdoc_to_html_command;
+       ///
+       string linuxdoc_to_latex_command;
        ///
-       typedef map<string, int> Bindings;
+       string docbook_to_dvi_command;
        ///
-       Bindings bindings;
-private:
+       string docbook_to_html_command;
        ///
-       void defaultKeyBindings();
+       string docbook_to_pdf_command;
 };
 
 extern LyXRC lyxrc;