citation patch from Angus

[lyx.git] / src / lyxrc.h

diff --git a/src/lyxrc.h b/src/lyxrc.h
index 9cab1ff5e0fe04c484f5b8a5a960e445256aa257..77a292e95365f2292561c1845ebd55ccacd2d2d8 100644 (file)
--- a/src/lyxrc.h
+++ b/src/lyxrc.h
@@ -16,16 +16,13 @@
 #pragma interface
 #endif
 
-#include <map>
-
-#include "ToolbarDefaults.h"
 #include "bufferparams.h"
-
-using std::map;
+#include "support/utility.hpp"
 
 /// This contains the runtime configuration of LyX
-class LyXRC {
+class LyXRC : public noncopyable {
 public:
+       ///
        LyXRC();
        ///
        void setDefaults();
@@ -36,13 +33,15 @@ 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;
        ///
        int ReadBindFile(string const & name = "cua");
        ///
-       ToolbarDefaults toolbardefaults;
+       string bind_file;
+       ///
+       string ui_file;
        ///
        string printer;
        ///
@@ -95,10 +94,13 @@ public:
        string dvi_to_ps_command;
         /// program for performing literate programming
         string literate_command;
+       ///
         string literate_extension;
+       ///
         string literate_error_filter;
         /// program for compiling
         string build_command;
+       ///
         string build_error_filter;
        /// program for running relyx
        string relyx_command;
@@ -121,8 +123,6 @@ public:
        /// command to run an html converter incl. options
        string html_command;
        ///
-       string sgml_extra_options;
-       ///
        string document_path;
        ///
        string template_path;
@@ -140,14 +140,20 @@ 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;
+       /// parameter for button_4 and button_5 (scrollwheel)
+       unsigned int wheel_jump;
        /// Screen font sizes in points for each font size
        float font_sizes[10];
        /// Allow the use of scalable fonts? Default is yes.
        bool use_scalable_fonts;
        /// DPI of monitor
        float dpi;
+       /// Whether lyx should handle deadkeys by itself
+       bool override_x_deadkeys;
        ///
        string fontenc;
        ///
@@ -163,6 +169,19 @@ public:
        ///
        string font_norm;
        ///
+       enum FontEncoding {
+               ///
+               ISO_10646_1,
+               ///
+               ISO_8859_6_8,
+               ///
+               OTHER_ENCODING
+       };
+       ///
+       FontEncoding font_norm_type;
+       ///
+       void set_font_norm_type();
+       ///
        string font_norm_menu;
        ///
        unsigned int autosave;
@@ -221,18 +240,31 @@ public:
        ///
        bool rtl_support;
        ///
-       string auto_mathmode;
+       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;
        ///
-       typedef map<string, int> Bindings;
+       string linuxdoc_to_html_command;
        ///
-       Bindings bindings;
-private:
+       string linuxdoc_to_latex_command;
        ///
-       void defaultKeyBindings();
+       string docbook_to_dvi_command;
+       ///
+       string docbook_to_html_command;
+       ///
+       string docbook_to_pdf_command;
+       ///
+       bool new_ask_filename;
 };
 
+///
 extern LyXRC lyxrc;
-
+///
+//extern LyXRC system_lyxrc;
 #endif