X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Flyxrc.h;h=b6065dcb10c46dc21508396335fc855ee875795e;hb=8aff605caefaba655e48bc629ed344bb74bcd61a;hp=521dbea0a46ad891e9da717887c7e78fa5a5f0ff;hpb=0542d7af5db091f03a79af09a6f5ef2587ee43f9;p=lyx.git

diff --git a/src/lyxrc.h b/src/lyxrc.h
index 521dbea0a4..b6065dcb10 100644
--- a/src/lyxrc.h
+++ b/src/lyxrc.h
@@ -16,17 +16,16 @@
 #pragma interface
 #endif
 
-#include <map>
-
-#include "ToolbarDefaults.h"
 #include "bufferparams.h"
-
-using std::ostream;
-using std::map;
+#include <boost/utility.hpp>
 
 /// This contains the runtime configuration of LyX
-class LyXRC {
+class LyXRC //: public noncopyable {
+// after 1.1.6 I will use a LyXRCStruct here and then this can be made
+// noncopyable again.  For now I want to minimise changes.  ARRae 20001010
+{
 public:
+	///
 	LyXRC();
 	///
 	void setDefaults();
@@ -37,13 +36,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;
 	///
@@ -86,41 +87,14 @@ public:
 	string custom_export_format;
 	///
 	bool pdf_mode;
-	/// program for running latex
-	string latex_command;
-	///
-	string pdflatex_command;
-	///
-	string pdf_to_ps_command;
-	///
-	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;
 	/// postscript interpreter (in general "gs", if it is installed)
 	string ps_command;
-	/// program for viewing postscript output (default "ghostview -swap")
-	string view_ps_command;
-	/// program for viewing postscript pictures (default "ghostview")
-	string view_pspic_command;
-	/// program for viewing dvi output (default "xdvi")
-	string view_dvi_command;
 	/// option for telling the dvi viewer about the paper size
 	string view_dvi_paper_option;
-	/// program for viewing pdf output (default "xpdf")
-	string view_pdf_command;
         /// default paper size for local xdvi/dvips/ghostview/whatever
         BufferParams::PAPER_SIZE default_papersize;
 	/// command to run chktex incl. options
 	string chktex_command;
-	/// command to run an html converter incl. options
-	string html_command;
 	///
 	string document_path;
 	///
@@ -143,12 +117,16 @@ public:
 	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;
 	///
@@ -164,6 +142,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;
@@ -222,32 +213,23 @@ public:
 	///
 	bool rtl_support;
 	///
-	string number_inset;
+	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;
+	bool new_ask_filename;
 	///
-	string linuxdoc_to_html_command;
+	string default_language;
 	///
-	string linuxdoc_to_latex_command;
-	///
-	string docbook_to_dvi_command;
-	///
-	string docbook_to_html_command;
-	///
-	string docbook_to_pdf_command;
-	///
-	typedef map<string, int> Bindings;
-	///
-	Bindings bindings;
-private:
-	///
-	void defaultKeyBindings();
+	bool cursor_follows_scrollbar;
 };
 
+///
 extern LyXRC lyxrc;
-
+///
+extern LyXRC system_lyxrc;
 #endif